You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/10/26 13:33:18 UTC
[maven-plugin-tools] branch MPLUGIN-434 created (now 35d14fbc)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MPLUGIN-434
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
at 35d14fbc [MPLUGIN-434] Improve dependency management
This branch includes the following new commits:
new 35d14fbc [MPLUGIN-434] Improve dependency management
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-plugin-tools] 01/01: [MPLUGIN-434] Improve dependency management
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MPLUGIN-434
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 35d14fbc46980b8ba21cf78167ec7deb556a30e8
Author: Slawomir Jaranowski <s....@gmail.com>
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 | 22 +-----------------
maven-plugin-report-plugin/pom.xml | 4 +---
maven-plugin-tools-generators/pom.xml | 7 ------
maven-script/maven-script-ant/pom.xml | 12 ++++++++++
pom.xml | 43 ++++++++++++++++++++++++++++++++++-
5 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 7b410964..aaa4b2b5 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 -->
@@ -324,6 +303,7 @@
<pomExcludes>
<pomExclude>plugin-info-jdk/pom.xml</pomExclude><!-- relies on just a given plugin.xml for generating a report, this is no longer supported -->
</pomExcludes>
+ <junitPackageName>maven.invoker.it.plugin</junitPackageName>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index 85296907..0470a6cf 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 -->
@@ -240,6 +237,7 @@
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
</properties>
+ <junitPackageName>maven.invoker.it.plugin.report</junitPackageName>
</configuration>
<executions>
<execution>
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 07e914a9..8c493b29 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>