You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/09/15 03:05:41 UTC
[1/5] git commit: [MNG-5513] Artifact filtering for Eclipse Aether
fixed
Updated Branches:
refs/heads/master f27287ce2 -> 0194cd61c
[MNG-5513] Artifact filtering for Eclipse Aether fixed
The filtering was left unchanged, while Aether
GroupID changed from org.sonatype.aether to
org.eclipse.aether, basically letting
Plugins to reference Eclipse Aether that
would produce runtime Linkage errors.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4a7b25c3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4a7b25c3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4a7b25c3
Branch: refs/heads/master
Commit: 4a7b25c3dd99d153b01531b052377e0f3cf22f88
Parents: 02d1242
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Wed Sep 11 13:59:40 2013 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Wed Sep 11 13:59:40 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/DefaultArtifactFilterManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4a7b25c3/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index 7676834..4c6500b 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -80,9 +80,9 @@ public class DefaultArtifactFilterManager
artifacts.add( "org.apache.maven:maven-settings-builder" );
artifacts.add( "org.apache.maven:maven-toolchain" );
artifacts.add( "org.apache.maven.wagon:wagon-provider-api" );
- artifacts.add( "org.sonatype.aether:aether-api" );
- artifacts.add( "org.sonatype.aether:aether-spi" );
- artifacts.add( "org.sonatype.aether:aether-impl" );
+ artifacts.add( "org.eclipse.aether:aether-api" );
+ artifacts.add( "org.eclipse.aether:aether-spi" );
+ artifacts.add( "org.eclipse.aether:aether-impl" );
/*
* NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise
[2/5] git commit: [MNG-5513] Restoring Maven 3.0.x style behavior
Posted by jv...@apache.org.
[MNG-5513] Restoring Maven 3.0.x style behavior
As it was importing org.sonatype.aether.impl and
sub packages, but since Aether move to Eclipse
the org.eclipse.aether.internal.impl is no longer
sub package of org.eclipse.aether.impl (but it
was in Sonatype Aether)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/97732f7e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/97732f7e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/97732f7e
Branch: refs/heads/master
Commit: 97732f7ee7ed82796049aab6a2251028c7cfa38f
Parents: 4a7b25c
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Wed Sep 11 14:01:15 2013 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Wed Sep 11 14:01:15 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/classrealm/DefaultClassRealmManager.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/97732f7e/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 1798875..41c7dc2 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -169,6 +169,7 @@ public class DefaultClassRealmManager
imports.put( "org.eclipse.aether.deployment", coreRealm );
imports.put( "org.eclipse.aether.graph", coreRealm );
imports.put( "org.eclipse.aether.impl", coreRealm );
+ imports.put( "org.eclipse.aether.internal.impl", coreRealm );
imports.put( "org.eclipse.aether.installation", coreRealm );
imports.put( "org.eclipse.aether.metadata", coreRealm );
imports.put( "org.eclipse.aether.repository", coreRealm );
[4/5] git commit: Merge branch 'mng-5513'
Posted by jv...@apache.org.
Merge branch 'mng-5513'
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6125acf1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6125acf1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6125acf1
Branch: refs/heads/master
Commit: 6125acf1c4912a20a7f4753cd4baf2dc642068fd
Parents: 340dd3f 97732f7
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sat Sep 14 20:22:18 2013 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Sat Sep 14 20:22:18 2013 -0400
----------------------------------------------------------------------
.../java/org/apache/maven/DefaultArtifactFilterManager.java | 6 +++---
.../org/apache/maven/classrealm/DefaultClassRealmManager.java | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[5/5] git commit: We must also filter out the old Aether as well to
prevent NoClassDefFoundErrors
Posted by jv...@apache.org.
We must also filter out the old Aether as well to prevent NoClassDefFoundErrors
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0194cd61
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0194cd61
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0194cd61
Branch: refs/heads/master
Commit: 0194cd61c8327caabd56adeea9de01c05b735ff6
Parents: 6125acf
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sat Sep 14 21:02:05 2013 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Sat Sep 14 21:02:05 2013 -0400
----------------------------------------------------------------------
.../java/org/apache/maven/DefaultArtifactFilterManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0194cd61/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index 4c6500b..da88508 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -83,6 +83,12 @@ public class DefaultArtifactFilterManager
artifacts.add( "org.eclipse.aether:aether-api" );
artifacts.add( "org.eclipse.aether:aether-spi" );
artifacts.add( "org.eclipse.aether:aether-impl" );
+ //
+ // We must also filter out the old or NoClassDefFoundErrors will surface
+ //
+ artifacts.add( "org.sonatype.aether:aether-api" );
+ artifacts.add( "org.sonatype.aether:aether-spi" );
+ artifacts.add( "org.sonatype.aether:aether-impl" );
/*
* NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise
[3/5] git commit: Change poms over to major.minor-SNAPSHOT
Posted by jv...@apache.org.
Change poms over to major.minor-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/340dd3fc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/340dd3fc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/340dd3fc
Branch: refs/heads/master
Commit: 340dd3fc6e14f0cf8bddd50bf9a07be213beebf5
Parents: f27287c
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sat Sep 14 17:05:06 2013 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Sat Sep 14 17:05:06 2013 -0400
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-aether-provider/pom.xml | 2 +-
maven-artifact/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-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
pom.xml | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 3b264f3..8998aa6 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 7d3f458..4614cc8 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-aether-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 99d2515..a4536df 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 7b78820..02e1272 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 88f61b1..dc8364e 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 8daa2c0..9309caf 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index ec4d4a4..3c78e21 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index ae1acbd..134a746 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index d2f41be..c48c326 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index f22bc10..c1008bf 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index b0541e5..4e5cf95 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index c5ccf5e..9bf3bdc 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/340dd3fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a96f355..16d2ca4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>maven</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>