From 50399fd3ad6c754b35013bb183a00c0182ad3ca1 Mon Sep 17 00:00:00 2001
From: Abel Salgado Romero <abelromero@gmail.com>
Date: Fri, 29 Dec 2023 11:21:39 +0100
Subject: [PATCH] Improve dependency management (#690)

* 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
---
 .github/dependabot.yml                     |  6 +++---
 CHANGELOG.adoc                             |  1 +
 asciidoctor-converter-doxia-module/pom.xml | 14 -------------
 asciidoctor-maven-plugin/pom.xml           | 14 -------------
 asciidoctor-parser-doxia-module/pom.xml    | 14 -------------
 pom.xml                                    | 23 ++++++++++++++++++----
 6 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8336c145..accf61a1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -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:
@@ -25,7 +25,7 @@ updates:
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
     labels:
       - "dependencies"
     commit-message:
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index f56529ec..dad9dcc8 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -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::
 
diff --git a/asciidoctor-converter-doxia-module/pom.xml b/asciidoctor-converter-doxia-module/pom.xml
index 318a747e..896f9f23 100644
--- a/asciidoctor-converter-doxia-module/pom.xml
+++ b/asciidoctor-converter-doxia-module/pom.xml
@@ -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>
 
@@ -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>
 
diff --git a/asciidoctor-maven-plugin/pom.xml b/asciidoctor-maven-plugin/pom.xml
index ade49cb0..7c195d44 100644
--- a/asciidoctor-maven-plugin/pom.xml
+++ b/asciidoctor-maven-plugin/pom.xml
@@ -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>
@@ -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>
 
diff --git a/asciidoctor-parser-doxia-module/pom.xml b/asciidoctor-parser-doxia-module/pom.xml
index 11786cc5..7c01fc73 100644
--- a/asciidoctor-parser-doxia-module/pom.xml
+++ b/asciidoctor-parser-doxia-module/pom.xml
@@ -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>
 
@@ -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>
 
diff --git a/pom.xml b/pom.xml
index 98826a0e..4e5296f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
@@ -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>