Skip to content

Commit

Permalink
Improve dependency management (#690)
Browse files Browse the repository at this point in the history
* Set Dependabot interval to 'daily'
* Set jacoco version directly for better Dependabot recognition
* Removed unnecessary property 'project.execution.environment'
* Move coveralls plugin to parent 'pluginManagement' for better Dependabot recognition
  • Loading branch information
abelsromero authored Dec 29, 2023
1 parent 954817d commit 50399fd
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 49 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "daily"
labels:
- "dependencies"
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
interval: "daily"
labels:
- "dependencies"
commit-message:
Expand All @@ -25,7 +25,7 @@ updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
interval: "daily"
labels:
- "dependencies"
commit-message:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Build / Infrastructure::
* Use Maven v3.9.5 in CI and wrapper (#662)
* Add Java 21 to CI (#664)
* Add Dependabot to automate dependency management (#669)
* Improvements to dependency management (#690)

Documentation::

Expand Down
14 changes: 0 additions & 14 deletions asciidoctor-converter-doxia-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

<properties>
<doxia.version>1.11.1</doxia.version>
<maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
<plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
</properties>

Expand Down Expand Up @@ -75,19 +74,6 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${maven.coveralls.plugin.version}</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>

Expand Down
14 changes: 0 additions & 14 deletions asciidoctor-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<properties>
<maven.plugin.plugin.version>3.8.1</maven.plugin.plugin.version>
<netty.version>4.1.104.Final</netty.version>
<maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -79,19 +78,6 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${maven.coveralls.plugin.version}</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>

Expand Down
14 changes: 0 additions & 14 deletions asciidoctor-parser-doxia-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<properties>
<doxia.version>1.11.1</doxia.version>
<maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
<plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
</properties>

Expand Down Expand Up @@ -79,19 +78,6 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${maven.coveralls.plugin.version}</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>

Expand Down
23 changes: 19 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.java.version>11</project.java.version>
<project.execution.environment>JavaSE-1.8</project.execution.environment>
<maven.project.version>3.9.1</maven.project.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<maven.project.version>3.9.1</maven.project.version>
<maven.jacoco.plugin.version>0.8.11</maven.jacoco.plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -201,7 +199,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${maven.jacoco.plugin.version}</version>
<version>0.8.11</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand All @@ -211,6 +209,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.3.0</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit 50399fd

Please sign in to comment.