svn commit: r1030060 - in /maven/maven-3/trunk: maven-aether-provider/pom.xml pom.xml
Author: bentmann
Date: Tue Nov 2 14:28:14 2010
New Revision: 1030060
URL: http://svn.apache.org/viewvc?rev=1030060view=rev
Log:
o Declared used dependencies
Modified:
maven/maven-3/trunk/maven-aether-provider/pom.xml
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/maven-aether-provider/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/pom.xml?rev=1030060r1=1030059r2=1030060view=diff
==
--- maven/maven-3/trunk/maven-aether-provider/pom.xml (original)
+++ maven/maven-3/trunk/maven-aether-provider/pom.xml Tue Nov 2 14:28:14 2010
@@ -38,6 +38,10 @@ under the License.
dependencies
dependency
groupIdorg.apache.maven/groupId
+ artifactIdmaven-model/artifactId
+/dependency
+dependency
+ groupIdorg.apache.maven/groupId
artifactIdmaven-model-builder/artifactId
/dependency
dependency
@@ -50,6 +54,10 @@ under the License.
/dependency
dependency
groupIdorg.sonatype.aether/groupId
+ artifactIdaether-spi/artifactId
+/dependency
+dependency
+ groupIdorg.sonatype.aether/groupId
artifactIdaether-util/artifactId
/dependency
dependency
@@ -60,6 +68,10 @@ under the License.
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-component-annotations/artifactId
/dependency
+dependency
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-utils/artifactId
+/dependency
/dependencies
build
Modified: maven/maven-3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1030060r1=1030059r2=1030060view=diff
==
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Tue Nov 2 14:28:14 2010
@@ -279,6 +279,11 @@
/dependency
dependency
groupIdorg.sonatype.aether/groupId
+artifactIdaether-spi/artifactId
+version${aetherVersion}/version
+ /dependency
+ dependency
+groupIdorg.sonatype.aether/groupId
artifactIdaether-impl/artifactId
version${aetherVersion}/version
/dependency
svn commit: r1030110 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Tue Nov 2 16:24:57 2010
New Revision: 1030110
URL: http://svn.apache.org/viewvc?rev=1030110view=rev
Log:
o Add a specific entry for Maven Site Plugin 3.x, so that our users can find it.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1030110r1=1030109r2=1030110view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Tue Nov 2 16:24:57 2010
@@ -3,8 +3,9 @@
-
Brett Porter
Jason van Zyl
+ Dennis Lundberg
-
- 2010-06-05
+ 2010-11-02
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -75,7 +76,9 @@ Available Plugins
*---++--++--+++
| {{{/plugins/maven-resources-plugin/} resources}}| B |
2.4.3| 2010-05-21 | Copy the resources to the output directory for
including in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRESOURCES}JIRA}}
*---++--++--+++
-| {{{/plugins/maven-site-plugin/} site}} | B |
2.1.1| 2010-06-04 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
+| {{{/plugins/maven-site-plugin/} site}} for Maven 2 | B |
2.1.1| 2010-06-04 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
+*---++--++--+++
+| {{{/plugins/maven-site-plugin-3.x/} site}} for Maven 3 | B |
3.0-beta-3 | 2010-10-18 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/branches/maven-site-plugin-3.x/}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
*---++--++--+++
| {{{/plugins/maven-surefire-plugin/} surefire}} | B | 2.6
| 2010-08-16 | Run the Junit unit tests in an isolated classloader. |
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*---++--++--+++
svn commit: r1030216 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Tue Nov 2 21:03:29 2010 New Revision: 1030216 URL: http://svn.apache.org/viewvc?rev=1030216view=rev Log: revert the release Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Tue Nov 2 21:03:29 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.1-SNAPSHOT/version +version1.0-beta-2-SNAPSHOT/version /parent artifactIdenforcer-api/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingjar/packaging nameEnforcer API/name Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Tue Nov 2 21:03:29 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.1-SNAPSHOT/version +version1.0-beta-2-SNAPSHOT/version /parent artifactIdenforcer-rules/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingjar/packaging nameEnforcer Rules/name Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Tue Nov 2 21:03:29 2010 @@ -24,12 +24,12 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.1-SNAPSHOT/version +version1.0-beta-2-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Tue Nov 2 21:03:29 2010 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingpom/packaging nameEnforcer/name
svn commit: r1030217 - /maven/enforcer/tags/enforcer-1.0/
Author: brianf Date: Tue Nov 2 21:04:22 2010 New Revision: 1030217 URL: http://svn.apache.org/viewvc?rev=1030217view=rev Log: revert Removed: maven/enforcer/tags/enforcer-1.0/
svn commit: r1030225 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java site/apt/dependencyConvergence.apt.vm
Author: brianf
Date: Tue Nov 2 21:16:24 2010
New Revision: 1030225
URL: http://svn.apache.org/viewvc?rev=1030225view=rev
Log:
MENFORCER-109 applied patch to fix output from Rex Hoffman
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1030225r1=1030224r2=1030225view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Tue Nov 2 21:16:24 2010
@@ -109,14 +109,14 @@ public class DependencyConvergence imple
}
private String getFullArtifactName(Artifact artifact){
-return artifact.getGroupId() + : + artifact.getArtifactId() +
artifact.getVersion();
+return artifact.getGroupId() + : + artifact.getArtifactId() +:+
artifact.getVersion();
}
private StringBuilder buildTreeString(DependencyNode node) {
ListString loc = new ArrayListString();
DependencyNode currentNode = node;
while (currentNode != null) {
- loc.add(getFullArtifactName(node.getArtifact()));
+ loc.add(getFullArtifactName(currentNode.getArtifact()));
currentNode = currentNode.getParent();
}
Collections.reverse(loc);
@@ -145,7 +145,7 @@ public class DependencyConvergence imple
if (nodeList.size() 0){
builder.append(buildTreeString(nodeList.get(0)));
}
-for (DependencyNode node: nodeList){
+for (DependencyNode node: nodeList.subList(1,nodeList.size())){
builder.append(and\n);
builder.append(buildTreeString(node));
}
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm?rev=1030225r1=1030224r2=1030225view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
Tue Nov 2 21:16:24 2010
@@ -22,7 +22,7 @@
2008-09-13
-
- This rule requires that dependency version numbers converge. If it has two
dependencies, A and B, both depending on the same artifact, c, this rule will
fail the build if A depends on a different version of C then the version of C
depended on by B.
+ This rule requires that dependency version numbers converge. If a project
has two dependencies, A and B, both depending on the same artifact, C, this
rule will fail the build if A depends on a different version of C then the
version of C depended on by B.
Here is a concrete example.
@@ -49,13 +49,16 @@
---
Dependency convergence error for org.slf4j:slf4j-api1.6.1 paths to dependency
are:
-+-org.slf4j:slf4j-api1.6.1
- +-org.slf4j:slf4j-api1.6.1
-+-org.slf4j:slf4j-api1.6.1
+[ERROR]
+Dependency convergence error for org.slf4j:slf4j-api:1.6.1 paths to dependency
are:
++-org.myorg:my-project:1.0.0-SNAPSHOT
+ +-org.slf4j:slf4j-jdk14:1.6.1
++-org.slf4j:slf4j-api:1.6.1
and
-+-org.slf4j:slf4j-api1.6.0
- +-org.slf4j:slf4j-api1.6.0
-+-org.slf4j:slf4j-api1.6.0
++-org.myorg:my-project:1.0.0-SNAPSHOT
+ +-org.slf4j:slf4j-nop:1.6.0
++-org.slf4j:slf4j-api:1.6.0
+
---
svn commit: r1030226 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Tue Nov 2 21:17:54 2010 New Revision: 1030226 URL: http://svn.apache.org/viewvc?rev=1030226view=rev Log: [maven-release-plugin] prepare release enforcer-1.0 Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Tue Nov 2 21:17:54 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent artifactIdenforcer-api/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingjar/packaging nameEnforcer API/name Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Tue Nov 2 21:17:54 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent artifactIdenforcer-rules/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingjar/packaging nameEnforcer Rules/name Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Tue Nov 2 21:17:54 2010 @@ -24,12 +24,12 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Tue Nov 2 21:17:54 2010 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingpom/packaging nameEnforcer/name @@ -132,9 +132,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0/url /scm issueManagement systemjira/system
svn commit: r1030227 - /maven/enforcer/tags/enforcer-1.0/
Author: brianf Date: Tue Nov 2 21:18:00 2010 New Revision: 1030227 URL: http://svn.apache.org/viewvc?rev=1030227view=rev Log: [maven-scm] copy for tag enforcer-1.0 Added: maven/enforcer/tags/enforcer-1.0/ - copied from r1030226, maven/enforcer/trunk/
