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 2017/12/22 00:45:27 UTC
[1/2] maven-resolver git commit: [MNG-6141] Dependency management
overrides are not transitive and should be considered an anti-pattern.
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 <sc...@apache.org>
Authored: Fri Dec 22 01:27:15 2017 +0100
Committer: Christian Schulte <sc...@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>
[2/2] maven-resolver git commit: [MRESOLVER-9]
DefaultDependencyCollector does not correctly handle dependency management.
Posted by sc...@apache.org.
[MRESOLVER-9] DefaultDependencyCollector does not correctly handle dependency management.
Resolution without MRESOLVER-9 looks like (Maven 3.3.9):
[DEBUG] org.sonatype.sisu:sisu-guice:jar:no_aop:3.2.6:compile
[DEBUG] javax.inject:javax.inject:jar:1:provided (scope managed from compile by org.apache.maven.resolver:maven-resolver:1.1.1-SNAPSHOT)
[DEBUG] com.google.guava:guava:jar:16.0.1:compile
The 'javax.inject:javax.inject:jar:1:provided' line shows that the artifact
is in 'provided' scope. The Maven resolver without MRESOLVER-9 fixed will
incorrectly resolve that transitive provided dependency. With MRESOLVER-9 fixed,
the resolver correctly no longer resolves transitive provided dependencies. That
dependency needs to be declared directly.
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/db4003a8
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/db4003a8
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/db4003a8
Branch: refs/heads/master
Commit: db4003a867a22b6dc66d96f83b3dcb6f364c8b5d
Parents: 9dbbd06
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Dec 22 01:36:59 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Dec 22 01:39:38 2017 +0100
----------------------------------------------------------------------
maven-resolver-demos/maven-resolver-demo-snippets/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/db4003a8/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 32253aa..b3bfeaa 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
@@ -95,6 +95,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<classifier>no_aop</classifier>