Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade plexus utils to 1.0.4-SNAPSHOT. 

The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-08 14:13:31 +00:00
parent 0506b79dd0
commit 510de4fe54
46 changed files with 249 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-1.x-integration/pom.xml
View File

@ -11,7 +11,7 @@
<inceptionYear>2004</inceptionYear>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

2
maven-archetype/maven-archetype-core/pom.xml
View File

@ -41,7 +41,7 @@
<version>2.0-beta-1</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>

4
maven-archiver/pom.xml
View File

@ -15,9 +15,9 @@
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>1.0-alpha-1</version>
<version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>

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

@ -48,7 +48,7 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

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-3-SNAPSHOT-dep.jar"/>
<pathelement location="target/maven-artifact-ant-2.0-beta-4-SNAPSHOT-dep.jar"/>
</path>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">

2
maven-artifact-ant/src/main/assembly/dep.xml
View File

@ -19,6 +19,8 @@
<scope>runtime</scope>
<excludes>
<exclude>ant:ant</exclude>
<!-- TODO: remove when all references are moved to the new group -->
<exclude>plexus:plexus-utils</exclude>
</excludes>
</dependencySet>
</dependencySets>

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

@ -23,7 +23,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

2
maven-artifact/pom.xml
View File

@ -11,7 +11,7 @@
<version>2.0-beta-4-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

4
maven-core-it/it0047/pom.xml
View File

@ -5,9 +5,9 @@
<version>1.0</version>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-4</version>
<version>1.0-alpha-7</version>
</dependency>
</dependencies>
</model>

18
maven-core/pom.xml
View File

@ -108,7 +108,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
@ -120,6 +120,16 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-input-handler-api</artifactId>
<version>1.0-alpha-3</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@ -141,6 +151,12 @@
<artifactId>wagon-ssh</artifactId>
<version>1.0-alpha-4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<reporting>

5
maven-core/src/assemble/bin.xml
View File

@ -52,7 +52,7 @@
<outputDirectory>core</outputDirectory>
<includes>
<include>org.codehaus.plexus:plexus-container-default</include>
<include>plexus:plexus-utils</include>
<include>org.codehaus.plexus:plexus-utils</include>
</includes>
</dependencySet>
<dependencySet>
@ -66,8 +66,9 @@
<excludes>
<exclude>org.codehaus.plexus:plexus-container-default</exclude>
<exclude>classworlds:classworlds</exclude>
<exclude>plexus:plexus-utils</exclude>
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<!-- transitively picked up via default container - not needed -->
<exclude>plexus:plexus-utils</exclude>
<exclude>junit:junit</exclude>
</excludes>
</dependencySet>

2
maven-embedder/pom.xml
View File

@ -26,7 +26,7 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.4-SNAPSHOT</version>
</dependency>

4
maven-mboot2/pom.xml
View File

@ -15,7 +15,7 @@
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-plugin-xpp3</artifactId>
<version>1.0-alpha-4</version>
<version>1.0-alpha-6-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@ -23,7 +23,7 @@
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1-alpha-1</version>
<version>1.1-alpha-2</version>
<scope>runtime</scope>
</dependency>
<dependency>

12
maven-mboot2/src/main/java/MBoot.java
View File

@ -40,9 +40,9 @@ public class MBoot
{
String[] builds = new String[]{"maven-model", "maven-settings", "maven-monitor", "maven-plugin-api",
"maven-artifact", "maven-plugin-descriptor", "maven-repository-metadata", "maven-artifact-manager",
"maven-artifact-test", "maven-script/maven-script-beanshell",
"maven-profile", "maven-project", "maven-plugin-registry", "maven-reporting/maven-reporting-api",
"maven-reporting/maven-reporting-impl", "maven-plugin-parameter-documenter", "maven-core", "maven-archiver",
"maven-artifact-test", "maven-script/maven-script-beanshell", "maven-profile", "maven-project",
"maven-plugin-registry", "maven-reporting/maven-reporting-api", "maven-reporting/maven-reporting-impl",
"maven-plugin-parameter-documenter", "maven-core", "maven-archiver",
"maven-plugin-tools/maven-plugin-tools-api", "maven-plugin-tools/maven-plugin-tools-java",
"maven-plugin-tools/maven-plugin-tools-beanshell", "maven-plugin-tools/maven-plugin-tools-pluggy",
"maven-core-it-verifier"};
@ -355,7 +355,7 @@ public class MBoot
{
coreDeps = reader.getDependencies();
corePom = new Dependency( reader.getGroupId(), reader.getArtifactId(), reader.getVersion(),
reader.getPackaging() );
reader.getPackaging(), Collections.EMPTY_LIST );
}
System.out.println( "--------------------------------------------------------------------" );
@ -364,8 +364,8 @@ public class MBoot
reader = new ModelReader( downloader, true );
reader.parse( new File( basedir, "maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml" ) );
List dependencies = new ArrayList( reader.getDependencies() );
dependencies.add(
new Dependency( reader.getGroupId(), reader.getArtifactId(), reader.getVersion(), reader.getPackaging() ) );
dependencies.add( new Dependency( reader.getGroupId(), reader.getArtifactId(), reader.getVersion(),
reader.getPackaging(), Collections.EMPTY_LIST ) );
IsolatedClassLoader cl = createClassloaderFromDependencies( dependencies, bootstrapClassLoader,
localRepository );

16
maven-mboot2/src/main/java/model/Dependency.java
View File

@ -1,6 +1,8 @@
package model;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/*
@ -52,12 +54,17 @@ public class Dependency
private Set exclusions = new HashSet();
public Dependency()
private List chain;
public Dependency( List chain )
{
this.chain = new ArrayList( chain );
this.chain.add( this );
}
public Dependency( String groupId, String artifactId, String version, String type )
public Dependency( String groupId, String artifactId, String version, String type, List chain )
{
this( chain );
this.version = version;
this.artifactId = artifactId;
this.groupId = groupId;
@ -289,4 +296,9 @@ public class Dependency
{
return exclusions;
}
public List getChain()
{
return chain;
}
}

68
maven-mboot2/src/main/java/model/ModelReader.java
View File

@ -104,11 +104,24 @@ public class ModelReader
private Exclusion currentExclusion;
private final Set excluded;
private final List chain;
public ModelReader( ArtifactDownloader downloader, boolean resolveTransitiveDependencies )
{
this( downloader, resolveTransitiveDependencies, Collections.EMPTY_SET, Collections.EMPTY_LIST );
}
public ModelReader( ArtifactDownloader downloader, boolean resolveTransitiveDependencies, Set excluded, List chain )
{
this.downloader = downloader;
this.resolveTransitiveDependencies = resolveTransitiveDependencies;
this.excluded = excluded;
this.chain = chain;
}
public List getRemoteRepositories()
@ -151,7 +164,9 @@ public class ModelReader
}
else if ( rawName.equals( "dependency" ) )
{
currentDependency = new Dependency();
List chain = Collections.singletonList(
new Dependency( groupId, artifactId, version, packaging, this.chain ) );
currentDependency = new Dependency( chain );
insideDependency = true;
}
@ -230,9 +245,10 @@ public class ModelReader
}
// actually, these should be transtive (see MNG-77) - but some projects have circular deps that way
ModelReader p = retrievePom( parentGroupId, parentArtifactId, parentVersion, "pom", false );
ModelReader p = retrievePom( parentGroupId, parentArtifactId, parentVersion, "pom", false,
excluded, Collections.EMPTY_LIST );
addDependencies( p.getDependencies(), parentDependencies, null, Collections.EMPTY_SET );
addDependencies( p.getDependencies(), parentDependencies, null, excluded );
addDependencies( p.getManagedDependencies(), managedDependencies, null, Collections.EMPTY_SET );
@ -422,26 +438,31 @@ public class ModelReader
{
Dependency dependency = (Dependency) it.next();
if ( dependency.getVersion() == null )
if ( !excluded.contains( dependency.getConflictId() ) )
{
Dependency managedDependency = (Dependency) managedDependencies.get( dependency.getConflictId() );
if ( managedDependency == null )
if ( dependency.getVersion() == null )
{
throw new NullPointerException( "[" + groupId + ":" + artifactId + ":" + packaging + ":" + version +
"] " + "Dependency " + dependency.getConflictId() +
" is missing a version, and nothing is found in dependencyManagement. " );
Dependency managedDependency = (Dependency) managedDependencies.get( dependency.getConflictId() );
if ( managedDependency == null )
{
throw new NullPointerException( "[" + groupId + ":" + artifactId + ":" + packaging + ":" +
version + "] " + "Dependency " + dependency.getConflictId() +
" is missing a version, and nothing is found in dependencyManagement. " );
}
dependency.setVersion( managedDependency.getVersion() );
}
dependency.setVersion( managedDependency.getVersion() );
}
if ( resolveTransitiveDependencies )
{
ModelReader p = retrievePom( dependency.getGroupId(), dependency.getArtifactId(),
dependency.getVersion(), dependency.getType(),
resolveTransitiveDependencies );
if ( resolveTransitiveDependencies )
{
Set excluded = new HashSet( this.excluded );
excluded.addAll( dependency.getExclusions() );
addDependencies( p.getDependencies(), transitiveDependencies, dependency.getScope(),
dependency.getExclusions() );
ModelReader p = retrievePom( dependency.getGroupId(), dependency.getArtifactId(),
dependency.getVersion(), dependency.getType(),
resolveTransitiveDependencies, excluded, dependency.getChain() );
addDependencies( p.getDependencies(), transitiveDependencies, dependency.getScope(), excluded );
}
}
}
}
@ -460,6 +481,11 @@ public class ModelReader
if ( !hasDependency( d, target ) && !excluded.contains( d.getConflictId() ) )
{
if ( "plexus".equals( d.getGroupId() ) && ( "plexus-utils".equals( d.getArtifactId() ) ||
"plexus-container-default".equals( d.getArtifactId() ) ) )
{
throw new IllegalStateException( d.getConflictId() + " found in chain " + d.getChain() );
}
target.put( d.getConflictId(), d );
}
}
@ -485,7 +511,7 @@ public class ModelReader
}
private ModelReader retrievePom( String groupId, String artifactId, String version, String type,
boolean resolveTransitiveDependencies )
boolean resolveTransitiveDependencies, Set excluded, List chain )
throws SAXException
{
String key = groupId + ":" + artifactId + ":" + version;
@ -497,11 +523,11 @@ public class ModelReader
inProgress.add( key );
ModelReader p = new ModelReader( downloader, resolveTransitiveDependencies );
ModelReader p = new ModelReader( downloader, resolveTransitiveDependencies, excluded, chain );
try
{
Dependency pom = new Dependency( groupId, artifactId, version, type );
Dependency pom = new Dependency( groupId, artifactId, version, type, chain );
downloader.downloadDependencies( Collections.singletonList( pom ) );
Repository localRepository = downloader.getLocalRepository();

8
maven-mboot2/src/main/java/model/Repository.java
View File

@ -17,6 +17,7 @@ package model;
*/
import java.io.File;
import java.util.Collections;
/**
* Repository path management.
@ -55,7 +56,7 @@ public class Repository
public File getArtifactFile( String groupId, String artifactId, String version, String type )
{
Dependency d = new Dependency( groupId, artifactId, version, type );
Dependency d = new Dependency( groupId, artifactId, version, type, Collections.EMPTY_LIST );
return getArtifactFile( d );
@ -101,7 +102,7 @@ public class Repository
public String getMetadataPath( String groupId, String artifactId, String version, String type, String filename )
{
Dependency dependency = new Dependency( groupId, artifactId, version, type );
Dependency dependency = new Dependency( groupId, artifactId, version, type, Collections.EMPTY_LIST );
String repositoryPath;
if ( LAYOUT_LEGACY.equals( layout ) )
@ -111,14 +112,11 @@ public class Repository
else if ( LAYOUT_DEFAULT.equals( layout ) )
{
repositoryPath = dependency.getGroupId().replace( '.', '/' );
// if ( !dependency.getType().equals( "pom" ) )
// {
repositoryPath = repositoryPath + "/" + dependency.getArtifactId();
if ( version != null )
{
repositoryPath = repositoryPath + "/" + dependency.getVersion();
}
// }
repositoryPath = repositoryPath + "/" + filename;
}
else

2
maven-model/pom.xml
View File

@ -77,7 +77,7 @@
</profiles>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

2
maven-plugin-parameter-documenter/pom.xml
View File

@ -41,7 +41,7 @@
</build>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

2
maven-plugin-registry/pom.xml
View File

@ -33,7 +33,7 @@
</build>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

2
maven-plugin-tools/maven-plugin-tools-ant/pom.xml
View File

@ -27,7 +27,7 @@
<version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

2
maven-plugin-tools/maven-plugin-tools-api/pom.xml
View File

@ -15,7 +15,7 @@
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

2
maven-plugin-tools/maven-plugin-tools-model/pom.xml
View File

@ -21,7 +21,7 @@
<version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

2
maven-plugins/maven-clean-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-clean-plugin</artifactId>

40
maven-plugins/maven-compiler-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-compiler-plugin</artifactId>
@ -16,27 +16,51 @@
<artifactId>plexus-compiler-javac</artifactId>
<version>1.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
<version>1.5</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-manager</artifactId>
<version>1.5</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
<version>1.5</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

6
maven-plugins/maven-ear-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-ear-plugin</artifactId>
@ -17,10 +17,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

4
maven-plugins/maven-eclipse-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins</groupId>
@ -19,7 +19,7 @@
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

6
maven-plugins/maven-install-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-install-plugin</artifactId>
@ -18,12 +18,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

4
maven-plugins/maven-jar-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-jar-plugin</artifactId>
@ -17,7 +17,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

4
maven-plugins/maven-javadoc-plugin/pom.xml
View File

@ -37,9 +37,9 @@
<version>2.1</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>1.0-alpha-1</version>
<version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>

14
maven-plugins/maven-plugin-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-plugin</artifactId>
@ -11,7 +11,7 @@
<version>2.0-beta-4-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
<prerequisites>
<maven>2.0-beta-3</maven>
<maven>2.0-beta-4-SNAPSHOT</maven>
</prerequisites>
<developers>
<developer>
@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-registry</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@ -63,18 +63,18 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-beanshell</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

4
maven-plugins/maven-resources-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-3</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-resources-plugin</artifactId>
@ -22,7 +22,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-beta-2</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

8
maven-plugins/maven-site-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-site-plugin</artifactId>
@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
@ -33,13 +33,13 @@
<version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>

4
maven-plugins/maven-source-plugin/pom.xml
View File

@ -15,9 +15,9 @@
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>1.0-alpha-1</version>
<version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>

18
maven-plugins/maven-surefire-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-plugin</artifactId>
@ -31,16 +31,28 @@
<artifactId>surefire</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>surefire</groupId>
<artifactId>surefire-booter</artifactId>
<version>1.4-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.3</version>
<version>1.0.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>

5
maven-plugins/maven-verifier-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-1</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-verifier-plugin</artifactId>
@ -26,7 +26,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>RELEASE</version>
<executions>
<execution>
<goals>
@ -51,7 +50,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

4
maven-plugins/pom.xml
View File

@ -151,9 +151,9 @@
<version>1.0-alpha-7</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.2</version>
<version>1.0.4-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

2
maven-profile/pom.xml
View File

@ -32,7 +32,7 @@
</build>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

2
maven-project/pom.xml
View File

@ -18,7 +18,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

10
maven-reporting/maven-reporting-api/pom.xml
View File

@ -23,6 +23,16 @@
<groupId>doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.0-alpha-4</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

20
maven-reporting/maven-reporting-impl/pom.xml
View File

@ -43,11 +43,31 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0-beta-4-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>1.0-alpha-4</version>
<exclusions>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

2
maven-repository-metadata/pom.xml
View File

@ -35,7 +35,7 @@
</build>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

2
maven-settings/pom.xml
View File

@ -32,7 +32,7 @@
</build>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>

4
pom.xml
View File

@ -206,9 +206,9 @@
<version>1.0-alpha-8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.3</version>
<version>1.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.modello</groupId>

2
sandbox/maven-repository-checker/pom.xml
View File

@ -17,7 +17,7 @@
<version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

5
sandbox/pom-pre-alpha-converter/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>maven-component</artifactId>
<groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version>
<version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pom-pre-alpha-converter</artifactId>
@ -25,9 +25,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>