You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/27 01:51:10 UTC
svn commit: r768832 - in /maven/components/branches/MNG-2766: ./
maven-compat/src/main/java/org/apache/maven/artifact/manager/
maven-core/src/test/java/org/apache/maven/lifecycle/
maven-core/src/test/java/org/apache/maven/plugin/ maven-core/src/test/pr...
Author: jvanzyl
Date: Sun Apr 26 23:51:09 2009
New Revision: 768832
URL: http://svn.apache.org/viewvc?rev=768832&view=rev
Log:
o more meshing of trunk and my branch, two tests that are out of sync
Removed:
maven/components/branches/MNG-2766/bs
maven/components/branches/MNG-2766/build-mercury.xml
maven/components/branches/MNG-2766/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=768832&r1=768831&r2=768832&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java Sun Apr 26 23:51:09 2009
@@ -73,8 +73,6 @@
// we can safely assume that we're calculating based on the snapshot policy here if we've made it past the
// release-artifact short circuit above.
ArtifactRepositoryPolicy policy = repository.getSnapshots();
-
- System.out.println( "snappies " + repository.getSnapshots().getUpdatePolicy() );
return isUpdateRequired( artifact, repository, policy );
}
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=768832&r1=768831&r2=768832&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java Sun Apr 26 23:51:09 2009
@@ -48,7 +48,7 @@
File pom = getProject( "project-with-additional-lifecycle-elements" );
MavenSession session = createMavenSession( pom );
assertEquals( "project-with-additional-lifecycle-elements", session.getCurrentProject().getArtifactId() );
- assertEquals( "1.0-SNAPSHOT", session.getCurrentProject().getVersion() );
+ assertEquals( "1.0", session.getCurrentProject().getVersion() );
List<MojoDescriptor> lifecyclePlan = lifecycleExecutor.calculateLifecyclePlan( "package", session );
// resources:resources
@@ -76,7 +76,7 @@
File pom = getProject( "project-with-additional-lifecycle-elements" );
MavenSession session = createMavenSession( pom );
assertEquals( "project-with-additional-lifecycle-elements", session.getCurrentProject().getArtifactId() );
- assertEquals( "1.0-SNAPSHOT", session.getCurrentProject().getVersion() );
+ assertEquals( "1.0", session.getCurrentProject().getVersion() );
lifecycleExecutor.execute( session );
}
}
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=768832&r1=768831&r2=768832&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java Sun Apr 26 23:51:09 2009
@@ -84,7 +84,7 @@
Plugin plugin = new Plugin();
plugin.setGroupId( "org.apache.maven.plugins" );
plugin.setArtifactId( "maven-remote-resources-plugin" );
- plugin.setVersion( "1.1" );
+ plugin.setVersion( "1.0-beta-2" );
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.1" );
Modified: maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml?rev=768832&r1=768831&r2=768832&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml Sun Apr 26 23:51:09 2009
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.lifecycle.test</groupId>
<artifactId>project-with-additional-lifecycle-elements</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>project-with-additional-lifecycle-elements</name>
<url>http://maven.apache.org</url>
<dependencies>
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?rev=768832&r1=768831&r2=768832&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Sun Apr 26 23:51:09 2009
@@ -382,12 +382,7 @@
}
public ArtifactResolutionResult resolve( ArtifactResolutionRequest request )
- {
-
- if ( request.getRemoteRepostories() != null && request.getRemoteRepostories().size() > 10 )
- {
- System.out.println( "legacy: request with " + request.getRemoteRepostories().size() + " remote repositories" );
- }
+ {
ArtifactResolutionResult res = artifactResolver.resolve( request );
return res;