maven-resolver git commit: [MPLUGIN-296] java.lang.ClassNotFoundException: org.apache.maven.plugins.annotations.Execute
Repository: maven-resolver Updated Branches: refs/heads/master db4003a86 -> b9e0e1beb [MPLUGIN-296] java.lang.ClassNotFoundException: org.apache.maven.plugins.annotations.Execute [WARNING] Error injecting: org.apache.maven.tools.plugin.extractor.annotations.JavaAnnotationsMojoDescriptorExtractor java.lang.NoClassDefFoundError: org/apache/maven/plugins/annotations/Execute at java.lang.ClassLoader.defineClass1 (Native Method) at java.lang.ClassLoader.defineClass (ClassLoader.java:763) Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/b9e0e1be Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/b9e0e1be Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/b9e0e1be Branch: refs/heads/master Commit: b9e0e1bebad6398ea2ac7ac8addac273a2e899fb Parents: db4003a Author: Christian Schulte <schu...@apache.org> Authored: Fri Dec 22 02:01:31 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Fri Dec 22 02:01:31 2017 +0100 -- pom.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/b9e0e1be/pom.xml -- diff --git a/pom.xml b/pom.xml index 1042ae5..4ebc65c 100644 --- a/pom.xml +++ b/pom.xml @@ -210,6 +210,13 @@ + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5 + + org.apache.maven.plugins maven-javadoc-plugin
[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 <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 @@
-${project.version}
3.5.0
@@ -69,12 +68,10 @@
org.apache.maven.resolver
maven-resolver-api
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-util
- ${resolverVersion}
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 @@
-${project.version}
3.5.0
@@ -60,37 +59,30 @@
org.apache.maven.resolver
maven-resolver-api
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-spi
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-util
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-impl
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-connector-basic
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-transport-file
- ${resolverVersion}
org.apache.maven.resolver
maven-resolver-transport-http
- ${resolverVersion}
org.apache.maven
@@ -100,31 +92,13 @@
org.eclipse.sisu
org.eclipse.sisu.plexus
- 0.1.1
true
-
-
- javax.enterprise
- cdi-api
-
-
org.sonatype.sisu
sisu-guice
- 3.1.6
no_aop
true
-
-
- aopalliance
- aopalliance
-
-
- com.google.code.findbugs
- jsr305
-
-
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 @@
org.apache.maven.resolver
+maven-resolver-transport-classpath
+${project.version}
+
+
+org.apache.maven.resolver
+maven-resolver-transport-file
+${project.version}
+
+
+org.apache.maven.resolver
+maven-resolver-transport-http
+${project.version}
+
+
+org.apache.maven.resolver
+maven-resolver-transport-wagon
+${project.version}
+
+
+org.apache.maven.resolver
maven-resolver-test-util
${project.version}
test
[2/2] maven-resolver git commit: [MRESOLVER-9] DefaultDependencyCollector does not correctly handle dependency management.
[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 <schu...@apache.org> Authored: Fri Dec 22 01:36:59 2017 +0100 Committer: Christian Schulte <schu...@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 @@ true + javax.inject + javax.inject + + org.sonatype.sisu sisu-guice no_aop
[maven-integration-testing] Git Push Summary
Repository: maven-integration-testing Updated Branches: refs/heads/DEPMGMT [deleted] b269329c1
[maven-integration-testing] Git Push Summary
Repository: maven-integration-testing Updated Branches: refs/heads/DEPMGMT-INCLUDE [deleted] e7c3d22d1
[maven-integration-testing] Git Push Summary
Repository: maven-integration-testing Updated Branches: refs/heads/DEPMGMT-IMPORT [deleted] 14da29b04
[maven-integration-testing] Git Push Summary
Repository: maven-integration-testing Updated Branches: refs/heads/MNG-5359 [deleted] 8e3583cb8
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6164 [deleted] c013c0ee6
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6114 [deleted] 6d17c0796
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-5984 [deleted] 759af2256
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-5359 [deleted] ef88bf59a
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/DEPMGMT-INCLUDE [deleted] cdb327d03
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/DEPMGMT-IMPORT [deleted] 77039555e
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/DEPMGMT [deleted] d8d67e6a7
maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
Repository: maven
Updated Branches:
refs/heads/master 0931bb2cc -> 8400984ac
[MNG-6112] Central repository in the 4.0.0 super POM should declare update
policy 'never'.
This reverts commit 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8 *not changing
anything* just because someone did not react in time when this issue had been
lying around on a branch. If we would set pace for the industrie, everyone would
still be using 5.25" floppy disks and 8 bit hardware and we would tell them
that upgrading to be able to use new software would be too risky and they
better keep theire broken assembly routines until the machine goes up in
smoke.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8400984a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8400984a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8400984a
Branch: refs/heads/master
Commit: 8400984ac5201ae6bf06bfa88ade8a8468c76634
Parents: 0931bb2
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Mar 25 20:40:05 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sat Mar 25 20:53:06 2017 +0100
--
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 509f302..9331710 100644
---
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL,
RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true,
ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
+ true,
ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN
);
}
http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 9487a9a..91492a9 100644
---
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,9 +32,6 @@ under the License.
false
-
-never
-
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6168 [deleted] 0931bb2cc
maven git commit: [MNG-6168] Fix unclosed streams
Repository: maven
Updated Branches:
refs/heads/master f0535a40e -> 0931bb2cc
[MNG-6168] Fix unclosed streams
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c
Branch: refs/heads/master
Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee
Parents: f0535a4
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Mar 24 22:04:37 2017 +0100
--
.../metadata/io/DefaultMetadataReader.java | 19 ++---
.../toolchain/io/DefaultToolchainsReader.java | 19 ++---
.../maven/model/io/DefaultModelReader.java | 18 +++--
.../maven/model/io/DefaultModelWriter.java | 27 +
.../internal/DefaultVersionRangeResolver.java | 18 +++--
.../internal/DefaultVersionResolver.java| 42
.../settings/io/DefaultSettingsReader.java | 19 ++---
.../settings/io/DefaultSettingsWriter.java | 27 +
8 files changed, 58 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.repository.metadata.Metadata;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
-try
+try ( final Reader in = input )
{
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(),
e.getLineNumber(), e.getColumnNumber(), e );
}
-finally
-{
-IOUtil.close( input );
-}
}
public Metadata read( InputStream input, Map<String, ?> options )
@@ -78,19 +72,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
-try
+try ( final InputStream in = input )
{
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(),
e.getLineNumber(), e.getColumnNumber(), e );
}
-finally
-{
-IOUtil.close( input );
-}
}
private boolean isStrict( Map<String, ?> options )
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.Validate;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullPars
maven git commit: [MNG-6168] Fix unclosed streams
Repository: maven
Updated Branches:
refs/heads/MNG-6168 [created] 0931bb2cc
[MNG-6168] Fix unclosed streams
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c
Branch: refs/heads/MNG-6168
Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee
Parents: f0535a4
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Mar 24 22:04:37 2017 +0100
--
.../metadata/io/DefaultMetadataReader.java | 19 ++---
.../toolchain/io/DefaultToolchainsReader.java | 19 ++---
.../maven/model/io/DefaultModelReader.java | 18 +++--
.../maven/model/io/DefaultModelWriter.java | 27 +
.../internal/DefaultVersionRangeResolver.java | 18 +++--
.../internal/DefaultVersionResolver.java| 42
.../settings/io/DefaultSettingsReader.java | 19 ++---
.../settings/io/DefaultSettingsWriter.java | 27 +
8 files changed, 58 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.repository.metadata.Metadata;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
-try
+try ( final Reader in = input )
{
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(),
e.getLineNumber(), e.getColumnNumber(), e );
}
-finally
-{
-IOUtil.close( input );
-}
}
public Metadata read( InputStream input, Map<String, ?> options )
@@ -78,19 +72,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
-try
+try ( final InputStream in = input )
{
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(),
e.getLineNumber(), e.getColumnNumber(), e );
}
-finally
-{
-IOUtil.close( input );
-}
}
private boolean isStrict( Map<String, ?> options )
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.Validate;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserE
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6190 [deleted] f5e477e24
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6113 [deleted] 0f0040a19
[2/2] maven git commit: [MNG-6113] Rename the 'Central Repository' to 'Maven Central Repository' in the 4.0.0 super POM.
[MNG-6113] Rename the 'Central Repository' to 'Maven Central Repository' in the 4.0.0 super POM. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0f0040a1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0f0040a1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0f0040a1 Branch: refs/heads/MNG-6113 Commit: 0f0040a1915bfd14cf60342eb1680ed59eaea92b Parents: 27ab750 Author: Christian Schulte <schu...@apache.org> Authored: Tue Mar 21 00:31:53 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Tue Mar 21 19:20:00 2017 +0100 -- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0f0040a1/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml -- diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index 9487a9a..c9770b0 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -26,7 +26,7 @@ under the License. central - Central Repository + Maven Central Repository https://repo.maven.apache.org/maven2 default @@ -41,7 +41,7 @@ under the License. central - Central Repository + Maven Central Repository https://repo.maven.apache.org/maven2 default
[1/2] maven git commit: [MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6113 f668824df -> 0f0040a19 (forced update)
[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has
mismatched constructor and initService methods
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/27ab7503
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/27ab7503
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/27ab7503
Branch: refs/heads/MNG-6113
Commit: 27ab7503a7196a40b5ed1007181c82cdcf11e03c
Parents: 13adc1b
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 21 19:16:44 2017 +0100
--
.../internal/DefaultArtifactDescriptorReader.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/27ab7503/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 1df1c12..82e1284 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader
@Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager
remoteRepositoryManager, VersionResolver versionResolver,
- ArtifactResolver artifactResolver,
ModelBuilder modelBuilder,
- RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ VersionRangeResolver
versionRangeResolver, ArtifactResolver artifactResolver,
+ ModelBuilder modelBuilder,
RepositoryEventDispatcher repositoryEventDispatcher,
+ LoggerFactory loggerFactory )
{
setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver );
@@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader
public void initService( ServiceLocator locator )
{
-setLoggerFactory( locator.getService( LoggerFactory.class ) );
setRemoteRepositoryManager( locator.getService(
RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) );
setVersionRangeResolver( locator.getService(
VersionRangeResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) );
-setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null )
{
setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
}
+setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
+setLoggerFactory( locator.getService( LoggerFactory.class ) );
}
public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory
loggerFactory )
maven git commit: [MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods
Repository: maven
Updated Branches:
refs/heads/master 13adc1bc2 -> 27ab7503a
[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has
mismatched constructor and initService methods
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/27ab7503
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/27ab7503
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/27ab7503
Branch: refs/heads/master
Commit: 27ab7503a7196a40b5ed1007181c82cdcf11e03c
Parents: 13adc1b
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 21 19:16:44 2017 +0100
--
.../internal/DefaultArtifactDescriptorReader.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/27ab7503/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 1df1c12..82e1284 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader
@Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager
remoteRepositoryManager, VersionResolver versionResolver,
- ArtifactResolver artifactResolver,
ModelBuilder modelBuilder,
- RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ VersionRangeResolver
versionRangeResolver, ArtifactResolver artifactResolver,
+ ModelBuilder modelBuilder,
RepositoryEventDispatcher repositoryEventDispatcher,
+ LoggerFactory loggerFactory )
{
setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver );
@@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader
public void initService( ServiceLocator locator )
{
-setLoggerFactory( locator.getService( LoggerFactory.class ) );
setRemoteRepositoryManager( locator.getService(
RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) );
setVersionRangeResolver( locator.getService(
VersionRangeResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) );
-setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null )
{
setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
}
+setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
+setLoggerFactory( locator.getService( LoggerFactory.class ) );
}
public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory
loggerFactory )
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6112 [deleted] 13adc1bc2
maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
Repository: maven
Updated Branches:
refs/heads/master d54e6f91a -> 13adc1bc2
[MNG-6112] Central repository in the 4.0.0 super POM should declare update
policy 'never'.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/13adc1bc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/13adc1bc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/13adc1bc
Branch: refs/heads/master
Commit: 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8
Parents: d54e6f9
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 21 00:30:28 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 21 00:30:28 2017 +0100
--
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..509f302 100644
---
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL,
RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true,
ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
+ true,
ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN
);
}
http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..9487a9a 100644
---
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,6 +32,9 @@ under the License.
false
+
+never
+
maven git commit: [MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods
Repository: maven
Updated Branches:
refs/heads/MNG-6190 [created] f5e477e24
[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has
mismatched constructor and initService methods
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f5e477e2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f5e477e2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f5e477e2
Branch: refs/heads/MNG-6190
Commit: f5e477e2497368ee7817d475421944491a7ba23c
Parents: d54e6f9
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 21 04:06:02 2017 +0100
--
.../internal/DefaultArtifactDescriptorReader.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f5e477e2/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 1df1c12..82e1284 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader
@Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager
remoteRepositoryManager, VersionResolver versionResolver,
- ArtifactResolver artifactResolver,
ModelBuilder modelBuilder,
- RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ VersionRangeResolver
versionRangeResolver, ArtifactResolver artifactResolver,
+ ModelBuilder modelBuilder,
RepositoryEventDispatcher repositoryEventDispatcher,
+ LoggerFactory loggerFactory )
{
setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver );
@@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader
public void initService( ServiceLocator locator )
{
-setLoggerFactory( locator.getService( LoggerFactory.class ) );
setRemoteRepositoryManager( locator.getService(
RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) );
setVersionRangeResolver( locator.getService(
VersionRangeResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) );
-setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null )
{
setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
}
+setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
+setLoggerFactory( locator.getService( LoggerFactory.class ) );
}
public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory
loggerFactory )
maven git commit: [MNG-6113] Rename the 'Central Repository' to 'Maven Central Repository' in the 4.0.0 super POM.
Repository: maven Updated Branches: refs/heads/MNG-6113 [created] f668824df [MNG-6113] Rename the 'Central Repository' to 'Maven Central Repository' in the 4.0.0 super POM. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f668824d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f668824d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f668824d Branch: refs/heads/MNG-6113 Commit: f668824df861e06ad7fb85f79ae549d80bef387c Parents: 13adc1b Author: Christian Schulte <schu...@apache.org> Authored: Tue Mar 21 00:31:53 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Tue Mar 21 00:31:53 2017 +0100 -- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f668824d/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml -- diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index 9487a9a..c9770b0 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -26,7 +26,7 @@ under the License. central - Central Repository + Maven Central Repository https://repo.maven.apache.org/maven2 default @@ -41,7 +41,7 @@ under the License. central - Central Repository + Maven Central Repository https://repo.maven.apache.org/maven2 default
maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
Repository: maven
Updated Branches:
refs/heads/MNG-6112 [created] 13adc1bc2
[MNG-6112] Central repository in the 4.0.0 super POM should declare update
policy 'never'.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/13adc1bc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/13adc1bc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/13adc1bc
Branch: refs/heads/MNG-6112
Commit: 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8
Parents: d54e6f9
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 21 00:30:28 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 21 00:30:28 2017 +0100
--
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..509f302 100644
---
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL,
RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true,
ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
+ true,
ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN
);
}
http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..9487a9a 100644
---
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,6 +32,9 @@ under the License.
false
+
+never
+
maven git commit: s/@since 3.5.0-alpha-2/@since 3.5.0/g
Repository: maven
Updated Branches:
refs/heads/master fd29ddebf -> d54e6f91a
s/@since 3.5.0-alpha-2/@since 3.5.0/g
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d54e6f91
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d54e6f91
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d54e6f91
Branch: refs/heads/master
Commit: d54e6f91a8652cdda61a20f051f97f11d4c3c982
Parents: fd29dde
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 21 00:21:43 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 21 00:21:43 2017 +0100
--
.../java/org/apache/maven/execution/ProjectDependencyGraph.java | 2 +-
.../org/apache/maven/graph/DefaultProjectDependencyGraph.java| 4 ++--
.../org/apache/maven/graph/FilteredProjectDependencyGraph.java | 2 +-
.../java/org/apache/maven/project/ProjectModelResolverTest.java | 2 +-
.../java/org/apache/maven/model/resolution/ModelResolver.java| 2 +-
.../maven/repository/internal/DefaultModelResolverTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index d206d73..bbc8272 100644
---
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -37,7 +37,7 @@ public interface ProjectDependencyGraph
*
* @return All collected projects.
*
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
List getAllProjects();
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index effab0b..73cadf6 100644
---
a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++
b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -69,7 +69,7 @@ public class DefaultProjectDependencyGraph
*
* @throws DuplicateProjectException
* @throws CycleDetectedException
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public DefaultProjectDependencyGraph( final List allProjects,
final Collection
projects )
@@ -81,7 +81,7 @@ public class DefaultProjectDependencyGraph
}
/**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public List getAllProjects()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
index ad3910d..c4f8e1a 100644
---
a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
+++
b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -65,7 +65,7 @@ class FilteredProjectDependencyGraph
}
/**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public List getAllProjects()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
--
diff --git
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index c21796b..6302a82 100644
---
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -44,7 +44,7 @@ import static org.codehaus.plexus.PlexusTestCase.getBasedir;
* Test cases for the project {@code ModelResolver} implementation.
*
* @author Christian Schulte
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-model-builde
maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6182 4fc5e2180 -> f1ccecdd8 (forced update)
[MNG-6182] ModelResolver interface enhancements.
o Added unit tests for the 'ModelResolver' interface.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f1ccecdd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f1ccecdd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f1ccecdd
Branch: refs/heads/MNG-6182
Commit: f1ccecdd893eea0a320634a49bc6e56b776fb213
Parents: 55eeb32
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Mar 19 03:46:29 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Mar 19 04:01:34 2017 +0100
--
.../maven/project/ProjectModelResolverTest.java | 246 +++
.../internal/DefaultModelResolverTest.java | 222 +
2 files changed, 468 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f1ccecdd/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
--
diff --git
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
new file mode 100644
index 000..c21796b
--- /dev/null
+++
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -0,0 +1,246 @@
+package org.apache.maven.project;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.resolution.ModelResolver;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
+import static org.codehaus.plexus.PlexusTestCase.getBasedir;
+
+/**
+ * Test cases for the project {@code ModelResolver} implementation.
+ *
+ * @author Christian Schulte
+ * @since 3.5.0-alpha-2
+ */
+public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
+{
+
+/**
+ * Creates a new {@code ProjectModelResolverTest} instance.
+ */
+public ProjectModelResolverTest()
+{
+super();
+}
+
+public void
testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+{
+final Parent parent = new Parent();
+parent.setGroupId( "org.apache" );
+parent.setArtifactId( "apache" );
+parent.setVersion( "0" );
+
+try
+{
+this.newModelResolver().resolveModel( parent );
+fail( "Expected 'UnresolvableModelException' not thrown." );
+}
+catch ( final UnresolvableModelException e )
+{
+assertNotNull( e.getMessage() );
+assertTrue( e.getMessage().startsWith( "Could not find artifact
org.apache:apache:pom:0 in central" ) );
+}
+}
+
+public void
testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound()
throws Exception
+{
+final Parent parent = new Parent();
+parent.setGroupId( "org.apache" );
+parent.setArtifactId( "apache" );
+parent.setVersion( "[2.0,2.1)" );
+
+try
+{
+this.newModelResolver().resolveModel( parent );
+fail( &q
maven git commit: [MNG-6182] ModelResolver interface enhancements.
Repository: maven
Updated Branches:
refs/heads/MNG-6182 [created] 4fc5e2180
[MNG-6182] ModelResolver interface enhancements.
o Added unit tests for the 'ModelResolver' interface.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4fc5e218
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4fc5e218
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4fc5e218
Branch: refs/heads/MNG-6182
Commit: 4fc5e2180b3f230740778b7106b79c5a9cf8619f
Parents: 55eeb32
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Mar 19 03:46:29 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Mar 19 03:46:29 2017 +0100
--
.../maven/project/ProjectModelResolverTest.java | 246 +++
.../internal/DefaultModelResolverTest.java | 222 +
2 files changed, 468 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/4fc5e218/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
--
diff --git
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
new file mode 100644
index 000..bca10aa
--- /dev/null
+++
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -0,0 +1,246 @@
+package org.apache.maven.project;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.resolution.ModelResolver;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
+import static org.codehaus.plexus.PlexusTestCase.getBasedir;
+
+/**
+ * Test cases for the project {@code ModelResolver} implementation.
+ *
+ * @author Christian Schulte
+ * @since 3.5.0-alpha-2
+ */
+public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
+{
+
+/**
+ * Creates a new {@code ProjectModelResolverTest} instance.
+ */
+public ProjectModelResolverTest()
+{
+super();
+}
+
+public void
testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+{
+final Parent parent = new Parent();
+parent.setGroupId( "org.apache" );
+parent.setArtifactId( "apache" );
+parent.setVersion( "0" );
+
+try
+{
+this.newModelResolver().resolveModel( parent );
+fail( "Expected 'UnresolvableModelException' not thrown." );
+}
+catch ( final UnresolvableModelException e )
+{
+assertNotNull( e.getMessage() );
+assertTrue( e.getMessage().startsWith( "Could not find artifact
org.apache:apache:pom:0 in central" ) );
+}
+}
+
+public void
testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound()
throws Exception
+{
+final Parent parent = new Parent();
+parent.setGroupId( "org.apache" );
+parent.setArtifactId( "apache" );
+parent.setVersion( "[2.0,2.1)" );
+
+try
+{
+this.newModelResolver().resolveModel( parent );
+fail( "
maven-resolver git commit: [MRESOLVER-19] DefaultRepositorySystem resolveDependencies() can yield a NullPointerException
Repository: maven-resolver
Updated Branches:
refs/heads/master a245b56af -> 3fc53c052
[MRESOLVER-19] DefaultRepositorySystem resolveDependencies() can yield a
NullPointerException
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/3fc53c05
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/3fc53c05
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/3fc53c05
Branch: refs/heads/master
Commit: 3fc53c052f538169cb7dc6aa9ed9052514b569ca
Parents: a245b56
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Mar 17 22:07:13 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Mar 17 22:07:13 2017 +0100
--
.../eclipse/aether/internal/impl/DefaultRepositorySystem.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3fc53c05/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
--
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
index 06faaf7..fbcf7c9 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
@@ -367,7 +367,12 @@ public class DefaultRepositorySystem
DependencyFilter filter = request.getFilter();
DependencyVisitor visitor = ( filter != null ) ? new
FilteringDependencyVisitor( builder, filter ) : builder;
visitor = new TreeDependencyVisitor( visitor );
-result.getRoot().accept( visitor );
+
+if ( result.getRoot() != null )
+{
+result.getRoot().accept( visitor );
+}
+
List requests = builder.getRequests();
List results;
maven-resolver git commit: [MRESOLVER-18] DefaultDependencyCollector does not provide pre-managed state for exclusions and properties.
Repository: maven-resolver
Updated Branches:
refs/heads/master ad50215d2 -> a245b56af
[MRESOLVER-18] DefaultDependencyCollector does not provide pre-managed state
for exclusions and properties.
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/a245b56a
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/a245b56a
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/a245b56a
Branch: refs/heads/master
Commit: a245b56afd479640ce12a3cd047b463a629bca0f
Parents: ad50215
Author: Christian Schulte <schu...@apache.org>
Authored: Fri Mar 17 00:37:08 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Mar 17 00:40:30 2017 +0100
--
.../impl/DefaultDependencyCollector.java| 53 ---
.../graph/manager/DependencyManagerUtils.java | 69 +++-
2 files changed, 109 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a245b56a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
--
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index 35ede64..528200c 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -22,6 +22,7 @@ package org.eclipse.aether.internal.impl;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -48,6 +49,7 @@ import org.eclipse.aether.collection.VersionFilter;
import org.eclipse.aether.graph.DefaultDependencyNode;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.Exclusion;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.DependencyCollector;
import org.eclipse.aether.impl.RemoteRepositoryManager;
@@ -497,10 +499,11 @@ public class DefaultDependencyCollector
DependencyTraverser childTraverser = depTraverser != null ?
depTraverser.deriveChildTraverser( context ) : null;
VersionFilter childFilter = verFilter != null ?
verFilter.deriveChildFilter( context ) : null;
-final List childRepos = args.ignoreRepos
-? repositories
-: remoteRepositoryManager.aggregateRepositories( args.session,
repositories,
-
descriptorResult.getRepositories(), true );
+final List childRepos =
+args.ignoreRepos
+? repositories
+: remoteRepositoryManager.aggregateRepositories( args.session,
repositories,
+
descriptorResult.getRepositories(), true );
Object key =
args.pool.toKey( d.getArtifact(), childRepos, childSelector,
childManager, childTraverser, childFilter );
@@ -528,8 +531,9 @@ public class DefaultDependencyCollector
ArtifactDescriptorRequest descriptorRequest )
{
return noDescriptor
-? new ArtifactDescriptorResult( descriptorRequest )
-: resolveCachedArtifactDescriptor( args.pool, descriptorRequest,
args.session, d, results, args );
+ ? new ArtifactDescriptorResult( descriptorRequest )
+ : resolveCachedArtifactDescriptor( args.pool,
descriptorRequest, args.session, d, results, args );
+
}
private ArtifactDescriptorResult resolveCachedArtifactDescriptor( DataPool
pool,
@@ -629,7 +633,6 @@ public class DefaultDependencyCollector
return rangeResult;
}
-
private static boolean isLackingDescriptor( Artifact artifact )
{
return artifact.getProperty( ArtifactProperties.LOCAL_PATH, null ) !=
null;
@@ -711,7 +714,6 @@ public class DefaultDependencyCollector
final CollectRequest request;
-
public Args( RepositorySystemSession session, RequestTrace trace,
DataPool pool, NodeStack nodes,
DefaultDependencyCollectionContext collectionContext,
DefaultVersionFilterContext versionContext,
CollectRequest request )
@@ -789,12 +791,23 @@ public class DefaultDependencyCollector
static class PremanagedDependency
{
+
final String pr
maven-resolver git commit: [MRESOLVER-13] Exceptions are suppressed incorrectly when closing resources fails.
Repository: maven-resolver
Updated Branches:
refs/heads/master 9bf6abff7 -> ad50215d2
[MRESOLVER-13] Exceptions are suppressed incorrectly when closing resources
fails.
This closes #7
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/ad50215d
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/ad50215d
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/ad50215d
Branch: refs/heads/master
Commit: ad50215d27feede0ad0e5eb83ae96c6d6fdcc639
Parents: 9bf6abf
Author: Christian Schulte <c...@schulte.it>
Authored: Sun Mar 12 00:26:47 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Fri Mar 17 00:13:59 2017 +0100
--
.../connector/basic/ChecksumCalculator.java | 66
.../aether/connector/basic/PartialFile.java | 101 +---
.../aether/connector/basic/PartialFileTest.java | 98
.../internal/impl/DefaultFileProcessor.java | 104 -
.../transport/AbstractTransporter.java | 101 +++-
.../test/util/DependencyGraphParser.java| 21 ++-
.../test/util/IniArtifactDataReader.java| 18 ++-
.../internal/test/util/TestFileProcessor.java | 76 ++---
.../internal/test/util/TestFileUtils.java | 106 ++---
.../aether/transport/http/HttpServer.java | 34 +++-
.../transport/wagon/WagonTransporter.java | 155 +--
.../org/eclipse/aether/util/ChecksumUtils.java | 62
12 files changed, 647 insertions(+), 295 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/ad50215d/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
--
diff --git
a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
index e76f8a9..3d05ff0 100644
---
a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
+++
b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
@@ -22,6 +22,7 @@ package org.eclipse.aether.connector.basic;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -139,46 +140,37 @@ final class ChecksumCalculator
{
return;
}
+
+InputStream in = null;
try
{
-FileInputStream fis = new FileInputStream( targetFile );
-try
+in = new FileInputStream( targetFile );
+long total = 0;
+ByteBuffer buffer = ByteBuffer.allocate( 1024 * 32 );
+for ( byte[] array = buffer.array(); total < dataOffset; )
{
-long total = 0;
-ByteBuffer buffer = ByteBuffer.allocate( 1024 * 32 );
-for ( byte[] array = buffer.array(); total < dataOffset; )
+int read = in.read( array );
+if ( read < 0 )
{
-int read = fis.read( array );
-if ( read < 0 )
+if ( total < dataOffset )
{
-if ( total < dataOffset )
-{
-throw new IOException( targetFile + " contains
only " + total
-+ " bytes, cannot resume download from offset
" + dataOffset );
-}
-break;
+throw new IOException( targetFile + " contains only "
+ total
+ + " bytes, cannot resume
download from offset " + dataOffset );
}
-total += read;
-if ( total > dataOffset )
-{
-read -= total - dataOffset;
-}
-buffer.rewind();
-buffer.limit( read );
-update( buffer );
+break;
}
-}
-finally
-{
-try
-{
-fis.close();
-}
-catch ( IOException e )
+total += read;
+if ( total > dataOffset )
{
-// irrelevant
+
maven-resolver git commit: [MRESOLVER-14] Statistics should be calculated using System.nanoTime instead of System.currentTimeMillis.
Repository: maven-resolver
Updated Branches:
refs/heads/master 101f53422 -> 9bf6abff7
[MRESOLVER-14] Statistics should be calculated using System.nanoTime instead of
System.currentTimeMillis.
This closes #6
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/9bf6abff
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/9bf6abff
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/9bf6abff
Branch: refs/heads/master
Commit: 9bf6abff705f84327de94bf5c85ee0a98c814c2e
Parents: 101f534
Author: Christian Schulte <c...@schulte.it>
Authored: Sun Mar 12 00:30:30 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Mar 16 23:29:48 2017 +0100
--
.../aether/internal/impl/DefaultDependencyCollector.java | 6 +++---
.../aether/util/graph/transformer/ConflictIdSorter.java| 6 +++---
.../eclipse/aether/util/graph/transformer/ConflictMarker.java | 6 +++---
.../aether/util/graph/transformer/ConflictResolver.java| 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/9bf6abff/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
--
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index e2e3979..35ede64 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -169,7 +169,7 @@ public class DefaultDependencyCollector
List managedDependencies =
request.getManagedDependencies();
Map<String, Object> stats = logger.isDebugEnabled() ? new
LinkedHashMap<String, Object>() : null;
-long time1 = System.currentTimeMillis();
+long time1 = System.nanoTime();
DefaultDependencyNode node;
if ( root != null )
@@ -271,7 +271,7 @@ public class DefaultDependencyCollector
errorPath = results.errorPath;
}
-long time2 = System.currentTimeMillis();
+long time2 = System.nanoTime();
DependencyGraphTransformer transformer =
session.getDependencyGraphTransformer();
if ( transformer != null )
@@ -291,7 +291,7 @@ public class DefaultDependencyCollector
if ( stats != null )
{
-long time3 = System.currentTimeMillis();
+long time3 = System.nanoTime();
stats.put( "DefaultDependencyCollector.collectTime", time2 - time1
);
stats.put( "DefaultDependencyCollector.transformTime", time3 -
time2 );
logger.debug( "Dependency collection stats: " + stats );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/9bf6abff/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
--
diff --git
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
index c2122fa..5cc6432 100644
---
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
+++
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
@@ -63,7 +63,7 @@ public final class ConflictIdSorter
@SuppressWarnings( "unchecked" )
Map<String, Object> stats = (Map<String, Object>) context.get(
TransformationContextKeys.STATS );
-long time1 = System.currentTimeMillis();
+long time1 = System.nanoTime();
Map<Object, ConflictId> ids = new LinkedHashMap<Object, ConflictId>(
256 );
@@ -81,13 +81,13 @@ public final class ConflictIdSorter
buildConflitIdDAG( ids, node, id, 0, visited, conflictIds );
}
-long time2 = System.currentTimeMillis();
+long time2 = System.nanoTime();
int cycles = topsortConflictIds( ids.values(), context );
if ( stats != null )
{
-long time3 = System.currentTimeMillis();
+long time3 = System.nanoTime();
stats.put( "ConflictIdSorter.graphTime", time2 - time1 );
stats.put( "ConflictIdSorter.topsortTime", time3 - time2 );
stats.put( "ConflictIdSorter.conflictIdCount",
maven-resolver git commit: [MRESOLVER-11] Project dependency collection result should contain repositories.
Repository: maven-resolver
Updated Branches:
refs/heads/master 7a6a85bea -> 101f53422
[MRESOLVER-11] Project dependency collection result should contain repositories.
This closes #5
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/101f5342
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/101f5342
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/101f5342
Branch: refs/heads/master
Commit: 101f5342269fa28d1cb41313d6fd7282ba87019c
Parents: 7a6a85b
Author: Christian Schulte <c...@schulte.it>
Authored: Sat Mar 11 22:57:28 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Thu Mar 16 23:25:34 2017 +0100
--
.../eclipse/aether/internal/impl/DefaultDependencyCollector.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/101f5342/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
--
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index 90fc208..e2e3979 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -239,6 +239,8 @@ public class DefaultDependencyCollector
else
{
node = new DefaultDependencyNode( request.getRootArtifact() );
+node.setRequestContext( request.getRequestContext() );
+node.setRepositories( request.getRepositories() );
}
result.setRoot( node );
maven-resolver git commit: o Updated version to 1.1.0-SNAPSHOT.
Repository: maven-resolver Updated Branches: refs/heads/master 82acf06ca -> 7a6a85bea o Updated version to 1.1.0-SNAPSHOT. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/7a6a85be Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/7a6a85be Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/7a6a85be Branch: refs/heads/master Commit: 7a6a85bea4dd9ec97bfeaaa00c0e733b3ce9160c Parents: 82acf06 Author: Christian Schulte <schu...@apache.org> Authored: Thu Mar 16 23:15:32 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Thu Mar 16 23:15:32 2017 +0100 -- maven-resolver-api/pom.xml | 2 +- maven-resolver-connector-basic/pom.xml | 2 +- maven-resolver-impl/pom.xml| 2 +- maven-resolver-spi/pom.xml | 2 +- maven-resolver-test-util/pom.xml | 2 +- maven-resolver-transport-classpath/pom.xml | 2 +- maven-resolver-transport-file/pom.xml | 2 +- maven-resolver-transport-http/pom.xml | 2 +- maven-resolver-transport-wagon/pom.xml | 2 +- maven-resolver-util/pom.xml| 2 +- pom.xml| 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-api/pom.xml -- diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml index ae63fe0..6907857 100644 --- a/maven-resolver-api/pom.xml +++ b/maven-resolver-api/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAPSHOT +1.1.0-SNAPSHOT maven-resolver-api http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-connector-basic/pom.xml -- diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml index 7f428f6..1e8ac98 100644 --- a/maven-resolver-connector-basic/pom.xml +++ b/maven-resolver-connector-basic/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAPSHOT +1.1.0-SNAPSHOT maven-resolver-connector-basic http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-impl/pom.xml -- diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml index c405dc3..7ae2e8e 100644 --- a/maven-resolver-impl/pom.xml +++ b/maven-resolver-impl/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAPSHOT +1.1.0-SNAPSHOT maven-resolver-impl http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-spi/pom.xml -- diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml index 6295967..35267a8 100644 --- a/maven-resolver-spi/pom.xml +++ b/maven-resolver-spi/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAPSHOT +1.1.0-SNAPSHOT maven-resolver-spi http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-test-util/pom.xml -- diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml index c4dc1c2..6bbc5cb 100644 --- a/maven-resolver-test-util/pom.xml +++ b/maven-resolver-test-util/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAPSHOT +1.1.0-SNAPSHOT maven-resolver-test-util http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-transport-classpath/pom.xml -- diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml index e3d9ab4..1c5d141 100644 --- a/maven-resolver-transport-classpath/pom.xml +++ b/maven-resolver-transport-classpath/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAPSHOT +1.1.0-SNAPSHOT maven-resolver-transport-classpath http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7a6a85be/maven-resolver-transport-file/pom.xml -- diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml index 3a487b7..f6de89b 100644 --- a/maven-resolver-transport-file/pom.xml +++ b/maven-resolver-transport-file/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver -1.0.4-SNAP
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6183 [deleted] da03d6b03
maven git commit: [MNG-6183] Dependency management debug message corrections.
Repository: maven
Updated Branches:
refs/heads/master 51cc76c32 -> da03d6b03
[MNG-6183] Dependency management debug message corrections.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da03d6b0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da03d6b0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da03d6b0
Branch: refs/heads/master
Commit: da03d6b03192399237750c15f96fa021977dd83b
Parents: 51cc76c
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 14 19:20:47 2017 +0100
--
.../DefaultProjectDependenciesResolver.java | 83
1 file changed, 31 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/da03d6b0/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 21dfaa2..5a803af 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -29,8 +29,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -39,7 +37,6 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.ArtifactProperties;
import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.collection.CollectRequest;
@@ -239,8 +236,6 @@ public class DefaultProjectDependenciesResolver
private String indent = "";
-private Map<String, Dependency> managed;
-
public GraphLogger( MavenProject project )
{
this.project = project;
@@ -258,29 +253,48 @@ public class DefaultProjectDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
-String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
-if ( premanagedScope != null && !premanagedScope.equals(
dep.getScope() ) )
+// TODO We currently cannot tell which
section contained the management
+// information. When resolver 1.1 provides this
information, these log messages should be updated
+// to contain it.
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_SCOPE )
== DependencyNode.MANAGED_SCOPE )
{
-buffer.append( " (scope managed from " ).append(
premanagedScope );
-appendManagementSource( buffer, art, "scope" );
+final String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
+buffer.append( " (scope managed from " );
+buffer.append( StringUtils.defaultString( premanagedScope,
"default" ) );
buffer.append( ')' );
}
-String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
-if ( premanagedVersion != null && !premanagedVersion.equals(
art.getVersion() ) )
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_VERSION
) == DependencyNode.MANAGED_VERSION )
{
-buffer.append( " (version managed from " ).append(
premanagedVersion );
-appendManagementSource( buffer, art, "version" );
+final String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
+buffer.append( " (version managed from " );
+buffer.append( StringUtils.defaultString(
premanagedVersion, "default" ) );
buffer.append( ')' );
}
-Boolean premanagedOptional
maven git commit: [MNG-6183] Dependency management debug message corrections.
Repository: maven
Updated Branches:
refs/heads/MNG-6183 [created] da03d6b03
[MNG-6183] Dependency management debug message corrections.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da03d6b0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da03d6b0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da03d6b0
Branch: refs/heads/MNG-6183
Commit: da03d6b03192399237750c15f96fa021977dd83b
Parents: 51cc76c
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Tue Mar 14 19:20:47 2017 +0100
--
.../DefaultProjectDependenciesResolver.java | 83
1 file changed, 31 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/da03d6b0/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 21dfaa2..5a803af 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -29,8 +29,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -39,7 +37,6 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.ArtifactProperties;
import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.collection.CollectRequest;
@@ -239,8 +236,6 @@ public class DefaultProjectDependenciesResolver
private String indent = "";
-private Map<String, Dependency> managed;
-
public GraphLogger( MavenProject project )
{
this.project = project;
@@ -258,29 +253,48 @@ public class DefaultProjectDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
-String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
-if ( premanagedScope != null && !premanagedScope.equals(
dep.getScope() ) )
+// TODO We currently cannot tell which
section contained the management
+// information. When resolver 1.1 provides this
information, these log messages should be updated
+// to contain it.
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_SCOPE )
== DependencyNode.MANAGED_SCOPE )
{
-buffer.append( " (scope managed from " ).append(
premanagedScope );
-appendManagementSource( buffer, art, "scope" );
+final String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
+buffer.append( " (scope managed from " );
+buffer.append( StringUtils.defaultString( premanagedScope,
"default" ) );
buffer.append( ')' );
}
-String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
-if ( premanagedVersion != null && !premanagedVersion.equals(
art.getVersion() ) )
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_VERSION
) == DependencyNode.MANAGED_VERSION )
{
-buffer.append( " (version managed from " ).append(
premanagedVersion );
-appendManagementSource( buffer, art, "version" );
+final String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
+buffer.append( " (version managed from " );
+buffer.append( StringUtils.defaultString(
premanagedVersion, "default" ) );
buffer.append( ')' );
}
-Boolean premanagedOptional =
[1/3] maven-resolver git commit: o Removed unused test dependency on hamcrest-library. o Added used but undeclared test dependency on hamcrest-core.
Repository: maven-resolver Updated Branches: refs/heads/master 0cce625d1 -> 82acf06ca o Removed unused test dependency on hamcrest-library. o Added used but undeclared test dependency on hamcrest-core. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/fb686aea Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/fb686aea Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/fb686aea Branch: refs/heads/master Commit: fb686aea49072d849a437bee68b1b36f0fe61356 Parents: 0cce625 Author: Christian Schulte <schu...@apache.org> Authored: Sun Mar 12 02:33:59 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sun Mar 12 02:51:55 2017 +0100 -- maven-resolver-api/pom.xml | 2 +- maven-resolver-connector-basic/pom.xml | 2 +- maven-resolver-impl/pom.xml| 2 +- maven-resolver-spi/pom.xml | 2 +- maven-resolver-test-util/pom.xml | 2 +- maven-resolver-transport-classpath/pom.xml | 2 +- maven-resolver-transport-file/pom.xml | 2 +- maven-resolver-transport-http/pom.xml | 2 +- maven-resolver-transport-wagon/pom.xml | 2 +- maven-resolver-util/pom.xml| 8 pom.xml| 6 -- 11 files changed, 13 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-api/pom.xml -- diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml index bc5e39e..ae63fe0 100644 --- a/maven-resolver-api/pom.xml +++ b/maven-resolver-api/pom.xml @@ -43,7 +43,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-connector-basic/pom.xml -- diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml index 594d1f3..7f428f6 100644 --- a/maven-resolver-connector-basic/pom.xml +++ b/maven-resolver-connector-basic/pom.xml @@ -67,7 +67,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-impl/pom.xml -- diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml index 06bdaf0..c405dc3 100644 --- a/maven-resolver-impl/pom.xml +++ b/maven-resolver-impl/pom.xml @@ -80,7 +80,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-spi/pom.xml -- diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml index f193070..6295967 100644 --- a/maven-resolver-spi/pom.xml +++ b/maven-resolver-spi/pom.xml @@ -47,7 +47,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-test-util/pom.xml -- diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml index 5496507..c4dc1c2 100644 --- a/maven-resolver-test-util/pom.xml +++ b/maven-resolver-test-util/pom.xml @@ -51,7 +51,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-transport-classpath/pom.xml -- diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml index 8acf543..e3d9ab4 100644 --- a/maven-resolver-transport-classpath/pom.xml +++ b/maven-resolver-transport-classpath/pom.xml @@ -67,7 +67,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-transport-file/pom.xml -- diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml index c6f5f9e..6d80bc3 100644 --- a/maven-resolver-transport-file/pom.xml +++ b/maven-resolver-transport-file/pom.xml @@ -67,7 +67,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolve
[3/3] maven-resolver git commit: o Added used but undeclared transitive dependencies.
o Added used but undeclared transitive dependencies. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/82acf06c Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/82acf06c Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/82acf06c Branch: refs/heads/master Commit: 82acf06ca0074601c39a7b99b5a0afb4a8a2dc69 Parents: 3dd893c Author: Christian Schulte <schu...@apache.org> Authored: Sun Mar 12 02:50:37 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sun Mar 12 02:52:44 2017 +0100 -- maven-resolver-transport-http/pom.xml | 22 ++ 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/82acf06c/maven-resolver-transport-http/pom.xml -- diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml index cad2be2..6db8834 100644 --- a/maven-resolver-transport-http/pom.xml +++ b/maven-resolver-transport-http/pom.xml @@ -61,6 +61,11 @@ + org.apache.httpcomponents + httpcore + 4.2.5 + + org.slf4j jcl-over-slf4j 1.6.2 @@ -99,11 +104,28 @@ test + org.eclipse.jetty + jetty-util + 7.6.14.v20131031 + test + + + org.eclipse.jetty.orbit + javax.servlet + 2.5.0.v201103041518 + test + + ch.qos.logback logback-classic 1.0.7 test + + org.slf4j + slf4j-api + test +
[2/5] maven git commit: [MNG-1577] dependencyManagement does not work for transitive dependencies
[MNG-1577] dependencyManagement does not work for transitive dependencies o Updated to correct an incorrect test case. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c7736ec4 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7736ec4 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7736ec4 Branch: refs/heads/DEPMGMT Commit: c7736ec46326d3704ebeaced9199e0b640057163 Parents: 50f8aa7 Author: Christian Schulte <schu...@apache.org> Authored: Wed Feb 3 19:17:02 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:48:20 2017 +0100 -- maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml | 2 -- maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml| 2 -- 2 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/c7736ec4/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml -- diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml index 4686219..2ac9544 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml @@ -24,8 +24,6 @@ maven-test t06-d 1.0 -test -false http://git-wip-us.apache.org/repos/asf/maven/blob/c7736ec4/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml -- diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml index 60c540c..6a66cd1 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml @@ -29,8 +29,6 @@ maven-test t06-d 1.2 -test -false
[3/5] maven git commit: [MNG-5935] Optional true getting lost in managed dependencies when transitive
[MNG-5935] Optional true getting lost in managed dependencies when transitive Updated to correctly map the optional flag of Maven model dependencies to Aether dependencies. Prior to this change all managed dependencies implicitly had the optional flag set to 'false' leading to Aether managing that flag to 'false' on all managed dependencies when transitive. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/50f8aa7b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/50f8aa7b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/50f8aa7b Branch: refs/heads/DEPMGMT Commit: 50f8aa7b5b7b94ddbf740ed3617855fd78ce9181 Parents: c2e631f Author: Christian Schulte <schu...@apache.org> Authored: Thu Feb 11 08:45:19 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:48:20 2017 +0100 -- .../src/main/java/org/apache/maven/RepositoryUtils.java | 7 ++- .../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +- 2 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/50f8aa7b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java -- diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java index 86eab4e..52442b7 100644 --- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java +++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java @@ -316,7 +316,12 @@ public class RepositoryUtils exclusions.add( toExclusion( exclusion ) ); } -Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions ); +Dependency result = new Dependency( artifact, +dependency.getScope(), +dependency.getOptional() != null +? dependency.isOptional() +: null, +exclusions ); return result; } http://git-wip-us.apache.org/repos/asf/maven/blob/50f8aa7b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java -- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java index 53c0475..a5e2ffd 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java @@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate exclusions.add( convert( exclusion ) ); } -Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions ); +Dependency result = new Dependency( artifact, dependency.getScope(), +dependency.getOptional() != null +? dependency.isOptional() +: null, +exclusions ); return result; }
[1/5] maven git commit: [MNG-5227] The 'optional' flag of a dependency should be manageable. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/DEPMGMT f99ff62f0 -> d8d67e6a7 (forced update)
[MNG-5227] The 'optional' flag of a dependency should be manageable.
o Updated to add missing management of the optional flag to the
ModelBuilder. The Maven resolver has been managing the optional
flag since years. This just adds the missing parts to the
ModelBuilder to make optional flag management consistent when
building the effective model no matter if resolved or if build.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c2e631ff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c2e631ff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c2e631ff
Branch: refs/heads/DEPMGMT
Commit: c2e631ff276138c57e994e18bc84a4bf3155b79c
Parents: a98321e
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:46:53 2017 +0100
--
.../model/management/DefaultDependencyManagementInjector.java | 7 ---
1 file changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/c2e631ff/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index e611973..731cdd8 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,13 +82,6 @@ public class DefaultDependencyManagementInjector
}
@Override
-protected void mergeDependency_Optional( Dependency target, Dependency
source, boolean sourceDominant,
- Map<Object, Object> context )
-{
-// optional flag is not managed
-}
-
-@Override
protected void mergeDependency_Exclusions( Dependency target,
Dependency source, boolean sourceDominant,
Map<Object, Object> context
)
{
[5/5] maven git commit: [MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should
be resolved the same way as projects.
o Updated to use the '' element to decide the style of resolution
as discussed on dev@. Plugins with prerequisites >= 3.6 get the correct
resolution, all other plugins will be resolved with direct 'test' and
'provided' dependencies ignored but direct 'optional' dependencies.
o During working on MNG-6135, it turned out that plugin dependency management
also is applied to the dependencies declared for a plugin using the
'plugins/plugin/dependencies/dependency' element. Dependencies declared
that way must not be overridden by any management. I added management for
'plexus-utils' in the core IT suite. This immediately made the ITs for
MNG-4276 and MNG-4274 fail, because 'plexus-utils' got subject to management
although a different version has been declared in the plugin declaration.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d8d67e6a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d8d67e6a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d8d67e6a
Branch: refs/heads/DEPMGMT
Commit: d8d67e6a72cf20bf1d487d9b5429e87156490864
Parents: a991829
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 17 03:07:04 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:48:21 2017 +0100
--
.../java/org/apache/maven/RepositoryUtils.java | 12 +-
.../DefaultPluginDependenciesResolver.java | 370 ---
.../plugin/internal/PlexusUtilsInjector.java| 30 +-
.../maven/plugin/internal/WagonExcluder.java| 14 +-
4 files changed, 344 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d8d67e6a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 52442b7..08749ea 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -114,12 +114,16 @@ public class RepositoryUtils
List nodeTrail = new ArrayList<>( trail.size() + 1 );
nodeTrail.addAll( trail );
-nodeTrail.add( artifact.getId() );
-if ( filter == null || filter.accept( node,
Collections.emptyList() ) )
+if ( artifact != null )
{
-artifact.setDependencyTrail( nodeTrail );
-artifacts.add( artifact );
+nodeTrail.add( artifact.getId() );
+
+if ( filter == null || filter.accept( node,
Collections.emptyList() ) )
+{
+artifact.setDependencyTrail( nodeTrail );
+artifacts.add( artifact );
+}
}
toArtifacts( artifacts, node.getChildren(), nodeTrail, filter );
http://git-wip-us.apache.org/repos/asf/maven/blob/d8d67e6a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index b79b15f..80fd80d 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -20,10 +20,11 @@ package org.apache.maven.plugin.internal;
*/
import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
@@ -37,8 +38,11 @@ import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionContext;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyGraphTransformer;
+import org.eclipse.aether.collection.DependencyManagement;
+import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.g
[4/5] maven git commit: [MNG-5761] Dependency management is not transitive.
[MNG-5761] Dependency management is not transitive. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a9918298 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a9918298 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a9918298 Branch: refs/heads/DEPMGMT Commit: a99182986fabfcf32d840271e10d8c97181f4a55 Parents: c7736ec Author: Christian Schulte <schu...@apache.org> Authored: Tue Dec 13 22:35:13 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:48:21 2017 +0100 -- .../maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++-- .../maven/repository/internal/MavenRepositorySystemUtils.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a9918298/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java -- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java index 0cdea19..8e054e5 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java @@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector; import org.eclipse.aether.collection.DependencyTraverser; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; +import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; import org.eclipse.aether.util.graph.selector.OptionalDependencySelector; @@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase DependencyTraverser depTraverser = new FatArtifactTraverser(); session.setDependencyTraverser( depTraverser ); -DependencyManager depManager = new ClassicDependencyManager(); +DependencyManager depManager = new TransitiveDependencyManager(); session.setDependencyManager( depManager ); DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ), http://git-wip-us.apache.org/repos/asf/maven/blob/a9918298/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java -- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java index 1b11cb3..f6aeb11 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java @@ -20,7 +20,6 @@ package org.apache.maven.repository.internal; */ import java.util.Properties; - import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.artifact.DefaultArtifactType; import org.eclipse.aether.collection.DependencyGraphTransformer; @@ -33,7 +32,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory; import org.eclipse.aether.impl.VersionRangeResolver; import org.eclipse.aether.impl.VersionResolver; import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry; -import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; +import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; import org.eclipse.aether.util.graph.selector.OptionalDependencySelector; @@ -95,7 +94,7 @@ public final class MavenRepositorySystemUtils DependencyTraverser depTraverser = new FatArtifactTraverser(); session.setDependencyTraverser( depTraverser ); -DependencyManager depManager = new ClassicDependencyManager(); +DependencyManager depManager = new TransitiveDependencyManager(); session.setDependencyManager( depManager ); DependencySelector depFilter =
[3/3] maven git commit: [MNG-6164] Collections inconsistently immutable.
[MNG-6164] Collections inconsistently immutable.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c013c0ee
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c013c0ee
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c013c0ee
Branch: refs/heads/MNG-6164
Commit: c013c0ee6fc1f6380b71c9e04719cc5af204183f
Parents: 34afec6
Author: Christian Schulte <schu...@apache.org>
Authored: Mon Dec 14 04:57:47 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:43:35 2017 +0100
--
.../apache/maven/artifact/DefaultArtifact.java | 2 +-
.../maven/artifact/versioning/VersionRange.java | 2 +-
.../repository/DefaultArtifactRepository.java | 2 +-
.../repository/MetadataResolutionResult.java| 27 ++--
.../repository/MavenArtifactRepository.java | 2 +-
.../resolver/ArtifactResolutionResult.java | 27 ++--
.../maven/artifact/resolver/ResolutionNode.java | 1 +
.../maven/exception/ExceptionSummary.java | 5 +++-
.../execution/DefaultMavenExecutionResult.java | 6 +++--
.../maven/lifecycle/internal/MojoExecutor.java | 18 +++--
.../internal/DefaultMavenPluginManager.java | 2 +-
.../prefix/DefaultPluginPrefixRequest.java | 4 +--
.../version/DefaultPluginVersionRequest.java| 2 +-
.../DefaultDependencyResolutionResult.java | 5 +++-
.../maven/project/DefaultProjectBuilder.java| 3 ++-
.../maven/project/DefaultProjectRealmCache.java | 4 ++-
.../org/apache/maven/project/MavenProject.java | 19 +++---
.../maven/project/artifact/ProjectArtifact.java | 7 +++--
.../java/org/apache/maven/cli/MavenCli.java | 4 ++-
.../model/building/ModelBuildingException.java | 2 +-
20 files changed, 92 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/c013c0ee/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
--
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index bd2e8ed..a6d1367 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -272,7 +272,7 @@ public class DefaultArtifact
return Collections.emptyList();
}
-return metadataMap.values();
+return Collections.unmodifiableCollection( metadataMap.values() );
}
// --
http://git-wip-us.apache.org/repos/asf/maven/blob/c013c0ee/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
--
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
index 502b0e7..8cccb44 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -261,7 +261,7 @@ public class VersionRange
}
else
{
-restrictions = intersection( r1, r2 );
+restrictions = Collections.unmodifiableList( intersection( r1, r2
) );
}
ArtifactVersion version = null;
http://git-wip-us.apache.org/repos/asf/maven/blob/c013c0ee/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
index f5db5ef..16b82c5 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -256,7 +256,7 @@ public class DefaultArtifactRepository
{
if ( mirroredRepositories != null )
{
-this.mirroredRepositories = mirroredRepositories;
+this.mirroredRepositories = Collections.unmodifiableList(
mirroredRepositories );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/c013c0ee/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
--
diff --git
a/maven-com
[2/3] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/MNG-6164
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[1/3] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6164 a8d5f3bed -> c013c0ee6 (forced update)
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/MNG-6164
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
[3/3] maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
[MNG-6114] Profiles from the global settings should be ordered before profiles
from the user settings.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6d17c079
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6d17c079
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6d17c079
Branch: refs/heads/MNG-6114
Commit: 6d17c0796c751f723c0e748d3fa8bb4df893ff59
Parents: 34afec6
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:43:14 2017 +0100
--
.../org/apache/maven/settings/merge/MavenSettingsMerger.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/6d17c079/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
--
diff --git
a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
index 8d9f67b..cb5f6c1 100644
---
a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
+++
b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
@@ -111,6 +111,7 @@ public class MavenSettingsMerger
String
recessiveSourceLevel )
{
Map<String, T> dominantById = mapById( dominant );
+final List identifiables = new ArrayList<>( recessive.size() );
for ( T identifiable : recessive )
{
@@ -118,9 +119,11 @@ public class MavenSettingsMerger
{
identifiable.setSourceLevel( recessiveSourceLevel );
-dominant.add( identifiable );
+identifiables.add( identifiable );
}
}
+
+dominant.addAll( 0, identifiables );
}
/**
[1/3] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6114 85cd59bf8 -> 6d17c0796 (forced update)
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/MNG-6114
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
[2/3] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/MNG-6114
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[3/4] maven git commit: [MNG-5984] Maven core extension resolution ignores repositories from activeByDefault profiles in settings.xml
[MNG-5984] Maven core extension resolution ignores repositories from activeByDefault profiles in settings.xml Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/10782f6c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/10782f6c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/10782f6c Branch: refs/heads/MNG-5984 Commit: 10782f6c762c7a2a21328c6326b5e569a768d982 Parents: 34afec6 Author: Christian Schulte <schu...@apache.org> Authored: Thu Feb 25 19:46:13 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:42:44 2017 +0100 -- .../apache/maven/settings/SettingsUtils.java| 2 +- .../java/org/apache/maven/cli/MavenCli.java | 158 --- .../SettingsXmlConfigurationProcessor.java | 65 ++-- 3 files changed, 152 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/10782f6c/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java -- diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java index 8da696e..16ccdb6 100644 --- a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java +++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java @@ -139,7 +139,7 @@ public final class SettingsUtils profile.setId( settingsProfile.getId() ); -profile.setSource( "settings.xml" ); +profile.setSource( org.apache.maven.model.Profile.SOURCE_SETTINGS ); Activation settingsActivation = settingsProfile.getActivation(); http://git-wip-us.apache.org/repos/asf/maven/blob/10782f6c/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 8d38ab0..27f86d8 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -19,6 +19,28 @@ package org.apache.maven.cli; * under the License. */ +import java.io.BufferedInputStream; +import java.io.Console; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import com.google.common.base.Charsets; import com.google.common.io.Files; import com.google.inject.AbstractModule; @@ -28,6 +50,8 @@ import org.apache.commons.cli.UnrecognizedOptionException; import org.apache.maven.BuildAbort; import org.apache.maven.InternalErrorException; import org.apache.maven.Maven; +import org.apache.maven.artifact.InvalidRepositoryException; +import org.apache.maven.bridge.MavenRepositorySystem; import org.apache.maven.building.FileSource; import org.apache.maven.building.Problem; import org.apache.maven.building.Source; @@ -58,7 +82,15 @@ import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.extension.internal.CoreExports; import org.apache.maven.extension.internal.CoreExtensionEntry; import org.apache.maven.lifecycle.LifecycleExecutionException; +import org.apache.maven.model.Profile; +import org.apache.maven.model.Repository; +import org.apache.maven.model.building.DefaultModelProblem; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.model.building.ModelProblemCollector; +import org.apache.maven.model.building.ModelProblemCollectorRequest; import org.apache.maven.model.building.ModelProcessor; +import org.apache.maven.model.profile.DefaultProfileActivationContext; +import org.apache.maven.model.profile.ProfileSelector; import org.apache.maven.project.MavenProject; import org.apache.maven.properties.internal.EnvironmentUtils; import org.apache.maven.properties.internal.SystemProperties; @@ -89,28 +121,6 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; import org.sonatype.plexus.components.sec.dispatcher.SecUtil; import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity; -import java.io.BufferedInputStream; -import java.io.Console; -import java.io.File; -import java.io.Fi
[3/4] maven git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)
[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1d6af709
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1d6af709
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1d6af709
Branch: refs/heads/MNG-5359
Commit: 1d6af709bca616f82db79009d2ebfc8da7724569
Parents: 34afec6
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Dec 20 19:32:57 2015 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:42:16 2017 +0100
--
.../project/EmptyLifecyclePluginAnalyzer.java | 27 ++-
.../project/AbstractMavenProjectTestCase.xml| 2 +-
.../lifecycle/DefaultLifecycleExecutor.java | 22 +-
.../lifecycle/LifeCyclePluginAnalyzer.java | 32 ---
.../maven/lifecycle/LifecycleExecutor.java | 20 +-
.../LifecycleMappingNotFoundException.java | 45
.../lifecycle/LifecyclePluginAnalyzer.java | 59 ++
.../DefaultLifecyclePluginAnalyzer.java | 207 ++-
.../DefaultLifecycleBindingsInjector.java | 40 ++--
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 25 ++-
.../LifecycleExecutorSubModulesTest.java| 4 +-
.../stub/LifeCyclePluginAnalyzerStub.java | 74 ---
.../stub/LifecyclePluginAnalyzerStub.java | 96 +
.../project/AbstractMavenProjectTestCase.xml| 2 +-
.../maven/project/PomConstructionTest.xml | 2 +-
15 files changed, 451 insertions(+), 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/1d6af709/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
--
diff --git
a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
index 672e07b..2e0d7ea 100644
---
a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
+++
b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
@@ -23,7 +23,9 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.maven.lifecycle.LifeCyclePluginAnalyzer;
+import org.apache.maven.lifecycle.LifecyclePluginAnalyzer;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
@@ -31,8 +33,9 @@ import org.apache.maven.model.PluginExecution;
* @author Benjamin Bentmann
*/
public class EmptyLifecyclePluginAnalyzer
-implements LifeCyclePluginAnalyzer
+implements LifecyclePluginAnalyzer
{
+
public Set getPluginsBoundByDefaultToAllLifecycles( String
packaging )
{
Set plugins;
@@ -57,6 +60,26 @@ public class EmptyLifecyclePluginAnalyzer
return plugins;
}
+@Override
+public Model getLifecycleModel( final Model model )
+{
+if ( model == null )
+{
+throw new NullPointerException( "model" );
+}
+
+final Model lifecycleModel = new Model();
+lifecycleModel.setBuild( new Build() );
+lifecycleModel.getBuild().setPluginManagement( model.getBuild() != null
+ ?
model.getBuild().getPluginManagement()
+ : null );
+
+lifecycleModel.getBuild().getPlugins().
+addAll( this.getPluginsBoundByDefaultToAllLifecycles(
model.getPackaging() ) );
+
+return lifecycleModel;
+}
+
private Plugin newPlugin( String artifactId, String... goals )
{
Plugin plugin = new Plugin();
http://git-wip-us.apache.org/repos/asf/maven/blob/1d6af709/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
--
diff --git
a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
index bcc291e..7e02f5e 100644
---
a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
+++
b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
@@ -2,7 +2,7 @@
- org.apache.maven.lifecycle.LifeCyclePluginAnalyzer
+ org.apache.maven.lifecycle.LifecyclePluginAnalyzer
org.apache.maven.project.EmptyLifecyclePluginAnalyzer
http://git-wip-us.apache.org/repos/asf/maven/blob/1d6af709/maven-core/src/main/java/org/
[1/4] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5984 5b7246a89 -> 759af2256 (forced update)
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/MNG-5984
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
[4/4] maven git commit: o Updated to 3.5.1-SNAPSHOT.
o Updated to 3.5.1-SNAPSHOT. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/759af225 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/759af225 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/759af225 Branch: refs/heads/MNG-5984 Commit: 759af2256a85016caaa7c25be849160005b2d830 Parents: 10782f6 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 19:49:13 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:42:44 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 6fc5a73..d313f80 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..b13482b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..5eb7903 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2b205f7..b06d3f3 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..71f09c0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..66e09a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..859f0b3 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..aabb25d 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model http://git-wip-us.apache.org/repos/asf/maven/blob/759af225/
[1/4] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5359 32553d554 -> ef88bf59a (forced update)
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/MNG-5359
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
[2/4] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/MNG-5984
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[4/4] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run.
o Updated to 3.5.1-SNAPSHOT to make the ITs run. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ef88bf59 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ef88bf59 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ef88bf59 Branch: refs/heads/MNG-5359 Commit: ef88bf59a15014768c13d3ebe396438207b7c7c9 Parents: 1d6af70 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 04:17:19 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:42:16 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 6fc5a73..d313f80 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..b13482b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..5eb7903 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2b205f7..b06d3f3 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..71f09c0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..66e09a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..859f0b3 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/ef88bf59/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..aabb25d 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model http://git-wip-us.apache.org/repos/as
[2/4] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/MNG-5359
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[12/15] maven git commit: [MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should
be resolved the same way as projects.
o Updated to use the '' element to decide the style of resolution
as discussed on dev@. Plugins with prerequisites >= 3.6 get the correct
resolution, all other plugins will be resolved with direct 'test' and
'provided' dependencies ignored but direct 'optional' dependencies.
o During working on MNG-6135, it turned out that plugin dependency management
also is applied to the dependencies declared for a plugin using the
'plugins/plugin/dependencies/dependency' element. Dependencies declared
that way must not be overridden by any management. I added management for
'plexus-utils' in the core IT suite. This immediately made the ITs for
MNG-4276 and MNG-4274 fail, because 'plexus-utils' got subject to management
although a different version has been declared in the plugin declaration.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f99ff62f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f99ff62f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f99ff62f
Branch: refs/heads/DEPMGMT
Commit: f99ff62f0f05e8b900e075c74e4f532a1fb0eb7c
Parents: 67249bb
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 17 03:07:04 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
--
.../java/org/apache/maven/RepositoryUtils.java | 12 +-
.../DefaultPluginDependenciesResolver.java | 370 ---
.../plugin/internal/PlexusUtilsInjector.java| 30 +-
.../maven/plugin/internal/WagonExcluder.java| 14 +-
4 files changed, 344 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f99ff62f/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 52442b7..08749ea 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -114,12 +114,16 @@ public class RepositoryUtils
List nodeTrail = new ArrayList<>( trail.size() + 1 );
nodeTrail.addAll( trail );
-nodeTrail.add( artifact.getId() );
-if ( filter == null || filter.accept( node,
Collections.emptyList() ) )
+if ( artifact != null )
{
-artifact.setDependencyTrail( nodeTrail );
-artifacts.add( artifact );
+nodeTrail.add( artifact.getId() );
+
+if ( filter == null || filter.accept( node,
Collections.emptyList() ) )
+{
+artifact.setDependencyTrail( nodeTrail );
+artifacts.add( artifact );
+}
}
toArtifacts( artifacts, node.getChildren(), nodeTrail, filter );
http://git-wip-us.apache.org/repos/asf/maven/blob/f99ff62f/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index b79b15f..80fd80d 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -20,10 +20,11 @@ package org.apache.maven.plugin.internal;
*/
import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
@@ -37,8 +38,11 @@ import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionContext;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyGraphTransformer;
+import org.eclipse.aether.collection.DependencyManagement;
+import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.g
[14/15] maven git commit: [MNG-5227] The 'optional' flag of a dependency should be manageable.
[MNG-5227] The 'optional' flag of a dependency should be manageable.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ded79ab0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ded79ab0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ded79ab0
Branch: refs/heads/DEPMGMT
Commit: ded79ab0c8cbabb1942d5ba0efb2cf8d06e1cd77
Parents: a98321e
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
--
.../model/management/DefaultDependencyManagementInjector.java | 7 ---
1 file changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ded79ab0/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index e611973..731cdd8 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,13 +82,6 @@ public class DefaultDependencyManagementInjector
}
@Override
-protected void mergeDependency_Optional( Dependency target, Dependency
source, boolean sourceDominant,
- Map<Object, Object> context )
-{
-// optional flag is not managed
-}
-
-@Override
protected void mergeDependency_Exclusions( Dependency target,
Dependency source, boolean sourceDominant,
Map<Object, Object> context
)
{
[11/15] maven git commit: o Updated to Maven Resolver 1.2.0-SNAPSHOT.
o Updated to Maven Resolver 1.2.0-SNAPSHOT. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a98321ea Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a98321ea Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a98321ea Branch: refs/heads/DEPMGMT Commit: a98321ea9e420e83f223b542f2aeb3fcd9e69c54 Parents: cdb327d Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 20:22:42 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:41:23 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a98321ea/pom.xml -- diff --git a/pom.xml b/pom.xml index 45fe5d1..868841a 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 1.7 1.8.3 1.3 -1.0.3 +1.2.0-SNAPSHOT 1.7.22 true
[10/15] maven git commit: [MNG-1577] dependencyManagement does not work for transitive dependencies
[MNG-1577] dependencyManagement does not work for transitive dependencies o Updated to correct an incorrect test case. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/53f3cde9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/53f3cde9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/53f3cde9 Branch: refs/heads/DEPMGMT Commit: 53f3cde9823b2a07e27771239256bd1822fb47a5 Parents: 3cab133 Author: Christian Schulte <schu...@apache.org> Authored: Wed Feb 3 19:17:02 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:41:23 2017 +0100 -- maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml | 2 -- maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml| 2 -- 2 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/53f3cde9/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml -- diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml index 4686219..2ac9544 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml @@ -24,8 +24,6 @@ maven-test t06-d 1.0 -test -false http://git-wip-us.apache.org/repos/asf/maven/blob/53f3cde9/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml -- diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml index 60c540c..6a66cd1 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml @@ -29,8 +29,6 @@ maven-test t06-d 1.2 -test -false
[15/15] maven git commit: [MNG-5935] Optional true getting lost in managed dependencies when transitive
[MNG-5935] Optional true getting lost in managed dependencies when transitive Updated to correctly map the optional flag of Maven model dependencies to Aether dependencies. Prior to this change all managed dependencies implicitly had the optional flag set to 'false' leading to Aether managing that flag to 'false' on all managed dependencies when transitive. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3cab133a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3cab133a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3cab133a Branch: refs/heads/DEPMGMT Commit: 3cab133a9b8b9d3f0bdd90c9b6c9d6a5ab56abd6 Parents: ded79ab Author: Christian Schulte <schu...@apache.org> Authored: Thu Feb 11 08:45:19 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:41:23 2017 +0100 -- .../src/main/java/org/apache/maven/RepositoryUtils.java | 7 ++- .../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +- 2 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/3cab133a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java -- diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java index 86eab4e..52442b7 100644 --- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java +++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java @@ -316,7 +316,12 @@ public class RepositoryUtils exclusions.add( toExclusion( exclusion ) ); } -Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions ); +Dependency result = new Dependency( artifact, +dependency.getScope(), +dependency.getOptional() != null +? dependency.isOptional() +: null, +exclusions ); return result; } http://git-wip-us.apache.org/repos/asf/maven/blob/3cab133a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java -- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java index 53c0475..a5e2ffd 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java @@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate exclusions.add( convert( exclusion ) ); } -Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions ); +Dependency result = new Dependency( artifact, dependency.getScope(), +dependency.getOptional() != null +? dependency.isOptional() +: null, +exclusions ); return result; }
[06/15] maven git commit: o Updated version to 3.6.0-SNAPSHOT to make the ITs run.
o Updated version to 3.6.0-SNAPSHOT to make the ITs run. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cdb327d0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cdb327d0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cdb327d0 Branch: refs/heads/DEPMGMT Commit: cdb327d0311dd3a9a8b9df3addd608beb065fc11 Parents: 3f218a6 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 03:15:47 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:40:58 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index d313f80..2c52eb0 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index b13482b..089f4ac 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 5eb7903..6ca5ca2 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index b06d3f3..d4f53bd 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 71f09c0..053aafc 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 66e09a3..918d7d3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 859f0b3..f62e640 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index aabb25d..0ed9879 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-model http://git-wip-us.apache.org/rep
[08/15] maven git commit: [MNG-4347] import-scoped dependencies of direct dependencies are not resolved using profile modifications from settings.xml
[MNG-4347] import-scoped dependencies of direct dependencies are not resolved
using profile modifications from settings.xml
o Updated the 'DefaultModelResolver' to handle replacing repositories the same
way the
'DefaultDependencyCollector' does. When the 'DefaultDependencyCollector' finds
a repository in a child node with an id matching a repository already in use,
it will only merge any mirror definitions but never change the repository
already
in use. The 'DefaultModelResolver' needs to follow the same logic. What has
been
provided must not change for consistency.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6500c7ab
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6500c7ab
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6500c7ab
Branch: refs/heads/DEPMGMT
Commit: 6500c7abbef91e33efa47e4d5af5e2f64cc1ac8e
Parents: 7703955
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 13 03:30:32 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
--
.../maven/repository/internal/DefaultModelResolver.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/6500c7ab/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 3e82eb9..3be37d0 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -71,6 +71,8 @@ class DefaultModelResolver
private final List externalRepositories;
+private final Set externalRepositoryIds;
+
private final ArtifactResolver resolver;
private final VersionRangeResolver versionRangeResolver;
@@ -93,8 +95,13 @@ class DefaultModelResolver
List externalRepositories = new ArrayList<>();
externalRepositories.addAll( repositories );
this.externalRepositories = Collections.unmodifiableList(
externalRepositories );
-
this.repositoryIds = new HashSet<>();
+this.externalRepositoryIds = new HashSet<>();
+for ( final RemoteRepository repository : this.repositories )
+{
+this.repositoryIds.add( repository.getId() );
+this.externalRepositoryIds.add( repository.getId() );
+}
}
private DefaultModelResolver( DefaultModelResolver original )
@@ -108,6 +115,7 @@ class DefaultModelResolver
this.repositories = new ArrayList<>( original.repositories );
this.externalRepositories = original.externalRepositories;
this.repositoryIds = new HashSet<>( original.repositoryIds );
+this.externalRepositoryIds = new HashSet<>(
original.externalRepositoryIds );
}
@Override
@@ -128,7 +136,7 @@ class DefaultModelResolver
if ( !repositoryIds.add( repository.getId() ) )
{
-if ( !replace )
+if ( !replace || this.externalRepositoryIds.contains(
repository.getId() ) )
{
return;
}
[09/15] maven git commit: [MNG-5639] Support resolution of Import Scope POMs from Repo that contains a ${parameter}
[MNG-5639] Support resolution of Import Scope POMs from Repo that contains a
${parameter}
o Updated to stop replacing external repositories when repository merging is set
to REQUEST_DOMINANT.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7d3c50ad
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7d3c50ad
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7d3c50ad
Branch: refs/heads/DEPMGMT
Commit: 7d3c50ad0f7e99d4734693177c990d10e878bd5c
Parents: 6500c7a
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 13 20:16:20 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
--
.../project/DefaultProjectBuildingRequest.java | 19 +++
.../maven/project/ProjectModelResolver.java | 12 +++-
2 files changed, 22 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7d3c50ad/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index dafbefd..d42da04 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -80,22 +80,25 @@ public class DefaultProjectBuildingRequest
pluginArtifactRepositories = new ArrayList<>();
}
+@SuppressWarnings( "deprecation" )
public DefaultProjectBuildingRequest( ProjectBuildingRequest request )
{
this();
-setProcessPlugins( request.isProcessPlugins() );
-setProfiles( request.getProfiles() );
setActiveProfileIds( request.getActiveProfileIds() );
+setBuildStartTime( request.getBuildStartTime() );
setInactiveProfileIds( request.getInactiveProfileIds() );
-setSystemProperties( request.getSystemProperties() );
-setUserProperties( request.getUserProperties() );
-setRemoteRepositories( request.getRemoteRepositories() );
-setPluginArtifactRepositories( request.getPluginArtifactRepositories()
);
-setRepositorySession( request.getRepositorySession() );
setLocalRepository( request.getLocalRepository() );
-setBuildStartTime( request.getBuildStartTime() );
+setPluginArtifactRepositories( request.getPluginArtifactRepositories()
);
+setProcessPlugins( request.isProcessPlugins() );
+setProfiles( request.getProfiles() );
setProject( request.getProject() );
+setRemoteRepositories( request.getRemoteRepositories() );
+setRepositoryMerging( request.getRepositoryMerging() );
+setRepositorySession( request.getRepositorySession() );
setResolveDependencies( request.isResolveDependencies() );
+setResolveVersionRanges( request.isResolveVersionRanges() );
+setSystemProperties( request.getSystemProperties() );
+setUserProperties( request.getUserProperties() );
setValidationLevel( request.getValidationLevel() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/7d3c50ad/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 3a31d33..531ae0b 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -78,6 +78,8 @@ public class ProjectModelResolver
private final Set repositoryIds;
+private final Set externalRepositoryIds;
+
private final ReactorModelPool modelPool;
private final ProjectBuildingRequest.RepositoryMerging repositoryMerging;
@@ -99,7 +101,13 @@ public class ProjectModelResolver
this.repositories.addAll( externalRepositories );
this.repositoryMerging = repositoryMerging;
this.repositoryIds = new HashSet<>();
+this.externalRepositoryIds = new HashSet<>();
this.modelPool = modelPool;
+for ( final RemoteRepository repository : repositories )
+{
+this.repositoryIds.add( repository.getId() );
+this.externalRepositoryIds.add( repository.getId() );
+}
}
private ProjectModelResolver( ProjectModelResolver original )
@@ -113,6 +121,7 @@ public class ProjectModelR
[03/15] maven git commit: [MNG-5600] Dependency management import should support exclusions.
[MNG-5600] Dependency management import should support exclusions.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a737ac87
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a737ac87
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a737ac87
Branch: refs/heads/DEPMGMT
Commit: a737ac87320816010945501cea12b8b638e0033a
Parents: 12247ff
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 19 16:32:25 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 57 +++-
1 file changed, 45 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/a737ac87/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index e3beb2c..6d0b4a9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -19,6 +19,16 @@ package org.apache.maven.model.building;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -28,6 +38,7 @@ import org.apache.maven.model.Activation;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
@@ -63,17 +74,6 @@ import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import static org.apache.maven.model.building.Result.error;
import static org.apache.maven.model.building.Result.newResult;
@@ -1223,7 +1223,40 @@ public class DefaultModelBuilder
importMgmt = new DependencyManagement();
}
-putCache( request.getModelCache(), groupId, artifactId,
version, ModelCacheTag.IMPORT, importMgmt );
+// [MNG-5600] Dependency management import should support
exclusions.
+if ( !dependency.getExclusions().isEmpty() )
+{
+for ( final Exclusion exclusion :
dependency.getExclusions() )
+{
+if ( exclusion.getGroupId() != null &&
exclusion.getArtifactId() != null )
+{
+for ( final Iterator dependencies =
importMgmt.getDependencies().iterator();
+ dependencies.hasNext(); )
+{
+final Dependency candidate =
dependencies.next();
+
+if ( ( exclusion.getGroupId().equals( "*" )
+ || exclusion.getGroupId().equals(
candidate.getGroupId() ) )
+ && (
exclusion.getArtifactId().equals( "*" )
+ ||
exclusion.getArtifactId().equals( candidate.getArtifactId() ) ) )
+{
+// Dependency excluded from import.
+dependencies.remove();
+}
+}
+}
+}
+
+for ( final Dependency includedDependency :
importMgmt.getDependencies() )
+{
+includedDependency.getExclusions().addAll(
dependency.getExclusions() );
+}
+}
+else
+{
+// Only dependency managements wit
[02/15] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run.
o Updated to 3.5.1-SNAPSHOT to make the ITs run. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/77039555 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/77039555 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/77039555 Branch: refs/heads/DEPMGMT Commit: 77039555e2a6f329f63c1e26966ddb26f940af35 Parents: a737ac8 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 03:17:58 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:40:30 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 6fc5a73..d313f80 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..b13482b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..5eb7903 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2b205f7..b06d3f3 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..71f09c0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..66e09a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..859f0b3 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..aabb25d 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model http://git-wip-us.apache.org/repos/as
[07/15] maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing
[MNG-5971] Imported dependencies should be available to inheritance processing
o Updated the 'DefaultDependencyManagementImporter' to stop ignoring import
dependency conflicts silently. Such conflicts need to be resolved manually by
adding the conflicting dependency to the pom manually.
o Updated to add support for an 'include' scope in dependency management
processed before inheritance and interpolation.
o Re-formatted 'DefaultModelBuilder'.
o Documentation updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3f218a60
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3f218a60
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3f218a60
Branch: refs/heads/DEPMGMT
Commit: 3f218a6024f9b40365f19dba5fbba59bd0007c35
Parents: 7d3c50a
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Feb 18 14:07:02 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 384 ++-
.../building/DefaultModelBuildingResult.java| 26 +-
.../model/building/ModelBuildingResult.java | 12 +
.../DefaultDependencyManagementImporter.java| 213 +-
maven-model-builder/src/site/apt/index.apt | 12 +-
5 files changed, 528 insertions(+), 119 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 6d0b4a9..a010db5 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -84,6 +85,7 @@ import static
org.apache.maven.model.building.Result.newResult;
public class DefaultModelBuilder
implements ModelBuilder
{
+
@Requirement
private ModelProcessor modelProcessor;
@@ -250,8 +252,8 @@ public class DefaultModelBuilder
DefaultProfileActivationContext profileActivationContext =
getProfileActivationContext( request );
problems.setSource( "(external profiles)" );
-List activeExternalProfiles =
profileSelector.getActiveProfiles( request.getProfiles(),
-
profileActivationContext, problems );
+List activeExternalProfiles =
+profileSelector.getActiveProfiles( request.getProfiles(),
profileActivationContext, problems );
result.setActiveExternalProfiles( activeExternalProfiles );
@@ -298,8 +300,9 @@ public class DefaultModelBuilder
profileActivationContext.setProjectProperties(
tmpModel.getProperties() );
-List activePomProfiles =
profileSelector.getActiveProfiles( rawModel.getProfiles(),
-
profileActivationContext, problems );
+List activePomProfiles =
+profileSelector.getActiveProfiles( rawModel.getProfiles(),
profileActivationContext, problems );
+
currentData.setActiveProfiles( activePomProfiles );
Map<String, Activation> interpolatedActivations =
getProfileActivations( rawModel, false );
@@ -334,13 +337,13 @@ public class DefaultModelBuilder
}
else if ( currentData == resultData )
{ // First iteration - add initial id after version resolution.
-currentData.setGroupId( currentData.getRawModel().getGroupId()
== null ? parentData.getGroupId()
-
: currentData.getRawModel()
-
.getGroupId() );
+currentData.setGroupId( currentData.getRawModel().getGroupId()
== null
+? parentData.getGroupId()
+:
currentData.getRawModel().getGroupId() );
-currentData.setVersion( currentData.getRawModel().getVersion()
==
[04/15] maven git commit: [MNG-4463] Dependency management import should support version ranges.
[MNG-4463] Dependency management import should support version ranges.
Closes #64 without merging. ITs are pending to be committed.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0911ac5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0911ac5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0911ac5
Branch: refs/heads/DEPMGMT
Commit: d0911ac57dccb758435cdfd3495121ec9f0ae1b4
Parents: 34afec6
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d0911ac5/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4ebb033..3699bd9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1213,7 +1213,25 @@ public class DefaultModelBuilder
final ModelSource importSource;
try
{
-importSource = modelResolver.resolveModel( groupId,
artifactId, version );
+dependency = dependency.clone();
+importSource = modelResolver.resolveModel( dependency
);
+final String resolvedId =
+dependency.getGroupId() + ':' +
dependency.getArtifactId() + ':' + dependency.getVersion();
+
+if ( !imported.equals( resolvedId ) &&
importIds.contains( resolvedId ) )
+{
+// A version range has been resolved to a cycle.
+String message = "The dependencies of type=pom and
with scope=import form a cycle: ";
+for ( String modelId : importIds )
+{
+message += modelId + " -> ";
+}
+message += resolvedId;
+problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE ).
+setMessage( message ) );
+
+continue;
+}
}
catch ( UnresolvableModelException e )
{
[01/15] maven git commit: [MNG-6183] Dependency management debug message enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/DEPMGMT 3845f5c35 -> f99ff62f0 (forced update)
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/DEPMGMT
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[13/15] maven git commit: [MNG-5761] Dependency management is not transitive.
[MNG-5761] Dependency management is not transitive. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/67249bb9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/67249bb9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/67249bb9 Branch: refs/heads/DEPMGMT Commit: 67249bb9402b4e7caf3b80456c0ac1f2d5883841 Parents: 53f3cde Author: Christian Schulte <schu...@apache.org> Authored: Tue Dec 13 22:35:13 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:41:23 2017 +0100 -- .../maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++-- .../maven/repository/internal/MavenRepositorySystemUtils.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/67249bb9/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java -- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java index 0cdea19..8e054e5 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java @@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector; import org.eclipse.aether.collection.DependencyTraverser; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; +import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; import org.eclipse.aether.util.graph.selector.OptionalDependencySelector; @@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase DependencyTraverser depTraverser = new FatArtifactTraverser(); session.setDependencyTraverser( depTraverser ); -DependencyManager depManager = new ClassicDependencyManager(); +DependencyManager depManager = new TransitiveDependencyManager(); session.setDependencyManager( depManager ); DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ), http://git-wip-us.apache.org/repos/asf/maven/blob/67249bb9/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java -- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java index 1b11cb3..f6aeb11 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java @@ -20,7 +20,6 @@ package org.apache.maven.repository.internal; */ import java.util.Properties; - import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.artifact.DefaultArtifactType; import org.eclipse.aether.collection.DependencyGraphTransformer; @@ -33,7 +32,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory; import org.eclipse.aether.impl.VersionRangeResolver; import org.eclipse.aether.impl.VersionResolver; import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry; -import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; +import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; import org.eclipse.aether.util.graph.selector.OptionalDependencySelector; @@ -95,7 +94,7 @@ public final class MavenRepositorySystemUtils DependencyTraverser depTraverser = new FatArtifactTraverser(); session.setDependencyTraverser( depTraverser ); -DependencyManager depManager = new ClassicDependencyManager(); +DependencyManager depManager = new TransitiveDependencyManager(); session.setDependencyManager( depManager ); DependencySelector depFilter =
[05/15] maven git commit: [MNG-5527] Dependency management import should support relocations.
[MNG-5527] Dependency management import should support relocations.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/12247ff7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12247ff7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12247ff7
Branch: refs/heads/DEPMGMT
Commit: 12247ff7f4922548c2037b9874841ae03eb9952f
Parents: d0911ac
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 191 ---
1 file changed, 126 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/12247ff7/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 3699bd9..e3beb2c 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1119,8 +1119,6 @@ public class DefaultModelBuilder
final WorkspaceModelResolver workspaceResolver =
request.getWorkspaceModelResolver();
final ModelResolver modelResolver = request.getModelResolver();
-ModelBuildingRequest importRequest = null;
-
List importMgmts = null;
for ( Iterator it = depMgmt.getDependencies().iterator();
it.hasNext(); )
@@ -1207,75 +1205,15 @@ public class DefaultModelBuilder
}
}
-// no workspace resolver or workspace resolver returned null
(i.e. model not in workspace)
if ( importModel == null )
{
-final ModelSource importSource;
-try
-{
-dependency = dependency.clone();
-importSource = modelResolver.resolveModel( dependency
);
-final String resolvedId =
-dependency.getGroupId() + ':' +
dependency.getArtifactId() + ':' + dependency.getVersion();
-
-if ( !imported.equals( resolvedId ) &&
importIds.contains( resolvedId ) )
-{
-// A version range has been resolved to a cycle.
-String message = "The dependencies of type=pom and
with scope=import form a cycle: ";
-for ( String modelId : importIds )
-{
-message += modelId + " -> ";
-}
-message += resolvedId;
-problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE ).
-setMessage( message ) );
-
-continue;
-}
-}
-catch ( UnresolvableModelException e )
-{
-StringBuilder buffer = new StringBuilder( 256 );
-buffer.append( "Non-resolvable import POM" );
-if ( !containsCoordinates( e.getMessage(), groupId,
artifactId, version ) )
-{
-buffer.append( ' ' ).append(
ModelProblemUtils.toId( groupId, artifactId, version ) );
-}
-buffer.append( ": " ).append( e.getMessage() );
-
-problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE )
-.setMessage( buffer.toString() ).setLocation(
dependency.getLocation( "" ) )
-.setException( e ) );
-continue;
-}
-
-if ( importRequest == null )
-{
-importRequest = new DefaultModelBuildingRequest();
-importRequest.setValidationLevel(
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-importRequest.setModelCache( request.getModelCache() );
-importRequest.setSystemProperties(
request.getSystemProperties() );
-importRequest.setUserProperties(
request.getUserProperties() );
-
[3/9] maven git commit: [MNG-5527] Dependency management import should support relocations.
[MNG-5527] Dependency management import should support relocations.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/12247ff7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12247ff7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12247ff7
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: 12247ff7f4922548c2037b9874841ae03eb9952f
Parents: d0911ac
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 191 ---
1 file changed, 126 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/12247ff7/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 3699bd9..e3beb2c 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1119,8 +1119,6 @@ public class DefaultModelBuilder
final WorkspaceModelResolver workspaceResolver =
request.getWorkspaceModelResolver();
final ModelResolver modelResolver = request.getModelResolver();
-ModelBuildingRequest importRequest = null;
-
List importMgmts = null;
for ( Iterator it = depMgmt.getDependencies().iterator();
it.hasNext(); )
@@ -1207,75 +1205,15 @@ public class DefaultModelBuilder
}
}
-// no workspace resolver or workspace resolver returned null
(i.e. model not in workspace)
if ( importModel == null )
{
-final ModelSource importSource;
-try
-{
-dependency = dependency.clone();
-importSource = modelResolver.resolveModel( dependency
);
-final String resolvedId =
-dependency.getGroupId() + ':' +
dependency.getArtifactId() + ':' + dependency.getVersion();
-
-if ( !imported.equals( resolvedId ) &&
importIds.contains( resolvedId ) )
-{
-// A version range has been resolved to a cycle.
-String message = "The dependencies of type=pom and
with scope=import form a cycle: ";
-for ( String modelId : importIds )
-{
-message += modelId + " -> ";
-}
-message += resolvedId;
-problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE ).
-setMessage( message ) );
-
-continue;
-}
-}
-catch ( UnresolvableModelException e )
-{
-StringBuilder buffer = new StringBuilder( 256 );
-buffer.append( "Non-resolvable import POM" );
-if ( !containsCoordinates( e.getMessage(), groupId,
artifactId, version ) )
-{
-buffer.append( ' ' ).append(
ModelProblemUtils.toId( groupId, artifactId, version ) );
-}
-buffer.append( ": " ).append( e.getMessage() );
-
-problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE )
-.setMessage( buffer.toString() ).setLocation(
dependency.getLocation( "" ) )
-.setException( e ) );
-continue;
-}
-
-if ( importRequest == null )
-{
-importRequest = new DefaultModelBuildingRequest();
-importRequest.setValidationLevel(
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-importRequest.setModelCache( request.getModelCache() );
-importRequest.setSystemProperties(
request.getSystemProperties() );
-importRequest.setUserProperties(
request.getUserProperties() );
-
[5/9] maven git commit: [MNG-4463] Dependency management import should support version ranges.
[MNG-4463] Dependency management import should support version ranges.
Closes #64 without merging. ITs are pending to be committed.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0911ac5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0911ac5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0911ac5
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: d0911ac57dccb758435cdfd3495121ec9f0ae1b4
Parents: 34afec6
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d0911ac5/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4ebb033..3699bd9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1213,7 +1213,25 @@ public class DefaultModelBuilder
final ModelSource importSource;
try
{
-importSource = modelResolver.resolveModel( groupId,
artifactId, version );
+dependency = dependency.clone();
+importSource = modelResolver.resolveModel( dependency
);
+final String resolvedId =
+dependency.getGroupId() + ':' +
dependency.getArtifactId() + ':' + dependency.getVersion();
+
+if ( !imported.equals( resolvedId ) &&
importIds.contains( resolvedId ) )
+{
+// A version range has been resolved to a cycle.
+String message = "The dependencies of type=pom and
with scope=import form a cycle: ";
+for ( String modelId : importIds )
+{
+message += modelId + " -> ";
+}
+message += resolvedId;
+problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE ).
+setMessage( message ) );
+
+continue;
+}
}
catch ( UnresolvableModelException e )
{
[6/9] maven git commit: o Updated version to 3.6.0-SNAPSHOT to make the ITs run.
o Updated version to 3.6.0-SNAPSHOT to make the ITs run. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cdb327d0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cdb327d0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cdb327d0 Branch: refs/heads/DEPMGMT-INCLUDE Commit: cdb327d0311dd3a9a8b9df3addd608beb065fc11 Parents: 3f218a6 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 03:15:47 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:40:58 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index d313f80..2c52eb0 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index b13482b..089f4ac 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 5eb7903..6ca5ca2 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index b06d3f3..d4f53bd 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 71f09c0..053aafc 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 66e09a3..918d7d3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 859f0b3..f62e640 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index aabb25d..0ed9879 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.6.0-SNAPSHOT maven-model http://git-wip-us.apache.o
[7/9] maven git commit: [MNG-5639] Support resolution of Import Scope POMs from Repo that contains a ${parameter}
[MNG-5639] Support resolution of Import Scope POMs from Repo that contains a
${parameter}
o Updated to stop replacing external repositories when repository merging is set
to REQUEST_DOMINANT.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7d3c50ad
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7d3c50ad
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7d3c50ad
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: 7d3c50ad0f7e99d4734693177c990d10e878bd5c
Parents: 6500c7a
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 13 20:16:20 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
--
.../project/DefaultProjectBuildingRequest.java | 19 +++
.../maven/project/ProjectModelResolver.java | 12 +++-
2 files changed, 22 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7d3c50ad/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index dafbefd..d42da04 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -80,22 +80,25 @@ public class DefaultProjectBuildingRequest
pluginArtifactRepositories = new ArrayList<>();
}
+@SuppressWarnings( "deprecation" )
public DefaultProjectBuildingRequest( ProjectBuildingRequest request )
{
this();
-setProcessPlugins( request.isProcessPlugins() );
-setProfiles( request.getProfiles() );
setActiveProfileIds( request.getActiveProfileIds() );
+setBuildStartTime( request.getBuildStartTime() );
setInactiveProfileIds( request.getInactiveProfileIds() );
-setSystemProperties( request.getSystemProperties() );
-setUserProperties( request.getUserProperties() );
-setRemoteRepositories( request.getRemoteRepositories() );
-setPluginArtifactRepositories( request.getPluginArtifactRepositories()
);
-setRepositorySession( request.getRepositorySession() );
setLocalRepository( request.getLocalRepository() );
-setBuildStartTime( request.getBuildStartTime() );
+setPluginArtifactRepositories( request.getPluginArtifactRepositories()
);
+setProcessPlugins( request.isProcessPlugins() );
+setProfiles( request.getProfiles() );
setProject( request.getProject() );
+setRemoteRepositories( request.getRemoteRepositories() );
+setRepositoryMerging( request.getRepositoryMerging() );
+setRepositorySession( request.getRepositorySession() );
setResolveDependencies( request.isResolveDependencies() );
+setResolveVersionRanges( request.isResolveVersionRanges() );
+setSystemProperties( request.getSystemProperties() );
+setUserProperties( request.getUserProperties() );
setValidationLevel( request.getValidationLevel() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/7d3c50ad/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 3a31d33..531ae0b 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -78,6 +78,8 @@ public class ProjectModelResolver
private final Set repositoryIds;
+private final Set externalRepositoryIds;
+
private final ReactorModelPool modelPool;
private final ProjectBuildingRequest.RepositoryMerging repositoryMerging;
@@ -99,7 +101,13 @@ public class ProjectModelResolver
this.repositories.addAll( externalRepositories );
this.repositoryMerging = repositoryMerging;
this.repositoryIds = new HashSet<>();
+this.externalRepositoryIds = new HashSet<>();
this.modelPool = modelPool;
+for ( final RemoteRepository repository : repositories )
+{
+this.repositoryIds.add( repository.getId() );
+this.externalRepositoryIds.add( repository.getId() );
+}
}
private ProjectModelResolver( ProjectModelResolver original )
@@ -113,6 +121,7 @@ public class ProjectModelR
[1/9] maven git commit: [MNG-6183] Dependency management debug message enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/DEPMGMT-INCLUDE 4c9d6a0e8 -> cdb327d03 (forced update)
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[4/9] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run.
o Updated to 3.5.1-SNAPSHOT to make the ITs run. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/77039555 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/77039555 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/77039555 Branch: refs/heads/DEPMGMT-INCLUDE Commit: 77039555e2a6f329f63c1e26966ddb26f940af35 Parents: a737ac8 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 03:17:58 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:40:30 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 6fc5a73..d313f80 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..b13482b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..5eb7903 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2b205f7..b06d3f3 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..71f09c0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..66e09a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..859f0b3 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..aabb25d 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model http://git-wip-us.apache.org/rep
[2/9] maven git commit: [MNG-5600] Dependency management import should support exclusions.
[MNG-5600] Dependency management import should support exclusions.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a737ac87
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a737ac87
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a737ac87
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: a737ac87320816010945501cea12b8b638e0033a
Parents: 12247ff
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 19 16:32:25 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 57 +++-
1 file changed, 45 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/a737ac87/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index e3beb2c..6d0b4a9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -19,6 +19,16 @@ package org.apache.maven.model.building;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -28,6 +38,7 @@ import org.apache.maven.model.Activation;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
@@ -63,17 +74,6 @@ import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import static org.apache.maven.model.building.Result.error;
import static org.apache.maven.model.building.Result.newResult;
@@ -1223,7 +1223,40 @@ public class DefaultModelBuilder
importMgmt = new DependencyManagement();
}
-putCache( request.getModelCache(), groupId, artifactId,
version, ModelCacheTag.IMPORT, importMgmt );
+// [MNG-5600] Dependency management import should support
exclusions.
+if ( !dependency.getExclusions().isEmpty() )
+{
+for ( final Exclusion exclusion :
dependency.getExclusions() )
+{
+if ( exclusion.getGroupId() != null &&
exclusion.getArtifactId() != null )
+{
+for ( final Iterator dependencies =
importMgmt.getDependencies().iterator();
+ dependencies.hasNext(); )
+{
+final Dependency candidate =
dependencies.next();
+
+if ( ( exclusion.getGroupId().equals( "*" )
+ || exclusion.getGroupId().equals(
candidate.getGroupId() ) )
+ && (
exclusion.getArtifactId().equals( "*" )
+ ||
exclusion.getArtifactId().equals( candidate.getArtifactId() ) ) )
+{
+// Dependency excluded from import.
+dependencies.remove();
+}
+}
+}
+}
+
+for ( final Dependency includedDependency :
importMgmt.getDependencies() )
+{
+includedDependency.getExclusions().addAll(
dependency.getExclusions() );
+}
+}
+else
+{
+// Only dependency manag
[8/9] maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing
[MNG-5971] Imported dependencies should be available to inheritance processing
o Updated the 'DefaultDependencyManagementImporter' to stop ignoring import
dependency conflicts silently. Such conflicts need to be resolved manually by
adding the conflicting dependency to the pom manually.
o Updated to add support for an 'include' scope in dependency management
processed before inheritance and interpolation.
o Re-formatted 'DefaultModelBuilder'.
o Documentation updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3f218a60
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3f218a60
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3f218a60
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: 3f218a6024f9b40365f19dba5fbba59bd0007c35
Parents: 7d3c50a
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Feb 18 14:07:02 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 384 ++-
.../building/DefaultModelBuildingResult.java| 26 +-
.../model/building/ModelBuildingResult.java | 12 +
.../DefaultDependencyManagementImporter.java| 213 +-
maven-model-builder/src/site/apt/index.apt | 12 +-
5 files changed, 528 insertions(+), 119 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 6d0b4a9..a010db5 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -84,6 +85,7 @@ import static
org.apache.maven.model.building.Result.newResult;
public class DefaultModelBuilder
implements ModelBuilder
{
+
@Requirement
private ModelProcessor modelProcessor;
@@ -250,8 +252,8 @@ public class DefaultModelBuilder
DefaultProfileActivationContext profileActivationContext =
getProfileActivationContext( request );
problems.setSource( "(external profiles)" );
-List activeExternalProfiles =
profileSelector.getActiveProfiles( request.getProfiles(),
-
profileActivationContext, problems );
+List activeExternalProfiles =
+profileSelector.getActiveProfiles( request.getProfiles(),
profileActivationContext, problems );
result.setActiveExternalProfiles( activeExternalProfiles );
@@ -298,8 +300,9 @@ public class DefaultModelBuilder
profileActivationContext.setProjectProperties(
tmpModel.getProperties() );
-List activePomProfiles =
profileSelector.getActiveProfiles( rawModel.getProfiles(),
-
profileActivationContext, problems );
+List activePomProfiles =
+profileSelector.getActiveProfiles( rawModel.getProfiles(),
profileActivationContext, problems );
+
currentData.setActiveProfiles( activePomProfiles );
Map<String, Activation> interpolatedActivations =
getProfileActivations( rawModel, false );
@@ -334,13 +337,13 @@ public class DefaultModelBuilder
}
else if ( currentData == resultData )
{ // First iteration - add initial id after version resolution.
-currentData.setGroupId( currentData.getRawModel().getGroupId()
== null ? parentData.getGroupId()
-
: currentData.getRawModel()
-
.getGroupId() );
+currentData.setGroupId( currentData.getRawModel().getGroupId()
== null
+? parentData.getGroupId()
+:
currentData.getRawModel().getGroupId() );
-currentData.setVersion( currentData.getRawModel().getVersion()
==
[9/9] maven git commit: [MNG-4347] import-scoped dependencies of direct dependencies are not resolved using profile modifications from settings.xml
[MNG-4347] import-scoped dependencies of direct dependencies are not resolved
using profile modifications from settings.xml
o Updated the 'DefaultModelResolver' to handle replacing repositories the same
way the
'DefaultDependencyCollector' does. When the 'DefaultDependencyCollector' finds
a repository in a child node with an id matching a repository already in use,
it will only merge any mirror definitions but never change the repository
already
in use. The 'DefaultModelResolver' needs to follow the same logic. What has
been
provided must not change for consistency.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6500c7ab
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6500c7ab
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6500c7ab
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: 6500c7abbef91e33efa47e4d5af5e2f64cc1ac8e
Parents: 7703955
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Dec 13 03:30:32 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
--
.../maven/repository/internal/DefaultModelResolver.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/6500c7ab/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 3e82eb9..3be37d0 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -71,6 +71,8 @@ class DefaultModelResolver
private final List externalRepositories;
+private final Set externalRepositoryIds;
+
private final ArtifactResolver resolver;
private final VersionRangeResolver versionRangeResolver;
@@ -93,8 +95,13 @@ class DefaultModelResolver
List externalRepositories = new ArrayList<>();
externalRepositories.addAll( repositories );
this.externalRepositories = Collections.unmodifiableList(
externalRepositories );
-
this.repositoryIds = new HashSet<>();
+this.externalRepositoryIds = new HashSet<>();
+for ( final RemoteRepository repository : this.repositories )
+{
+this.repositoryIds.add( repository.getId() );
+this.externalRepositoryIds.add( repository.getId() );
+}
}
private DefaultModelResolver( DefaultModelResolver original )
@@ -108,6 +115,7 @@ class DefaultModelResolver
this.repositories = new ArrayList<>( original.repositories );
this.externalRepositories = original.externalRepositories;
this.repositoryIds = new HashSet<>( original.repositoryIds );
+this.externalRepositoryIds = new HashSet<>(
original.externalRepositoryIds );
}
@Override
@@ -128,7 +136,7 @@ class DefaultModelResolver
if ( !repositoryIds.add( repository.getId() ) )
{
-if ( !replace )
+if ( !replace || this.externalRepositoryIds.contains(
repository.getId() ) )
{
return;
}
[2/5] maven git commit: [MNG-5527] Dependency management import should support relocations.
[MNG-5527] Dependency management import should support relocations.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/12247ff7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12247ff7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12247ff7
Branch: refs/heads/DEPMGMT-IMPORT
Commit: 12247ff7f4922548c2037b9874841ae03eb9952f
Parents: d0911ac
Author: Christian Schulte <schu...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 191 ---
1 file changed, 126 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/12247ff7/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 3699bd9..e3beb2c 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1119,8 +1119,6 @@ public class DefaultModelBuilder
final WorkspaceModelResolver workspaceResolver =
request.getWorkspaceModelResolver();
final ModelResolver modelResolver = request.getModelResolver();
-ModelBuildingRequest importRequest = null;
-
List importMgmts = null;
for ( Iterator it = depMgmt.getDependencies().iterator();
it.hasNext(); )
@@ -1207,75 +1205,15 @@ public class DefaultModelBuilder
}
}
-// no workspace resolver or workspace resolver returned null
(i.e. model not in workspace)
if ( importModel == null )
{
-final ModelSource importSource;
-try
-{
-dependency = dependency.clone();
-importSource = modelResolver.resolveModel( dependency
);
-final String resolvedId =
-dependency.getGroupId() + ':' +
dependency.getArtifactId() + ':' + dependency.getVersion();
-
-if ( !imported.equals( resolvedId ) &&
importIds.contains( resolvedId ) )
-{
-// A version range has been resolved to a cycle.
-String message = "The dependencies of type=pom and
with scope=import form a cycle: ";
-for ( String modelId : importIds )
-{
-message += modelId + " -> ";
-}
-message += resolvedId;
-problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE ).
-setMessage( message ) );
-
-continue;
-}
-}
-catch ( UnresolvableModelException e )
-{
-StringBuilder buffer = new StringBuilder( 256 );
-buffer.append( "Non-resolvable import POM" );
-if ( !containsCoordinates( e.getMessage(), groupId,
artifactId, version ) )
-{
-buffer.append( ' ' ).append(
ModelProblemUtils.toId( groupId, artifactId, version ) );
-}
-buffer.append( ": " ).append( e.getMessage() );
-
-problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE )
-.setMessage( buffer.toString() ).setLocation(
dependency.getLocation( "" ) )
-.setException( e ) );
-continue;
-}
-
-if ( importRequest == null )
-{
-importRequest = new DefaultModelBuildingRequest();
-importRequest.setValidationLevel(
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-importRequest.setModelCache( request.getModelCache() );
-importRequest.setSystemProperties(
request.getSystemProperties() );
-importRequest.setUserProperties(
request.getUserProperties() );
-
[1/5] maven git commit: [MNG-6183] Dependency management debug message enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/DEPMGMT-IMPORT 1da33efe7 -> 77039555e (forced update)
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/DEPMGMT-IMPORT
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[3/5] maven git commit: [MNG-5600] Dependency management import should support exclusions.
[MNG-5600] Dependency management import should support exclusions.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a737ac87
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a737ac87
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a737ac87
Branch: refs/heads/DEPMGMT-IMPORT
Commit: a737ac87320816010945501cea12b8b638e0033a
Parents: 12247ff
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jun 19 16:32:25 2016 +0200
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 57 +++-
1 file changed, 45 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/a737ac87/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index e3beb2c..6d0b4a9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -19,6 +19,16 @@ package org.apache.maven.model.building;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -28,6 +38,7 @@ import org.apache.maven.model.Activation;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
@@ -63,17 +74,6 @@ import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import static org.apache.maven.model.building.Result.error;
import static org.apache.maven.model.building.Result.newResult;
@@ -1223,7 +1223,40 @@ public class DefaultModelBuilder
importMgmt = new DependencyManagement();
}
-putCache( request.getModelCache(), groupId, artifactId,
version, ModelCacheTag.IMPORT, importMgmt );
+// [MNG-5600] Dependency management import should support
exclusions.
+if ( !dependency.getExclusions().isEmpty() )
+{
+for ( final Exclusion exclusion :
dependency.getExclusions() )
+{
+if ( exclusion.getGroupId() != null &&
exclusion.getArtifactId() != null )
+{
+for ( final Iterator dependencies =
importMgmt.getDependencies().iterator();
+ dependencies.hasNext(); )
+{
+final Dependency candidate =
dependencies.next();
+
+if ( ( exclusion.getGroupId().equals( "*" )
+ || exclusion.getGroupId().equals(
candidate.getGroupId() ) )
+ && (
exclusion.getArtifactId().equals( "*" )
+ ||
exclusion.getArtifactId().equals( candidate.getArtifactId() ) ) )
+{
+// Dependency excluded from import.
+dependencies.remove();
+}
+}
+}
+}
+
+for ( final Dependency includedDependency :
importMgmt.getDependencies() )
+{
+includedDependency.getExclusions().addAll(
dependency.getExclusions() );
+}
+}
+else
+{
+// Only dependency managements wit
[4/5] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run.
o Updated to 3.5.1-SNAPSHOT to make the ITs run. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/77039555 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/77039555 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/77039555 Branch: refs/heads/DEPMGMT-IMPORT Commit: 77039555e2a6f329f63c1e26966ddb26f940af35 Parents: a737ac8 Author: Christian Schulte <schu...@apache.org> Authored: Tue Jan 31 03:17:58 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:40:30 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 6fc5a73..d313f80 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..b13482b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..5eb7903 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2b205f7..b06d3f3 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..71f09c0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..66e09a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..859f0b3 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..aabb25d 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.1-SNAPSHOT maven-model http://git-wip-us.apache.org/rep
[5/5] maven git commit: [MNG-4463] Dependency management import should support version ranges.
[MNG-4463] Dependency management import should support version ranges.
Closes #64 without merging. ITs are pending to be committed.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0911ac5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0911ac5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0911ac5
Branch: refs/heads/DEPMGMT-IMPORT
Commit: d0911ac57dccb758435cdfd3495121ec9f0ae1b4
Parents: 34afec6
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d0911ac5/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4ebb033..3699bd9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1213,7 +1213,25 @@ public class DefaultModelBuilder
final ModelSource importSource;
try
{
-importSource = modelResolver.resolveModel( groupId,
artifactId, version );
+dependency = dependency.clone();
+importSource = modelResolver.resolveModel( dependency
);
+final String resolvedId =
+dependency.getGroupId() + ':' +
dependency.getArtifactId() + ':' + dependency.getVersion();
+
+if ( !imported.equals( resolvedId ) &&
importIds.contains( resolvedId ) )
+{
+// A version range has been resolved to a cycle.
+String message = "The dependencies of type=pom and
with scope=import form a cycle: ";
+for ( String modelId : importIds )
+{
+message += modelId + " -> ";
+}
+message += resolvedId;
+problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE ).
+setMessage( message ) );
+
+continue;
+}
}
catch ( UnresolvableModelException e )
{
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6183 [deleted] 34afec69c
maven git commit: [MNG-6183] Dependency management debug message enhancements.
Repository: maven
Updated Branches:
refs/heads/master ab800b0cf -> 34afec69c
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/master
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[2/2] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/MNG-6183
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[1/2] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6183 a69e7550f -> 34afec69c (forced update)
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/MNG-6183
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6182 [deleted] ab800b0cf
maven git commit: [MNG-6182] ModelResolver interface enhancements.
Repository: maven
Updated Branches:
refs/heads/master 114ef6c5a -> ab800b0cf
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/master
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
maven git commit: [MNG-6183] Dependency management debug message enhancements.
Repository: maven
Updated Branches:
refs/heads/MNG-6183 [created] a69e7550f
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a69e7550
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a69e7550
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a69e7550
Branch: refs/heads/MNG-6183
Commit: a69e7550f4501e18d978fcf45d9be1aa95ff1876
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 19:20:29 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/a69e7550/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[12/15] maven git commit: [MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should
be resolved the same way as projects.
o Updated to use the '' element to decide the style of resolution
as discussed on dev@. Plugins with prerequisites >= 3.6 get the correct
resolution, all other plugins will be resolved with direct 'test' and
'provided' dependencies ignored but direct 'optional' dependencies.
o During working on MNG-6135, it turned out that plugin dependency management
also is applied to the dependencies declared for a plugin using the
'plugins/plugin/dependencies/dependency' element. Dependencies declared
that way must not be overridden by any management. I added management for
'plexus-utils' in the core IT suite. This immediately made the ITs for
MNG-4276 and MNG-4274 fail, because 'plexus-utils' got subject to management
although a different version has been declared in the plugin declaration.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3845f5c3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3845f5c3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3845f5c3
Branch: refs/heads/DEPMGMT
Commit: 3845f5c359330cfd59e72aa2b36948e2c65b06f7
Parents: 83f13a2
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Dec 17 03:07:04 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:40:25 2017 +0100
--
.../java/org/apache/maven/RepositoryUtils.java | 12 +-
.../DefaultPluginDependenciesResolver.java | 370 ---
.../plugin/internal/PlexusUtilsInjector.java| 30 +-
.../maven/plugin/internal/WagonExcluder.java| 14 +-
4 files changed, 344 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3845f5c3/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 52442b7..08749ea 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -114,12 +114,16 @@ public class RepositoryUtils
List nodeTrail = new ArrayList<>( trail.size() + 1 );
nodeTrail.addAll( trail );
-nodeTrail.add( artifact.getId() );
-if ( filter == null || filter.accept( node,
Collections.emptyList() ) )
+if ( artifact != null )
{
-artifact.setDependencyTrail( nodeTrail );
-artifacts.add( artifact );
+nodeTrail.add( artifact.getId() );
+
+if ( filter == null || filter.accept( node,
Collections.emptyList() ) )
+{
+artifact.setDependencyTrail( nodeTrail );
+artifacts.add( artifact );
+}
}
toArtifacts( artifacts, node.getChildren(), nodeTrail, filter );
http://git-wip-us.apache.org/repos/asf/maven/blob/3845f5c3/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index b79b15f..80fd80d 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -20,10 +20,11 @@ package org.apache.maven.plugin.internal;
*/
import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
@@ -37,8 +38,11 @@ import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionContext;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyGraphTransformer;
+import org.eclipse.aether.collection.DependencyManagement;
+import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.g
[01/15] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/DEPMGMT bafdaec25 -> 3845f5c35 (forced update)
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/DEPMGMT
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte <schu...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
[07/15] maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing
[MNG-5971] Imported dependencies should be available to inheritance processing
o Updated the 'DefaultDependencyManagementImporter' to stop ignoring import
dependency conflicts silently. Such conflicts need to be resolved manually by
adding the conflicting dependency to the pom manually.
o Updated to add support for an 'include' scope in dependency management
processed before inheritance and interpolation.
o Re-formatted 'DefaultModelBuilder'.
o Documentation updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5d59c0ad
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5d59c0ad
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5d59c0ad
Branch: refs/heads/DEPMGMT
Commit: 5d59c0add624c47abf81405670bfe85b102c617d
Parents: 7cff181
Author: Christian Schulte <schu...@apache.org>
Authored: Thu Feb 18 14:07:02 2016 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Wed Mar 8 18:39:52 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 384 ++-
.../building/DefaultModelBuildingResult.java| 26 +-
.../model/building/ModelBuildingResult.java | 12 +
.../DefaultDependencyManagementImporter.java| 213 +-
maven-model-builder/src/site/apt/index.apt | 12 +-
5 files changed, 528 insertions(+), 119 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5d59c0ad/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 6d0b4a9..a010db5 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -84,6 +85,7 @@ import static
org.apache.maven.model.building.Result.newResult;
public class DefaultModelBuilder
implements ModelBuilder
{
+
@Requirement
private ModelProcessor modelProcessor;
@@ -250,8 +252,8 @@ public class DefaultModelBuilder
DefaultProfileActivationContext profileActivationContext =
getProfileActivationContext( request );
problems.setSource( "(external profiles)" );
-List activeExternalProfiles =
profileSelector.getActiveProfiles( request.getProfiles(),
-
profileActivationContext, problems );
+List activeExternalProfiles =
+profileSelector.getActiveProfiles( request.getProfiles(),
profileActivationContext, problems );
result.setActiveExternalProfiles( activeExternalProfiles );
@@ -298,8 +300,9 @@ public class DefaultModelBuilder
profileActivationContext.setProjectProperties(
tmpModel.getProperties() );
-List activePomProfiles =
profileSelector.getActiveProfiles( rawModel.getProfiles(),
-
profileActivationContext, problems );
+List activePomProfiles =
+profileSelector.getActiveProfiles( rawModel.getProfiles(),
profileActivationContext, problems );
+
currentData.setActiveProfiles( activePomProfiles );
Map<String, Activation> interpolatedActivations =
getProfileActivations( rawModel, false );
@@ -334,13 +337,13 @@ public class DefaultModelBuilder
}
else if ( currentData == resultData )
{ // First iteration - add initial id after version resolution.
-currentData.setGroupId( currentData.getRawModel().getGroupId()
== null ? parentData.getGroupId()
-
: currentData.getRawModel()
-
.getGroupId() );
+currentData.setGroupId( currentData.getRawModel().getGroupId()
== null
+? parentData.getGroupId()
+:
currentData.getRawModel().getGroupId() );
-currentData.setVersion( currentData.getRawModel().getVersion()
==
