svn commit: r1151417 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-5064/ core-it-suite/src/test/resources/mng-5064/r

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:26:37 2011
New Revision: 1151417

URL: http://svn.apache.org/viewvc?rev=1151417view=rev
Log:
[MNG-5064] mvn -nsu (--no-snapshot-updates) should not download snapshots (and 
break local builds)

o Fixed IT

Added:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/dep-0.1-20110726.105319-1.jar
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/dep-0.1-20110726.105319-1.pom

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/maven-metadata.xml
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/settings-template.xml
   (with props)
Removed:

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/src/
Modified:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/pom.xml

maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=1151417r1=1151416r2=1151417view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 Wed Jul 27 10:26:37 2011
@@ -83,6 +83,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
 suite.addTestSuite( 
MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
 suite.addTestSuite( 
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
 suite.addTestSuite( 
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );

Added: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java?rev=1151417view=auto
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
 (added)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
 Wed Jul 27 10:26:37 2011
@@ -0,0 +1,131 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *

svn commit: r1151418 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:28:41 2011
New Revision: 1151418

URL: http://svn.apache.org/viewvc?rev=1151418view=rev
Log:
[MNG-5064] mvn -nsu (--no-snapshot-updates) should not download snapshots (and 
break local builds)

Modified:

maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=1151418r1=1151417r2=1151418view=diff
==
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
(original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
Wed Jul 27 10:28:41 2011
@@ -344,7 +344,18 @@ public class DefaultMaven
 
 session.setOffline( request.isOffline() );
 session.setChecksumPolicy( request.getGlobalChecksumPolicy() );
-session.setUpdatePolicy( request.isUpdateSnapshots() ? 
RepositoryPolicy.UPDATE_POLICY_ALWAYS : null );
+if ( request.isNoSnapshotUpdates() )
+{
+session.setUpdatePolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
+}
+else if ( request.isUpdateSnapshots() )
+{
+session.setUpdatePolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
+}
+else
+{
+session.setUpdatePolicy( null );
+}
 
 session.setNotFoundCachingEnabled( request.isCacheNotFound() );
 session.setTransferErrorCachingEnabled( request.isCacheTransferError() 
);

svn commit: r1151420 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:36:18 2011
New Revision: 1151420

URL: http://svn.apache.org/viewvc?rev=1151420view=rev
Log:
[MNG-5113] NullPointerException on javadoc site generation

Modified:

maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java?rev=1151420r1=1151419r2=1151420view=diff
==
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
 Wed Jul 27 10:36:18 2011
@@ -116,8 +116,8 @@ public class DefaultReportingConverter
 reportPlugins.addChild( reportPlugin );
 
 if ( !reporting.isExcludeDefaults()  
!hasMavenProjectInfoReportsPlugin
- org.apache.maven.plugins.equals( reportPlugin.getChild( 
groupId ).getValue() )
- maven-project-info-reports-plugin.equals( 
reportPlugin.getChild( artifactId ).getValue() ) )
+ org.apache.maven.plugins.equals( plugin.getGroupId() )
+ maven-project-info-reports-plugin.equals( 
plugin.getArtifactId() ) )
 {
 hasMavenProjectInfoReportsPlugin = true;
 }

svn commit: r1151421 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:39:37 2011
New Revision: 1151421

URL: http://svn.apache.org/viewvc?rev=1151421view=rev
Log:
[MNG-5137] Reactor resolution does not work for forked multi module builds
Submitted by: Stuart McCulloch

Modified:

maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java?rev=1151421r1=1151420r2=1151421view=diff
==
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
 Wed Jul 27 10:39:37 2011
@@ -222,7 +222,12 @@ class ReactorReader
 
 if ( project != null )
 {
-return find( project, artifact );
+File file = find( project, artifact );
+if ( file == null  project != project.getExecutionProject() )
+{
+file = find( project.getExecutionProject(), artifact );
+}
+return file;
 }
 
 return null;

svn commit: r1151423 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:45:43 2011
New Revision: 1151423

URL: http://svn.apache.org/viewvc?rev=1151423view=rev
Log:
[MNG-5096] exclusion on dependency with typetest-jar/type doesn't work 
in maven 3

Modified:

maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java?rev=1151423r1=1151422r2=1151423view=diff
==
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
 Wed Jul 27 10:45:43 2011
@@ -36,6 +36,7 @@ import org.codehaus.plexus.logging.Logge
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.RepositorySystemSession;
 import org.sonatype.aether.RequestTrace;
+import org.sonatype.aether.artifact.ArtifactType;
 import org.sonatype.aether.artifact.ArtifactTypeRegistry;
 import org.sonatype.aether.collection.CollectRequest;
 import org.sonatype.aether.collection.DependencyCollectionException;
@@ -92,7 +93,18 @@ public class DefaultProjectDependenciesR
 MapString, Dependency dependencies = new HashMapString, 
Dependency();
 for ( Dependency dependency : project.getDependencies() )
 {
-String key = dependency.getManagementKey();
+String classifier = dependency.getClassifier();
+if ( classifier == null )
+{
+ArtifactType type = stereotypes.get( dependency.getType() 
);
+if ( type != null )
+{
+classifier = type.getClassifier();
+}
+}
+String key =
+ArtifacIdUtils.toVersionlessId( dependency.getGroupId(), 
dependency.getArtifactId(),
+dependency.getType(), 
classifier );
 dependencies.put( key, dependency );
 }
 for ( Artifact artifact : project.getDependencyArtifacts() )

svn commit: r1151424 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:48:35 2011
New Revision: 1151424

URL: http://svn.apache.org/viewvc?rev=1151424view=rev
Log:
[MNG-5135] Regression: in some cases aggregator mojo is unable to resolve 
dependencies with custom packaging

Modified:

maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java?rev=1151424r1=1151423r2=1151424view=diff
==
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
 Wed Jul 27 10:48:35 2011
@@ -93,42 +93,56 @@ public class LifecycleDependencyResolver
 boolean aggregating, SetArtifact 
projectArtifacts )
 throws LifecycleExecutionException
 {
-if ( project.getDependencyArtifacts() == null )
+ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+try
 {
-try
+ClassLoader projectRealm = project.getClassRealm();
+if ( projectRealm != null  projectRealm != tccl )
 {
-project.setDependencyArtifacts( project.createArtifacts( 
artifactFactory, null, null ) );
+Thread.currentThread().setContextClassLoader( projectRealm );
 }
-catch ( InvalidDependencyVersionException e )
+
+if ( project.getDependencyArtifacts() == null )
 {
-throw new LifecycleExecutionException( e );
+try
+{
+project.setDependencyArtifacts( project.createArtifacts( 
artifactFactory, null, null ) );
+}
+catch ( InvalidDependencyVersionException e )
+{
+throw new LifecycleExecutionException( e );
+}
 }
-}
 
-SetArtifact artifacts =
-getDependencies( project, scopesToCollect, scopesToResolve, 
session, aggregating, projectArtifacts );
+SetArtifact artifacts =
+getDependencies( project, scopesToCollect, scopesToResolve, 
session, aggregating, projectArtifacts );
 
-project.setResolvedArtifacts( artifacts );
+project.setResolvedArtifacts( artifacts );
 
-MapString, Artifact map = new HashMapString, Artifact();
-for ( Artifact artifact : artifacts )
-{
-map.put( artifact.getDependencyConflictId(), artifact );
-}
-for ( Artifact artifact : project.getDependencyArtifacts() )
-{
-if ( artifact.getFile() == null )
+MapString, Artifact map = new HashMapString, Artifact();
+for ( Artifact artifact : artifacts )
 {
-Artifact resolved = map.get( 
artifact.getDependencyConflictId() );
-if ( resolved != null )
+map.put( artifact.getDependencyConflictId(), artifact );
+}
+for ( Artifact artifact : project.getDependencyArtifacts() )
+{
+if ( artifact.getFile() == null )
 {
-artifact.setFile( resolved.getFile() );
-artifact.setDependencyTrail( resolved.getDependencyTrail() 
);
-artifact.setResolvedVersion( resolved.getVersion() );
-artifact.setResolved( true );
+Artifact resolved = map.get( 
artifact.getDependencyConflictId() );
+if ( resolved != null )
+{
+artifact.setFile( resolved.getFile() );
+artifact.setDependencyTrail( 
resolved.getDependencyTrail() );
+artifact.setResolvedVersion( resolved.getVersion() );
+artifact.setResolved( true );
+}
 }
 }
 }
+finally
+{
+Thread.currentThread().setContextClassLoader( tccl );
+}
 }
 
 private SetArtifact getDependencies( MavenProject project, 
CollectionString scopesToCollect,

svn commit: r1151426 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 10:56:26 2011
New Revision: 1151426

URL: http://svn.apache.org/viewvc?rev=1151426view=rev
Log:
o Avoided corruption of local repository when installing a snapshot artifact 
that was already deployed and as such has a timestamped version, this happens 
in the wild when using invoker:install during a build that deploys its output

Modified:

maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java?rev=1151426r1=1151425r2=1151426view=diff
==
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
 Wed Jul 27 10:56:26 2011
@@ -112,12 +112,12 @@ public class LegacyLocalRepositoryManage
 
 public String getPathForLocalArtifact( Artifact artifact )
 {
-return delegate.pathOf( RepositoryUtils.toArtifact( artifact ) );
+return delegate.pathOf( RepositoryUtils.toArtifact( 
artifact.setVersion( artifact.getBaseVersion() ) ) );
 }
 
 public String getPathForRemoteArtifact( Artifact artifact, 
RemoteRepository repository, String context )
 {
-return getPathForLocalArtifact( artifact );
+return delegate.pathOf( RepositoryUtils.toArtifact( artifact ) );
 }
 
 public String getPathForLocalMetadata( Metadata metadata )

svn commit: r1151430 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 11:22:07 2011
New Revision: 1151430

URL: http://svn.apache.org/viewvc?rev=1151430view=rev
Log:
o Improved POM location tracking

Modified:

maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=1151430r1=1151429r2=1151430view=diff
==
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 Wed Jul 27 11:22:07 2011
@@ -962,6 +962,7 @@ public class DefaultModelBuilder
 importRequest.setModelCache( request.getModelCache() );
 importRequest.setSystemProperties( 
request.getSystemProperties() );
 importRequest.setUserProperties( 
request.getUserProperties() );
+importRequest.setLocationTracking( 
request.isLocationTracking() );
 }
 
 importRequest.setModelSource( importSource );

svn commit: r1151459 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java resources/mng-4112/pom.xml

2011-07-27 Thread bentmann 
Author: bentmann
Date: Wed Jul 27 13:28:42 2011
New Revision: 1151459

URL: http://svn.apache.org/viewvc?rev=1151459view=rev
Log:
o Decoupled from production plugin

Modified:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java?rev=1151459r1=1151458r2=1151459view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
 Wed Jul 27 13:28:42 2011
@@ -29,30 +29,33 @@ import java.util.Properties;
 public class MavenITmng4112MavenVersionPropertyTest
 extends AbstractMavenIntegrationTestCase
 {
+
 public MavenITmng4112MavenVersionPropertyTest()
 {
 super( (3.0.3,) );
 }
 
 /**
- * Test simple POM interpolation
+ * Test for ${maven.version} and ${maven.build.version} property
  */
-public void testitMNG4112()
+public void testit()
 throws Exception
 {
 File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
/mng-4112 );
+
 Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 verifier.setAutoclean( false );
 verifier.deleteDirectory( target );
-verifier.executeGoal( package );
+verifier.executeGoal( validate );
 
-Properties props = verifier.loadProperties( target/build.properties 
);
+Properties props = verifier.loadProperties( target/pom.properties );
 
-String testMavenVersion = props.getProperty( maven.version );
-assertFalse( testMavenVersion.contains( $ ) );
+String testMavenVersion = props.getProperty( 
project.properties.simpleVersion,  );
+assertFalse( testMavenVersion, testMavenVersion.contains( $ ) );
+assertTrue( testMavenVersion, testMavenVersion.matches( 
[0-9]+\\.[0-9]+.* ) );
 
-String testMavenBuildVersion = props.getProperty( 
maven.build.version );
-assertTrue( testMavenBuildVersion.contains( testMavenVersion ) );
+String testMavenBuildVersion = props.getProperty( 
project.properties.fullVersion,  );
+assertTrue( testMavenBuildVersion, testMavenBuildVersion.contains( 
testMavenVersion ) );
 
 verifier.verifyErrorFreeLog();
 verifier.resetStreams();

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml?rev=1151459r1=1151458r2=1151459view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
 Wed Jul 27 13:28:42 2011
@@ -1,32 +1,61 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
 project
   modelVersion4.0.0/modelVersion
-  nameMaven Integration Test :: MNG-4112/name 
+
   groupIdorg.apache.maven.its.mgn4112/groupId
-  artifactIdmaven-it-mng4112/artifactId
-  descriptionTest for ${maven.version} property/description
+  artifactIdtest/artifactId
   packagingpom/packaging
   version1.0/version
+
+  nameMaven Integration Test :: MNG-4112/name 
+  description
+Test for ${maven.version} and ${maven.build.version} property
+  /description
+
+  properties
+simpleVersion${maven.version}/simpleVersion
+fullVersion${maven.build.version}/fullVersion
+  /properties
+
   build
 plugins
   plugin
-groupIdorg.apache.maven.plugins/groupId
-

svn commit: r1151585 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml

2011-07-27 Thread rfscholte 
Author: rfscholte
Date: Wed Jul 27 18:30:13 2011
New Revision: 1151585

URL: http://svn.apache.org/viewvc?rev=1151585view=rev
Log:
update pom.xml:
- use latest parent
- use m-failsafe-p instead of the m-surefire-p bound to the integration-test 
phase
- replace deprecated configuration for m-surefire-p (systemProperties) and 
m-antrun-p (tasks)

Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml

Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1151585r1=1151584r2=1151585view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jul 27 18:30:13 2011
@@ -25,7 +25,7 @@ under the License.
   parent
 artifactIdmaven-plugins/artifactId
 groupIdorg.apache.maven.plugins/groupId
-version19/version
+version21/version
 relativePath../maven-plugins/pom.xml/relativePath
   /parent
 
@@ -237,10 +237,10 @@ under the License.
 idverify-integration-tests-checks/id
 phasepost-integration-test/phase
 configuration
-  tasks
+  target
 property name=script 
location=verify-integration-tests-checks.bsh /
 script language=beanshell src=${script} /
-  /tasks
+  /target
 /configuration
 goals
   goalrun/goal
@@ -294,12 +294,9 @@ under the License.
 exclude**/project/**/exclude
 exclude**/Abstract*.java/exclude
   /excludes
-  systemProperties
-property
-  namemaven.home/name
-  value${maven.home}/value
-/property
-  /systemProperties
+  systemPropertyVariables
+maven.home${maven.home}/maven.home
+  /systemPropertyVariables
   argLine${maven.test.jvmargs}/argLine
 /configuration
   /plugin
@@ -319,12 +316,9 @@ under the License.
   plugin
 artifactIdmaven-surefire-plugin/artifactId
 configuration
-  systemProperties combine.children=append
-property
-  namemaven.repo.local/name
-  value${maven.repo.local}/value
-/property
-  /systemProperties
+  systemPropertyVariables
+maven.repo.local${maven.repo.local}/maven.repo.local
+  /systemPropertyVariables
 /configuration
   /plugin
 /plugins
@@ -335,21 +329,14 @@ under the License.
   build
 plugins
   plugin
-artifactIdmaven-surefire-plugin/artifactId
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-failsafe-plugin/artifactId
+version2.9/version
 executions
   execution
-phaseintegration-test/phase
 goals
-  goaltest/goal
+  goalintegration-test/goal
 /goals
-configuration
-  includes
-include**/*IT.java/include
-  /includes
-  excludes
-excludespecified only to override configuration from 
default execution/exclude
-  /excludes
-/configuration
   /execution
 /executions
   /plugin

svn commit: r1151605 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java

2011-07-27 Thread hboutemy 
Author: hboutemy
Date: Wed Jul 27 19:49:28 2011
New Revision: 1151605

URL: http://svn.apache.org/viewvc?rev=1151605view=rev
Log:
improved error message to be sufficient for fix: the link is only here as 
complementary info

Modified:

maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1151605r1=1151604r2=1151605view=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
 Wed Jul 27 19:49:28 2011
@@ -355,13 +355,20 @@ public abstract class AbstractDeployMojo
 }
 catch ( UnsupportedProtocolException e )
 {
-log.error( Unsupported protocol for site deployment: ' + 
repository.getProtocol() + '. );
-log.error( Supported protocols at this moment:  + 
getSupportedProtocols() + . );
-log.error( For adding new protocols to the site plugin, see 
-+ 
http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-protocol.html;
 );
+String shortMessage =
+Unsupported protocol: ' + repository.getProtocol() + ' for 
site deployment to 
++ distributionManagement.site.url= + repository.getUrl() 
+ .;
+String longMessage =
+Supported protocols at this moment:  + 
getSupportedProtocols() + .\n
++ You can add protocols through wagon providers 
either as maven-site-plugin dependency or 
++ extension.\n
++ For more information, see 
++ 
http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-protocol.html;;
 
-throw new MojoExecutionException( Unsupported protocol for site 
deployment: ' + repository.getProtocol()
-+ '., e );
+log.error( shortMessage );
+log.error( longMessage );
+
+throw new MojoExecutionException( null, shortMessage, \n + 
shortMessage + \n + longMessage );
 }
 catch ( TransferFailedException e )
 {

svn commit: r1151606 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java

2011-07-27 Thread hboutemy 
Author: hboutemy
Date: Wed Jul 27 19:52:05 2011
New Revision: 1151606

URL: http://svn.apache.org/viewvc?rev=1151606view=rev
Log:
added a stacktrace when unexpected error happens when getting an existing wagon 
provider

Modified:

maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1151606r1=1151605r2=1151606view=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
 Wed Jul 27 19:52:05 2011
@@ -359,7 +359,7 @@ public abstract class AbstractDeployMojo
 Unsupported protocol: ' + repository.getProtocol() + ' for 
site deployment to 
 + distributionManagement.site.url= + repository.getUrl() 
+ .;
 String longMessage =
-Supported protocols at this moment:  + 
getSupportedProtocols() + .\n
+Supported protocols at this moment:  + 
getSupportedProtocols( log ) + .\n
 + You can add protocols through wagon providers 
either as maven-site-plugin dependency or 
 + extension.\n
 + For more information, see 
@@ -384,7 +384,7 @@ public abstract class AbstractDeployMojo
 return wagon;
 }
 
-private String getSupportedProtocols()
+private String getSupportedProtocols( final Log log )
 {
 try
 {
@@ -394,7 +394,8 @@ public abstract class AbstractDeployMojo
 }
 catch ( ComponentLookupException e )
 {
-// ignore
+// in the unexpected case there is a problem when instantiating a 
wagon provider
+log.error( e );
 }
 return ;
 }

svn commit: r1151628 - in /maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project: ModelUtils.java inheritance/DefaultModelInheritanceAssembler.java

2011-07-27 Thread hboutemy 
Author: hboutemy
Date: Wed Jul 27 21:05:38 2011
New Revision: 1151628

URL: http://svn.apache.org/viewvc?rev=1151628view=rev
Log:
added generics

Modified:

maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=1151628r1=1151627r2=1151628view=diff
==
--- 
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
 Wed Jul 27 21:05:38 2011
@@ -72,123 +72,123 @@ import org.codehaus.plexus.util.xml.Xpp3
 public final class ModelUtils
 {
 
-private static final ModelPartCloner DEPENDENCY_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerDependency DEPENDENCY_CLONER = new 
ModelPartClonerDependency()
 {
-public Object cloneModelPart( Object src )
+public Dependency cloneModelPart( Dependency src )
 {
-return ModelUtils.cloneDependency( (Dependency) src );
+return ModelUtils.cloneDependency( src );
 }
 };
 
-private static final ModelPartCloner PLUGIN_CLONER = new ModelPartCloner()
+private static final ModelPartClonerPlugin PLUGIN_CLONER = new 
ModelPartClonerPlugin()
 {
-public Object cloneModelPart( Object src )
+public Plugin cloneModelPart( Plugin src )
 {
-return ModelUtils.clonePlugin( (Plugin) src );
+return ModelUtils.clonePlugin( src );
 }
 };
 
-private static final ModelPartCloner EXTENSION_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerExtension EXTENSION_CLONER = new 
ModelPartClonerExtension()
 {
-public Object cloneModelPart( Object src )
+public Extension cloneModelPart( Extension src )
 {
-return ModelUtils.cloneExtension( (Extension) src );
+return ModelUtils.cloneExtension( src );
 }
 };
 
-private static final ModelPartCloner RESOURCE_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerResource RESOURCE_CLONER = new 
ModelPartClonerResource()
 {
-public Object cloneModelPart( Object src )
+public Resource cloneModelPart( Resource src )
 {
-return ModelUtils.cloneResource( (Resource) src );
+return ModelUtils.cloneResource( src );
 }
 };
 
-private static final ModelPartCloner NOTIFIER_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerNotifier NOTIFIER_CLONER = new 
ModelPartClonerNotifier()
 {
-public Object cloneModelPart( Object src )
+public Notifier cloneModelPart( Notifier src )
 {
-return ModelUtils.cloneNotifier( (Notifier) src );
+return ModelUtils.cloneNotifier( src );
 }
 };
 
-private static final ModelPartCloner CONTRIBUTOR_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerContributor CONTRIBUTOR_CLONER = new 
ModelPartClonerContributor()
 {
-public Object cloneModelPart( Object src )
+public Contributor cloneModelPart( Contributor src )
 {
-return ModelUtils.cloneContributor( (Contributor) src );
+return ModelUtils.cloneContributor( src );
 }
 };
 
-private static final ModelPartCloner DEVELOPER_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerDeveloper DEVELOPER_CLONER = new 
ModelPartClonerDeveloper()
 {
-public Object cloneModelPart( Object src )
+public Developer cloneModelPart( Developer src )
 {
-return ModelUtils.cloneDeveloper( (Developer) src );
+return ModelUtils.cloneDeveloper( src );
 }
 };
 
-private static final ModelPartCloner LICENSE_CLONER = new ModelPartCloner()
+private static final ModelPartClonerLicense LICENSE_CLONER = new 
ModelPartClonerLicense()
 {
-public Object cloneModelPart( Object src )
+public License cloneModelPart( License src )
 {
-return ModelUtils.cloneLicense( (License) src );
+return ModelUtils.cloneLicense( src );
 }
 };
 
-private static final ModelPartCloner MAILING_LIST_CLONER = new 
ModelPartCloner()
+private static final ModelPartClonerMailingList MAILING_LIST_CLONER = 
new ModelPartClonerMailingList()
 {
-public Object cloneModelPart( Object src )
+

svn commit: r1151629 - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/it/ src/it/MECLIPSE-692/ src/it/MECLIPSE-692/jar-module/ src/it/MECLIPSE-692/pom-module/ src/it/MECLIPSE-692/war-module/ src

2011-07-27 Thread rfscholte 
Author: rfscholte
Date: Wed Jul 27 21:12:19 2011
New Revision: 1151629

URL: http://svn.apache.org/viewvc?rev=1151629view=rev
Log:
Fix MECLIPSE-692: .project contains projects which were skipped during reactor 
build
Introducing maven-invoker-plugin

Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/

maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/

maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/

maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/verify.bsh
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/war-module/

maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/war-module/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/it/settings.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml

maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1151629r1=1151628r2=1151629view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jul 27 21:12:19 2011
@@ -330,6 +330,26 @@ under the License.
 plugins
   plugin
 groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-invoker-plugin/artifactId
+version1.5/version
+executions
+  execution
+idintegration-test/id
+goals
+  goalinstall/goal
+  goalrun/goal
+/goals
+  /execution
+/executions
+configuration
+  cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
+  postBuildHookScriptverify/postBuildHookScript
+  
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
+  settingsFilesrc/it/settings.xml/settingsFile
+/configuration
+  /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-failsafe-plugin/artifactId
 version2.9/version
 executions

Added: 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties?rev=1151629view=auto
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties 
(added)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/invoker.properties 
Wed Jul 27 21:12:19 2011
@@ -0,0 +1 @@
+invoker.goals = clean eclipse:eclipse
\ No newline at end of file

Added: 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml?rev=1151629view=auto
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml 
(added)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/jar-module/pom.xml 
Wed Jul 27 21:12:19 2011
@@ -0,0 +1,12 @@
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+  modelVersion4.0.0/modelVersion
+  
+  parent
+ groupIdorg.apache.maven.plugins.it/groupId
+ artifactIdparent-meclipse-692/artifactId
+ version0.0.1-SNAPSHOT/version
+  /parent
+
+  artifactIdjardep-meclipse-692/artifactId
+  
+/project
\ No newline at end of file

Added: 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml?rev=1151629view=auto
==
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml 
(added)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/it/MECLIPSE-692/pom-module/pom.xml 
Wed Jul 27 21:12:19 2011
@@ -0,0 +1,21 @@
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;

svn commit: r1151649 - /maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

2011-07-27 Thread hboutemy 
Author: hboutemy
Date: Wed Jul 27 22:12:55 2011
New Revision: 1151649

URL: http://svn.apache.org/viewvc?rev=1151649view=rev
Log:
[MNG-5140] keep reports order in reportSet when merging

Modified:

maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=1151649r1=1151648r2=1151649view=diff
==
--- 
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
 Wed Jul 27 22:12:55 2011
@@ -802,7 +802,7 @@ public final class ModelUtils
 
 if ( ( parentReportSets != null )  !parentReportSets.isEmpty() )
 {
-MapString, ReportSet assembledReportSets = new TreeMapString, 
ReportSet();
+MapString, ReportSet assembledReportSets = new 
LinkedHashMapString, ReportSet();
 
 MapString, ReportSet childReportSets = 
child.getReportSetsAsMap();

svn commit: r1151656 - in /maven/plugins/branches/maven-site-plugin-2.x: ./ pom.xml src/ src/it/full-reporting/pom.xml src/it/full-reporting/verify.groovy src/it/inheritedReports/ src/main/java/org/ap

2011-07-27 Thread hboutemy 
Author: hboutemy
Date: Wed Jul 27 22:32:16 2011
New Revision: 1151656

URL: http://svn.apache.org/viewvc?rev=1151656view=rev
Log:
[MSITE-402] ensure order of reports like defined in POM (works with Maven 3 but 
not with Maven 2.2 for the moment) (merged from trunk r1150948)

Modified:
maven/plugins/branches/maven-site-plugin-2.x/   (props changed)
maven/plugins/branches/maven-site-plugin-2.x/pom.xml   (props changed)
maven/plugins/branches/maven-site-plugin-2.x/src/   (props changed)
maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/pom.xml

maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/verify.groovy
maven/plugins/branches/maven-site-plugin-2.x/src/it/inheritedReports/   
(props changed)

maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

Propchange: maven/plugins/branches/maven-site-plugin-2.x/
--
svn:mergeinfo = /maven/plugins/trunk/maven-site-plugin:1150948

Propchange: maven/plugins/branches/maven-site-plugin-2.x/pom.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 27 22:32:16 2011
@@ -1 +1,2 @@
 
/maven/plugins/branches/maven-site-plugin-3.x/pom.xml:940318,942876,956257,956299,984961,992626,1003823
+/maven/plugins/trunk/maven-site-plugin/pom.xml:1150948

Propchange: maven/plugins/branches/maven-site-plugin-2.x/src/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 27 22:32:16 2011
@@ -1 +1,2 @@
 
/maven/plugins/branches/maven-site-plugin-3.x/src:940318,942876,956257,956299,984961,992626,1003823
+/maven/plugins/trunk/maven-site-plugin/src:1150948

Modified: 
maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/pom.xml?rev=1151656r1=1151655r2=1151656view=diff
==
--- maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/pom.xml 
(original)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/pom.xml 
Wed Jul 27 22:32:16 2011
@@ -65,6 +65,23 @@
   dependencyDetailsEnabledfalse/dependencyDetailsEnabled
   dependencyLocationsEnabledfalse/dependencyLocationsEnabled
 /configuration
+reportSets
+  reportSet
+reports
+  reportindex/report
+  reportsummary/report
+  reportlicense/report
+  reportproject-team/report
+  reportscm/report
+  reportissue-tracking/report
+  reportmailing-list/report
+  reportdependencies/report
+  reportcim/report
+  reportplugin-management/report
+  reportplugins/report
+/reports
+  /reportSet
+/reportSets
   /plugin
   plugin
 groupIdorg.apache.maven.plugins/groupId

Modified: 
maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/verify.groovy?rev=1151656r1=1151655r2=1151656view=diff
==
--- 
maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/verify.groovy
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-2.x/src/it/full-reporting/verify.groovy
 Wed Jul 27 22:32:16 2011
@@ -25,21 +25,71 @@ assert content.contains( 'Test set: org.
 
 assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
 
-assert new File( basedir, 'target/site/surefire-report.html' ).exists();
-assert new File( basedir, 'target/site/index.html' ).exists();
-assert new File( basedir, 'target/site/checkstyle.html' ).exists();
-assert new File( basedir, 'target/site/cpd.html' ).exists();
-assert new File( basedir, 'target/site/apidocs/index.html' ).exists();
-assert new File( basedir, 
'target/site/apidocs/org/apache/maven/plugins/site/its/App.html' ).exists();
-assert new File( basedir, 'target/site/cobertura/index.html' ).exists();
-assert new File( basedir, 'target/site/xref/index.html' ).exists();
-assert new File( basedir, 'target/site/xref-test/index.html' ).exists();
+sitedir = new File( basedir, 'target/site' );
 
-assert new File( basedir, 'target/site/taglist.html' ).exists();
-assert new File( basedir, 'target/site/team-list.html' ).exists();
+assert new File( sitedir, 'surefire-report.html' ).exists();
+assert new File( sitedir, 'index.html' ).exists();
+assert new File( sitedir, 'checkstyle.html' ).exists();
+assert new File( sitedir, 'cpd.html' ).exists();
+assert new File( sitedir, 'apidocs/index.html' ).exists();
+assert

svn commit: r1151657 - /maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties

2011-07-27 Thread hboutemy 
Author: hboutemy
Date: Wed Jul 27 22:34:09 2011
New Revision: 1151657

URL: http://svn.apache.org/viewvc?rev=1151657view=rev
Log:
[MSITE-402] order of reports in reporSet will work for Maven 2.2.2 since 
MNG-5140 is fixed

Modified:

maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties

Modified: 
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties?rev=1151657r1=1151656r2=1151657view=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties 
(original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties 
Wed Jul 27 22:34:09 2011
@@ -1 +1,3 @@
-invoker.profiles=reporting
\ No newline at end of file
+invoker.profiles=reporting
+# see MNG-5140
+invoker.maven.version = 2.2.2+
\ No newline at end of file

svn commit: r1151723 - /maven/sandbox/bimargulies/

2011-07-27 Thread bimargulies 
Author: bimargulies
Date: Thu Jul 28 04:10:01 2011
New Revision: 1151723

URL: http://svn.apache.org/viewvc?rev=1151723view=rev
Log:
Sandbox for benson.

Added:
maven/sandbox/bimargulies/

svn commit: r1151725 - /maven/sandbox/bimargulies/mrp-snap-tc/tags/

2011-07-27 Thread bimargulies 
Author: bimargulies
Date: Thu Jul 28 04:10:24 2011
New Revision: 1151725

URL: http://svn.apache.org/viewvc?rev=1151725view=rev
Log:
more.

Added:
maven/sandbox/bimargulies/mrp-snap-tc/tags/

svn commit: r1151726 - /maven/sandbox/bimargulies/mrp-snap-tc/branches/

2011-07-27 Thread bimargulies 
Author: bimargulies
Date: Thu Jul 28 04:10:51 2011
New Revision: 1151726

URL: http://svn.apache.org/viewvc?rev=1151726view=rev
Log:
branches location.

Added:
maven/sandbox/bimargulies/mrp-snap-tc/branches/

svn commit: r1151727 - /maven/sandbox/bimargulies/mrp-snap-tc/trunk/

2011-07-27 Thread bimargulies 
Author: bimargulies
Date: Thu Jul 28 04:10:59 2011
New Revision: 1151727

URL: http://svn.apache.org/viewvc?rev=1151727view=rev
Log:
trunk location.

Added:
maven/sandbox/bimargulies/mrp-snap-tc/trunk/

svn commit: r1151729 - /maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml

2011-07-27 Thread bimargulies 
Author: bimargulies
Date: Thu Jul 28 04:12:42 2011
New Revision: 1151729

URL: http://svn.apache.org/viewvc?rev=1151729view=rev
Log:
a pom.

Added:
maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml   (with props)

Added: maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml?rev=1151729view=auto
==
--- maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml (added)
+++ maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml Thu Jul 28 04:12:42 2011
@@ -0,0 +1,51 @@
+?xml version=1.0 encoding=UTF-8?
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+groupIdorg.apache.maven/groupId
+artifactIdmrp-snap-tag-tc/artifactId
+version1-SNAPSHOT/version
+nametest case for strange behavior/name
+packagingpom/packaging
+prerequisites
+maven2.2.0/maven
+/prerequisites
+inceptionYear2010/inceptionYear
+scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/sandbox/bimargulies/mrp-snap-tc/trunk/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/mrp-snap-tc/trunk/developerConnection
+/scm
+build
+defaultGoalinstall/defaultGoal
+pluginManagement
+plugins
+ plugin
+   groupIdorg.apache.maven.plugins/groupId
+   artifactIdmaven-resources-plugin/artifactId
+   version2.5/version
+ /plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-release-plugin/artifactId
+   version2.3/version
+configuration
+password${svn.password}/password
+useReleaseProfiletrue/useReleaseProfile
+releaseProfilesrelease/releaseProfiles
+remoteTaggingtrue/remoteTagging
+autoVersionSubmodulestrue/autoVersionSubmodules
+/configuration
+/plugin
+/plugins
+/pluginManagement
+/build
+profiles
+profile
+idrelease/id
+properties
+skip.integration.teststrue/skip.integration.tests
+pmd.skiptrue/pmd.skip
+checkstyle.skiptrue/checkstyle.skip
+/properties
+/profile
+/profiles
+/project

Propchange: maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml
--
svn:eol-style = native

Propchange: maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml
--
svn:mime-type = text/plain

svn commit: r1151731 - /maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml

2011-07-27 Thread bimargulies 
Author: bimargulies
Date: Thu Jul 28 04:13:44 2011
New Revision: 1151731

URL: http://svn.apache.org/viewvc?rev=1151731view=rev
Log:
fix rel plugin version.

Modified:
maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml

Modified: maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml?rev=1151731r1=1151730r2=1151731view=diff
==
--- maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml (original)
+++ maven/sandbox/bimargulies/mrp-snap-tc/trunk/pom.xml Thu Jul 28 04:13:44 2011
@@ -26,7 +26,7 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-release-plugin/artifactId
-   version2.3/version
+   version2.2/version
 configuration
 password${svn.password}/password
 useReleaseProfiletrue/useReleaseProfile