You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/06/25 20:36:06 UTC
[2/4] maven git commit: [MNG-5967] Dependency updates.
[MNG-5967] Dependency updates.
o Added used but undeclared dependencies and removed unused dependencies
according to 'dependency:analyze'.
o Updated to manage 'commons-io' to version 2.5 to include that version
in the distribution instead of 2.2.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/934e030f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/934e030f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/934e030f
Branch: refs/heads/MNG-6006
Commit: 934e030f049d955c330c4b61abb66a543f9ca990
Parents: 3770044
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Jun 25 22:06:44 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Jun 25 22:28:48 2016 +0200
----------------------------------------------------------------------
maven-aether-provider/pom.xml | 20 +++++++++++++----
maven-builder-support/pom.xml | 4 ----
maven-compat/pom.xml | 24 +++++++++++++++++++++
maven-core/pom.xml | 24 +++++++++++++++------
maven-embedder/pom.xml | 44 ++++++++++++++++++++++++++++++++++++++
maven-plugin-api/pom.xml | 8 +++++++
pom.xml | 38 +++++++++++++++++++++++++++-----
7 files changed, 143 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 4c36ebd..9d7cfd5 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -71,10 +71,6 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
@@ -90,6 +86,22 @@ under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
<!-- Testing -->
<dependency>
<groupId>org.eclipse.aether</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 90fa43b..5cc3d8d 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -35,10 +35,6 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index f828d6e..9588dd2 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -52,6 +52,14 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
@@ -59,6 +67,22 @@ under the License.
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f03eead..0728886 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -43,6 +43,10 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ </dependency>
<!-- Remove the following two deps to see how to remove Settings from the core -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -82,6 +86,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
@@ -97,16 +105,24 @@ under the License.
<!-- Plexus -->
<dependency>
<groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -121,10 +137,6 @@ under the License.
<artifactId>plexus-component-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-sec-dispatcher</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 7e4032f..95504c7 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -36,10 +36,22 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
@@ -51,6 +63,14 @@ under the License.
<artifactId>maven-model-builder</artifactId>
</dependency>
<dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<scope>runtime</scope>
@@ -64,10 +84,23 @@ under the License.
<artifactId>plexus-classworlds</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
@@ -99,8 +132,19 @@ under the License.
</dependency>
<dependency>
<groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-bootstrap</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
<optional>true</optional>
+ <scope>runtime</scope>
</dependency>
<!-- CLI -->
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index a05d059..d4fc9af 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -52,6 +52,14 @@ under the License.
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/934e030f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e53a2ee..a3ea2c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@ under the License.
<!-- https://issues.apache.org/jira/browse/MNG-6023 -->
<!-- http://jira.qos.ch/browse/SLF4J-370 -->
<slf4jVersion>1.7.16</slf4jVersion>
+ <gossipVersion>2.0.0</gossipVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
@@ -251,10 +252,20 @@ under the License.
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <version>${sisuInjectVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisuInjectVersion}</version>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>${plexusVersion}</version>
@@ -299,8 +310,20 @@ under the License.
</dependency>
<dependency>
<groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-bootstrap</artifactId>
+ <version>${gossipVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-core</artifactId>
+ <version>${gossipVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
- <version>2.0.0</version>
+ <version>${gossipVersion}</version>
<optional>true</optional>
</dependency>
<!-- Wagon -->
@@ -359,6 +382,11 @@ under the License.
</dependency>
<!-- Commons -->
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commonsCliVersion}</version>
@@ -564,10 +592,10 @@ under the License.
<configuration>
<asfExtOptions>
<charter>The mission of the Apache Maven project is to create and maintain software
- libraries that provide a widely-used project build tool, targeting mainly Java
- development. Apache Maven promotes the use of dependencies via a
- standardized coordinate system, binary plugins, and a standard build
- lifecycle.</charter>
+ libraries that provide a widely-used project build tool, targeting mainly Java
+ development. Apache Maven promotes the use of dependencies via a
+ standardized coordinate system, binary plugins, and a standard build
+ lifecycle.</charter>
</asfExtOptions>
</configuration>
</plugin>