Author: brett
Date: Wed Oct 19 11:31:30 2005
New Revision: 326633
URL: http://svn.apache.org/viewcvs?rev=326633&view=rev
Log:
merge from tag maven-2.0 up to rev 326624
Modified:
maven/components/trunk/maven-artifact-ant/sample.build.xml
maven/components/trunk/maven-artifact-manager/pom.xml
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/trunk/maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/sample.build.xml?rev=326633&r1=326632&r2=326633&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/sample.build.xml (original)
+++ maven/components/trunk/maven-artifact-ant/sample.build.xml Wed Oct 19
11:31:30 2005
@@ -23,7 +23,7 @@
<target name="initTaskDefs">
<!-- don't forget to update the version! -->
<path id="maven.classpath">
- <pathelement
location="target/maven-artifact-ant-2.0-beta-4-SNAPSHOT-dep.jar"/>
+ <pathelement
location="c:/home/brett/releases/maven-2.0/maven-artifact-ant-2.0-dep.jar"/>
</path>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant">
Modified: maven/components/trunk/maven-artifact-manager/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/pom.xml?rev=326633&r1=326632&r2=326633&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/pom.xml (original)
+++ maven/components/trunk/maven-artifact-manager/pom.xml Wed Oct 19 11:31:30
2005
@@ -39,4 +39,4 @@
<artifactId>wagon-provider-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=326633&r1=326632&r2=326633&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Wed Oct 19 11:31:30 2005
@@ -46,13 +46,14 @@
ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
{
+ boolean blacklisted = false;
if ( artifactRepositories.containsKey( id ) )
{
ArtifactRepository repository = (ArtifactRepository)
artifactRepositories.get( id );
// TODO: this should be an if there are duplicates?
if ( repository.getUrl().equals( url ) )
{
- return repository;
+ blacklisted = repository.isBlacklisted();
}
}
@@ -80,6 +81,7 @@
DefaultArtifactRepository repository = new DefaultArtifactRepository(
id, url, repositoryLayout, snapshots,
releases );
+ repository.setBlacklisted( blacklisted );
artifactRepositories.put( id, repository );
Modified:
maven/components/trunk/maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml?rev=326633&r1=326632&r2=326633&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml
Wed Oct 19 11:31:30 2005
@@ -155,22 +155,22 @@
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
</component>
- </components>
- <component>
-
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataBuilder</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
- </requirement>
- </requirements>
- </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder</role>
+ <role-hint>default</role-hint>
+
<implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataBuilder</implementation>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ </requirement>
+ </requirements>
+ </component>
- <component>
- <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
- </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
+ </component>
+ </components>
</component-set>
Modified:
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=326633&r1=326632&r2=326633&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
(original)
+++
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Wed Oct 19 11:31:30 2005
@@ -30,6 +30,9 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
</pluginRepository>
</pluginRepositories>
