[MNG-6167] Clean up dependency mess (reported by dependency:analyze) Clean up compile and runtime dependencies. Test dependencies have not been touched because their seem to be false positives due to DI.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ecef59f1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ecef59f1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ecef59f1 Branch: refs/heads/MNG-6069 Commit: ecef59f1cb822e48c63215fa7dd0c8f4fd54d6af Parents: f4ede96 Author: Michael Osipov <micha...@apache.org> Authored: Tue May 16 15:27:22 2017 +0200 Committer: Michael Osipov <micha...@apache.org> Committed: Tue May 16 15:27:22 2017 +0200 ---------------------------------------------------------------------- maven-builder-support/pom.xml | 4 ---- maven-compat/pom.xml | 10 +++++++++- maven-core/pom.xml | 22 +++++++++++++++------- maven-embedder/pom.xml | 30 +++++++++++++++++++++++++----- maven-model-builder/pom.xml | 1 + maven-plugin-api/pom.xml | 8 ++++++++ maven-resolver-provider/pom.xml | 8 ++++++++ pom.xml | 10 ++++++++++ 8 files changed, 76 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-builder-support/pom.xml ---------------------------------------------------------------------- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 5eb7903..9557731 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/ecef59f1/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 8392dca..b3cf039 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -52,6 +52,10 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-settings-builder</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> </dependency> <dependency> @@ -63,6 +67,10 @@ under the License. <artifactId>maven-resolver-provider</artifactId> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + </dependency> + <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> </dependency> @@ -131,5 +139,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 71f09c0..717e2a5 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -54,6 +54,10 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-builder-support</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> </dependency> <dependency> @@ -92,20 +96,28 @@ under the License. <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> </dependency> - <!-- Plexus --> <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> </dependency> <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.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>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> + <!-- Plexus --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> @@ -119,10 +131,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/ecef59f1/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 66e09a3..52e9c82 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -40,6 +40,10 @@ under the License. </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> @@ -48,9 +52,17 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-model-builder</artifactId> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-builder-support</artifactId> + </dependency> + <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> </dependency> @@ -59,15 +71,23 @@ under the License. <artifactId>maven-resolver-util</artifactId> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</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>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-model-builder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 859f0b3..eb86824 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -71,6 +71,7 @@ under the License. <artifactId>org.eclipse.sisu.plexus</artifactId> <scope>test</scope> </dependency> + <!-- Testing --> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-plugin-api/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 1596a41..cf7e0ef 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/ecef59f1/maven-resolver-provider/pom.xml ---------------------------------------------------------------------- diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml index a724d3b..0d1b481 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -71,6 +71,14 @@ under the License. <artifactId>plexus-utils</artifactId> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <classifier>no_aop</classifier> http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e16d93b..ce84168 100644 --- a/pom.xml +++ b/pom.xml @@ -249,6 +249,16 @@ under the License. <version>${sisuInjectVersion}</version> </dependency> <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.inject</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>
