You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/25 23:33:37 UTC
svn commit: r679903 - in /maven/components/branches/maven-2.0.x: ./
maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
pom.xml
Author: jdcasey
Date: Fri Jul 25 14:33:36 2008
New Revision: 679903
URL: http://svn.apache.org/viewvc?rev=679903&view=rev
Log:
Merging from RC branch through revId: 679867
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/maven-2.0.x/pom.xml
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 25 14:33:36 2008
@@ -1 +1,2 @@
-/maven/components/branches/maven-2.0.10-RC:679193-679551
+/maven/components/branches/maven-2.0.10-RC:679193-679867
+/maven/components/branches/maven-2.0.x:679552-679867
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=679903&r1=679902&r2=679903&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Fri Jul 25 14:33:36 2008
@@ -20,7 +20,6 @@
*/
import java.io.File;
-import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=679903&r1=679902&r2=679903&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Fri Jul 25 14:33:36 2008
@@ -195,7 +195,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-20-SNAPSHOT</version>
+ <version>1.0-alpha-20</version>
<executions>
<execution>
<id>site-docs</id>
@@ -550,14 +550,4 @@
</reporting>
</profile>
</profiles>
- <!-- TODO: remove when modello is released -->
- <pluginRepositories>
- <pluginRepository>
- <id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</project>