Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-22 18:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from tag maven-2.0 up to rev 326624

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326633 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-19 18:31:30 +00:00
parent dc3f63775b
commit f9e025dba8
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-artifact-ant/sample.build.xml
View File

@ -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">

2
maven-artifact-manager/pom.xml
View File

@ -39,4 +39,4 @@
<artifactId>wagon-provider-api</artifactId>
</dependency>
</dependencies>
</project>
</project>

4
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
View File

@ -46,13 +46,14 @@ public ArtifactRepository createArtifactRepository( String id, String url,
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 @@ public ArtifactRepository createArtifactRepository( String id, String url,
DefaultArtifactRepository repository = new DefaultArtifactRepository( id, url, repositoryLayout, snapshots,
releases );
repository.setBlacklisted( blacklisted );
artifactRepositories.put( id, repository );

32
maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml
View File

@ -155,22 +155,22 @@
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
</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>
</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.ArtifactRepositoryFactory</role>
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
</component>
</component-set>

3
maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
View File

@ -30,6 +30,9 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
</pluginRepository>
</pluginRepositories>