Repository: maven-resolver Updated Branches: refs/heads/master f7288bbbd -> db4003a86
[MNG-6141] Dependency management overrides are not transitive and should be considered an anti-pattern. o Added transport modules to the parent dependency management and removed all dependency management overrides from the demo modules. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/9dbbd060 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/9dbbd060 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/9dbbd060 Branch: refs/heads/master Commit: 9dbbd06030b247c868ed8b9686ffef51f584f8c6 Parents: f7288bb Author: Christian Schulte <schu...@apache.org> Authored: Fri Dec 22 01:27:15 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Fri Dec 22 01:27:15 2017 +0100 ---------------------------------------------------------------------- .../maven-resolver-demo-maven-plugin/pom.xml | 3 --- .../maven-resolver-demo-snippets/pom.xml | 26 -------------------- pom.xml | 20 +++++++++++++++ 3 files changed, 20 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/9dbbd060/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index fc50fa0..fe61d3f 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -41,7 +41,6 @@ </prerequisites> <properties> - <resolverVersion>${project.version}</resolverVersion> <mavenVersion>3.5.0</mavenVersion> </properties> @@ -69,12 +68,10 @@ <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-util</artifactId> - <version>${resolverVersion}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/9dbbd060/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml ---------------------------------------------------------------------- diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml index 9d0c4a5..32253aa 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml @@ -37,7 +37,6 @@ </description> <properties> - <resolverVersion>${project.version}</resolverVersion> <mavenVersion>3.5.0</mavenVersion> </properties> @@ -60,37 +59,30 @@ <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-api</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-spi</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-util</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-impl</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-connector-basic</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-transport-file</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-transport-http</artifactId> - <version>${resolverVersion}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -100,31 +92,13 @@ <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> - <version>0.1.1</version> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-guice</artifactId> - <version>3.1.6</version> <classifier>no_aop</classifier> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/9dbbd060/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 54f7af3..1042ae5 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,26 @@ </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-classpath</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-file</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-wagon</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-test-util</artifactId> <version>${project.version}</version> <scope>test</scope>
