This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 322a9bbb [MPLUGIN-434] Improve dependency management
322a9bbb is described below
commit 322a9bbb36d86598dff30f4b4b74eda8cd90259c
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Wed Oct 26 15:33:01 2022 +0200
[MPLUGIN-434] Improve dependency management
- excludes in one place
- exclude plexus-container-default
- exclude plexus-component-api
---
maven-plugin-plugin/pom.xml | 21 -----------------
maven-plugin-report-plugin/pom.xml | 3 ---
maven-plugin-tools-generators/pom.xml | 7 ------
maven-script/maven-script-ant/pom.xml | 12 ++++++++++
pom.xml | 43 ++++++++++++++++++++++++++++++++++-
5 files changed, 54 insertions(+), 32 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 7b410964..3f69c50f 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -42,8 +42,6 @@
</prerequisites>
<properties>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<it.debug>true</it.debug>
</properties>
@@ -100,28 +98,10 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>${doxia-sitetoolsVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Maven -->
@@ -151,7 +131,6 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>${reportingImplVersion}</version>
</dependency>
<!-- plexus -->
diff --git a/maven-plugin-report-plugin/pom.xml
b/maven-plugin-report-plugin/pom.xml
index 85296907..24342904 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -40,7 +40,6 @@
</prerequisites>
<properties>
- <doxiaVersion>1.11.1</doxiaVersion>
<it.debug>true</it.debug>
</properties>
@@ -91,14 +90,12 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
</dependency>
<!-- shared -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>${reportingImplVersion}</version>
</dependency>
<!-- plexus -->
diff --git a/maven-plugin-tools-generators/pom.xml
b/maven-plugin-tools-generators/pom.xml
index 736c91d8..3fb4b444 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -106,14 +106,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>${reportingImplVersion}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
diff --git a/maven-script/maven-script-ant/pom.xml
b/maven-script/maven-script-ant/pom.xml
index 25c558d9..cbba0e1f 100644
--- a/maven-script/maven-script-ant/pom.xml
+++ b/maven-script/maven-script-ant/pom.xml
@@ -36,11 +36,23 @@ under the License.
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${antVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${antVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index de7fa1e1..ebcdf48c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,6 @@
</distributionManagement>
<properties>
- <surefire.version>2.22.2</surefire.version>
<javaVersion>8</javaVersion>
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
<mavenVersion>3.2.5</mavenVersion>
@@ -102,6 +101,8 @@
<antVersion>1.10.12</antVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
<asmVersion>9.4</asmVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<plexusUtilsVersion>3.4.2</plexusUtilsVersion>
<reportingApiVersion>3.1.1</reportingApiVersion>
<reportingImplVersion>3.2.0</reportingImplVersion>
@@ -181,6 +182,46 @@
<artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
</dependency>
+ <!-- doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>${doxia-sitetoolsVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>${reportingImplVersion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-container-default</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
