date:20090723

svn commit: r797039 [2/2] - in /maven/plugins/trunk/maven-javadoc-plugin/src: main/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/ja

2009-07-23 Thread vsiveton

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java?rev=797039r1=797038r2=797039view=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
 Thu Jul 23 12:30:42 2009
@@ -24,7 +24,6 @@
  *
  * @author a href=mailto:vsive...@apache.org;vsive...@apache.org/a
  * @version $Id: $
- * @since 1.0
  */
 public interface InterfaceWithNoJavadoc
 {
@@ -45,4 +44,17 @@
  * @param aString a {...@link java.lang.String} object.
  */
 void missingJavadoc2( String aString );
+
+// --
+// New methods to be found by Clirr.
+// --
+
+/**
+ * pnewInterfaceMethod/p
+ *
+ * @param aString a {...@link java.lang.String} object.
+ * @return a {...@link java.lang.String} object.
+ * @since 1.1
+ */
+public String newInterfaceMethod( String aString );
 }

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml?rev=797039r1=797038r2=797039view=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml
 Thu Jul 23 12:30:42 2009
@@ -22,7 +22,7 @@
 
   groupIdorg.apache.maven.plugins.maven-javadoc-plugin.unit/groupId
   artifactIdfix-test/artifactId
-  version1.0-SNAPSHOT/version
+  version1.1-SNAPSHOT/version
   nameJavadoc Test Project/name
   packagingjar/packaging
 
@@ -42,15 +42,17 @@
 artifactIdmaven-javadoc-plugin/artifactId
 configuration
   project 
implementation=org.apache.maven.plugin.javadoc.stubs.FixMavenProjectStub/
+  localRepository${localRepository}/localRepository
   
outputDirectory${basedir}/target/test/unit/fix-test/target/generated/outputDirectory
-  defaultSince1.0-SNAPSHOT/defaultSince
+  defaultSince1.1-SNAPSHOT/defaultSince
   encodingUTF-8/encoding
   fixTagsall/fixTags
   fixClassCommenttrue/fixClassComment
   fixFieldCommenttrue/fixFieldComment
   fixMethodCommenttrue/fixMethodComment
   forcetrue/force
-  ignoreClirrtrue/ignoreClirr
+  ignoreClirrfalse/ignoreClirr
+  comparisonVersion1.0/comparisonVersion
   includes**/*.java/includes
   levelprotected/level
   defaultAuthor![CDATA[a 
href=mailto:vsive...@apache.org;vsive...@apache.org/a]]/defaultAuthor

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.jar
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.jar?rev=797039view=auto
==
Binary file - no diff available.

Propchange: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.jar
--
svn:mime-type = application/octet-stream

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom?rev=797039view=auto
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom
 (added)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom
 Thu Jul 23 12:30:42 2009
@@ -0,0 +1,61 @@
+?xml version='1.0' encoding='UTF-8'?
+!--
+  Licensed to the Apache Software

svn commit: r797077 - /maven/site/trunk/src/site/apt/shared/index.apt

2009-07-23 Thread dennisl

Author: dennisl
Date: Thu Jul 23 14:12:35 2009
New Revision: 797077

URL: http://svn.apache.org/viewvc?rev=797077view=rev
Log:
o Release maven-reporting-impl 2.0.4.2

Modified:
maven/site/trunk/src/site/apt/shared/index.apt

Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=797077r1=797076r2=797077view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Thu Jul 23 14:12:35 2009
@@ -3,7 +3,7 @@
  -
  Dennis Lundberg
  -
- 2009-03-09
+ 2009-07-23
  -
 
 Shared Components
@@ -28,7 +28,7 @@
 
*+--+---+++
 | {{{/shared/maven-model-converter/} maven-model-converter}}   | 
2.2  | 2007-08-22| Converts between version 3.0.0 and version 
4.0.0 models. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
 
*+--+---+++
-| {{{/shared/maven-reporting-impl/} maven-reporting-impl}} | 
2.0.4.1  | 2008-03-26| Abstract classes to manage report 
generation. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-impl/}SVN}}
+| {{{/shared/maven-reporting-impl/} maven-reporting-impl}} | 
2.0.4.2  | 2009-07-23| Abstract classes to manage report 
generation. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-impl/}SVN}}
 
*+--+---+++
 | {{{/shared/maven-runtime/} maven-runtime}}   | 
1.0-alpha-1  | 2008-06-02| Maven Runtime allows introspection of Maven 
project metadata at runtime. | 
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-runtime/}SVN}}
 
*+--+---+++

svn commit: r797078 - /maven/site/trunk/src/site/apt/plugins/index.apt

2009-07-23 Thread dennisl

Author: dennisl
Date: Thu Jul 23 14:13:23 2009
New Revision: 797078

URL: http://svn.apache.org/viewvc?rev=797078view=rev
Log:
o Release maven-project-info-reports-plugin 2.1.2

Modified:
maven/site/trunk/src/site/apt/plugins/index.apt

Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=797078r1=797077r2=797078view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Thu Jul 23 14:13:23 2009
@@ -4,7 +4,7 @@
  Brett Porter
  Jason van Zyl
  -
- 2009-03-25
+ 2009-07-23
  -
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -102,7 +102,7 @@
 
*---+--++--+++
 | {{{/plugins/maven-pmd-plugin/} pmd}}| 2.4  | 
2008-01-08 | Generate a PMD report. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin}SVN}} | 
{{{http://jira.codehaus.org/browse/MPMD}JIRA}}
 
*---+--++--+++
-| {{{/plugins/maven-project-info-reports-plugin/} project-info-reports}} 
| 2.1.1 | 2009-03-03 | Generate standard project reports. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MPIR}JIRA}}
+| {{{/plugins/maven-project-info-reports-plugin/} project-info-reports}} 
| 2.1.2 | 2009-07-23 | Generate standard project reports. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MPIR}JIRA}}
 
*---+--++--+++
 | {{{/plugins/maven-surefire-report-plugin/} surefire-report}} | 2.4.3 | 
2008-05-14 | Generate a report based on the results of unit tests. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-report-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
 
*---+--++--+++

svn commit: r797211 - /maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy path/pom.xml

2009-07-23 Thread bentmann

Author: bentmann
Date: Thu Jul 23 20:22:59 2009
New Revision: 797211

URL: http://svn.apache.org/viewvc?rev=797211view=rev
Log:
o Fixed IT to use proper plugin version

Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy path/pom.xml

Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy path/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy%20path/pom.xml?rev=797211r1=797210r2=797211view=diff
==
--- maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy path/pom.xml 
(original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy path/pom.xml Thu 
Jul 23 20:22:59 2009
@@ -60,7 +60,7 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-jarsigner-plugin/artifactId
-version1.0-SNAPSHOT/version
+version@project.version@/version
 configuration
   aliastest-01/alias
   keypasskey-passwd/keypass

svn commit: r797214 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/

2009-07-23 Thread bentmann

Author: bentmann
Date: Thu Jul 23 20:39:50 2009
New Revision: 797214

URL: http://svn.apache.org/viewvc?rev=797214view=rev
Log:
o Improved test names

Added:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
  - copied, changed from r797213, 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileTest.java

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
  - copied, changed from r797213, 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038CustomPomFileTest.java
Removed:

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

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038CustomPomFileTest.java
Modified:

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

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=797214r1=797213r2=797214view=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
 Thu Jul 23 20:39:50 2009
@@ -388,8 +388,8 @@
 suite.addTestSuite( 
MavenIT0041ArtifactTypeFromPluginExtensionTest.class );
 suite.addTestSuite( MavenIT0040PackagingFromPluginExtensionTest.class 
);
 suite.addTestSuite( MavenIT0039ReleasePomInReactorTest.class );
-suite.addTestSuite( MavenIT0038CustomPomFileTest.class );
-suite.addTestSuite( MavenIT0037AlternatePomFileTest.class );
+suite.addTestSuite( MavenIT0038AlternatePomFileDifferentDirTest.class 
);
+suite.addTestSuite( MavenIT0037AlternatePomFileSameDirTest.class );
 suite.addTestSuite( MavenIT0036ReleasePomTest.class );
 suite.addTestSuite( MavenIT0032MavenPrerequisiteTest.class );
 suite.addTestSuite( MavenIT0030DepPomDepMngtInheritanceTest.class );

Copied: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
 (from r797213, 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileTest.java)
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.javap1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileTest.javar1=797213r2=797214rev=797214view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
 Thu Jul 23 20:39:50 2009
@@ -30,10 +30,10 @@
  * @author John Casey
  * @version $Id$
  */
-public class MavenIT0037AlternatePomFileTest
+public class MavenIT0037AlternatePomFileSameDirTest
 extends AbstractMavenIntegrationTestCase
 {
-public MavenIT0037AlternatePomFileTest()
+public MavenIT0037AlternatePomFileSameDirTest()
 {
 super( ALL_MAVEN_VERSIONS );
 }

Copied: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
 (from r797213, 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038CustomPomFileTest.java)
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.javap1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038CustomPomFileTest.javar1=797213r2=797214rev=797214view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038CustomPomFileTest.java

svn commit: r797239 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

2009-07-23 Thread bentmann

Author: bentmann
Date: Thu Jul 23 21:50:49 2009
New Revision: 797239

URL: http://svn.apache.org/viewvc?rev=797239view=rev
Log:
o Made plugin version resolution more robust and ensured we fail fast upon 
resolution failure instead of some NPE in later execution steps

Modified:

maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=797239r1=797238r2=797239view=diff
==
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Thu Jul 23 21:50:49 2009
@@ -700,22 +700,24 @@
 }
 
 if ( artifactMetadataFile.exists() )
-{
+{
+logger.debug( Extracting version for plugin  + plugin.getKey() + 
 from  + artifactMetadataFile );
+
 try
 {
 Metadata pluginMetadata = readMetadata( artifactMetadataFile );
 
 String release = pluginMetadata.getVersioning().getRelease();
 
-if ( release != null )
+if ( StringUtils.isNotEmpty( release ) )
 {
 plugin.setVersion( release );
 }
 else
 {
 String latest = pluginMetadata.getVersioning().getLatest();
-
-if ( latest != null )
+
+if ( StringUtils.isNotEmpty( latest ) )
 {
 plugin.setVersion( latest );
 }
@@ -726,7 +728,8 @@
 logger.warn( Error reading plugin metadata: , e );
 }
 }
-else
+
+if ( StringUtils.isEmpty( plugin.getVersion() ) )
 {
 throw new PluginNotFoundException( plugin, remoteRepositories );
 }

svn commit: r797286 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 00:46:38 2009
New Revision: 797286

URL: http://svn.apache.org/viewvc?rev=797286view=rev
Log:
debug output for troubleshooting...

Modified:

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

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java?rev=797286r1=797285r2=797286view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
 Fri Jul 24 00:46:38 2009
@@ -50,6 +50,7 @@
 
 List cliOptions = new ArrayList();
 cliOptions.add( -Dmaven.wagon.provider.http=coreit );
+cliOptions.add( -X );
 
 verifier.setLogFileName( log-cli.txt );
 verifier.executeGoal( deploy );
@@ -70,6 +71,7 @@
 List cliOptions = new ArrayList();
 cliOptions.add( --settings );
 cliOptions.add( settings.xml );
+cliOptions.add( -X );
 
 verifier.setLogFileName( log-settings.txt );
 verifier.executeGoal( deploy );

svn commit: r797278 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-4254/ core-it-support/core-it-wagon/src/main/java/

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 00:23:23 2009
New Revision: 797278

URL: http://svn.apache.org/viewvc?rev=797278view=rev
Log:
[MNG-4254] Adding integration tests for CLI-specified and settings-configured 
wagon providers.

Added:

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

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4254/

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4254/pom.xml
   (with props)

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

maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/

maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java
   (with props)
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/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java

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

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=797278r1=797277r2=797278view=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
 Fri Jul 24 00:23:23 2009
@@ -91,8 +91,9 @@
 // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng4254SelectableWagonProvidersTest.class );
 suite.addTestSuite( 
MavenITmng4238ArtifactHandlerExtensionUsageTest.class );
-//suite.addTestSuite( 
MavenITmng4235HttpAuthDeploymentChecksumsTest.class );
+suite.addTestSuite( 
MavenITmng4235HttpAuthDeploymentChecksumsTest.class );
 suite.addTestSuite( MavenITmng4231SnapshotUpdatePolicyTest.class );
 suite.addTestSuite( MavenITmng4214MirroredParentSearchReposTest.class 
);
 suite.addTestSuite( 
MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.class );

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java?rev=797278r1=797277r2=797278view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
 Fri Jul 24 00:23:23 2009
@@ -53,25 +53,7 @@
 
 Verifier verifier = new Verifier( testDir.getAbsolutePath() );
 
-// remove the artifact+POM that should be installed here.
-verifier.deleteArtifact( GID, AID, VERSION, pom );
-
-// first child
-verifier.deleteArtifact( GID, AID + .1, VERSION, pom );
-verifier.deleteArtifact( GID, AID + .1, VERSION, TYPE );
-
-// shouldn't exist, but we want to make sure we're testing the current 
pass properly...
-verifier.deleteArtifact( GID, AID + .1, VERSION, BAD_TYPE1 );
-verifier.deleteArtifact( GID, AID + .1, VERSION, BAD_TYPE2 );
-
-
-// second child
-verifier.deleteArtifact( GID, AID + .2, VERSION, pom );
-verifier.deleteArtifact( GID, AID + .2, VERSION, TYPE );
-
-// shouldn't exist, but we want to make sure we're testing the current 
pass properly...
-verifier.deleteArtifact( GID, AID + .2, VERSION, BAD_TYPE1 );
-verifier.deleteArtifact( GID, AID + .2, VERSION, BAD_TYPE2 );
+verifier.deleteArtifacts( GID );
 
 verifier.executeGoal( install );
 

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
URL:

svn commit: r797294 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 01:03:11 2009
New Revision: 797294

URL: http://svn.apache.org/viewvc?rev=797294view=rev
Log:
Fixing IT

Modified:

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

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java?rev=797294r1=797293r2=797294view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
 Fri Jul 24 01:03:11 2009
@@ -51,6 +51,9 @@
 List cliOptions = new ArrayList();
 cliOptions.add( -Dmaven.wagon.provider.http=coreit );
 cliOptions.add( -X );
+cliOptions.add( -V );
+
+verifier.setCliOptions( cliOptions );
 
 verifier.setLogFileName( log-cli.txt );
 verifier.executeGoal( deploy );
@@ -72,7 +75,10 @@
 cliOptions.add( --settings );
 cliOptions.add( settings.xml );
 cliOptions.add( -X );
+cliOptions.add( -V );
 
+verifier.setCliOptions( cliOptions );
+
 verifier.setLogFileName( log-settings.txt );
 verifier.executeGoal( deploy );

svn commit: r797298 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 01:09:26 2009
New Revision: 797298

URL: http://svn.apache.org/viewvc?rev=797298view=rev
Log:
comment out debug mode

Modified:

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

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java?rev=797298r1=797297r2=797298view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
 Fri Jul 24 01:09:26 2009
@@ -50,7 +50,7 @@
 
 List cliOptions = new ArrayList();
 cliOptions.add( -Dmaven.wagon.provider.http=coreit );
-cliOptions.add( -X );
+//cliOptions.add( -X );
 cliOptions.add( -V );
 
 verifier.setCliOptions( cliOptions );
@@ -74,7 +74,7 @@
 List cliOptions = new ArrayList();
 cliOptions.add( --settings );
 cliOptions.add( settings.xml );
-cliOptions.add( -X );
+//cliOptions.add( -X );
 cliOptions.add( -V );
 
 verifier.setCliOptions( cliOptions );

svn commit: r797303 - /maven/maven-2/branches/maven-2.2.x/pom.xml

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 01:37:50 2009
New Revision: 797303

URL: http://svn.apache.org/viewvc?rev=797303view=rev
Log:
update clirr config.

Modified:
maven/maven-2/branches/maven-2.2.x/pom.xml

Modified: maven/maven-2/branches/maven-2.2.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/pom.xml?rev=797303r1=797302r2=797303view=diff
==
--- maven/maven-2/branches/maven-2.2.x/pom.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/pom.xml Fri Jul 24 01:37:50 2009
@@ -215,11 +215,9 @@
   version2.2.1/version
   configuration
 !-- needed for release: default value (,${project.version}) for 
2.0.10 is 2.0.10-SNAPSHOT --
-comparisonVersion2.1.0/comparisonVersion
+comparisonVersion2.2.0/comparisonVersion
 excludes
-  
excludeorg/apache/maven/project/artifact/ArtifactWithProject*/exclude
-  
excludeorg/apache/maven/project/artifact/ProjectArtifactFactory*/exclude
-  
excludeorg/apache/maven/project/artifact/VersionExpressionTransformation*/exclude
+  
excludeorg/apache/maven/artifact/manager/WagonManager*/exclude
 /excludes
   /configuration
 /plugin

svn commit: r797304 - /maven/maven-2/branches/maven-2.2.x/pom.xml

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 01:42:24 2009
New Revision: 797304

URL: http://svn.apache.org/viewvc?rev=797304view=rev
Log:
still fixing clirr...

Modified:
maven/maven-2/branches/maven-2.2.x/pom.xml

Modified: maven/maven-2/branches/maven-2.2.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/pom.xml?rev=797304r1=797303r2=797304view=diff
==
--- maven/maven-2/branches/maven-2.2.x/pom.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/pom.xml Fri Jul 24 01:42:24 2009
@@ -218,6 +218,7 @@
 comparisonVersion2.2.0/comparisonVersion
 excludes
   
excludeorg/apache/maven/artifact/manager/WagonManager*/exclude
+  excludeorg/apache/maven/extension/ExtensionManager*/exclude
 /excludes
   /configuration
 /plugin

svn commit: r797306 - in /maven/maven-2/tags/maven-2.2.1-RC1: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-compat/ maven-core/ maven-error-diagnostics/ maven-mod

2009-07-23 Thread jdcasey

Author: jdcasey
Date: Fri Jul 24 01:48:43 2009
New Revision: 797306

URL: http://svn.apache.org/viewvc?rev=797306view=rev
Log:
[maven-release-plugin]  copy for tag maven-2.2.1-RC1

Added:
maven/maven-2/tags/maven-2.2.1-RC1/   (props changed)
  - copied from r797301, maven/maven-2/branches/maven-2.2.x/
maven/maven-2/tags/maven-2.2.1-RC1/apache-maven/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/apache-maven/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-artifact-manager/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-artifact-test/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-artifact-test/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-artifact/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-artifact/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-compat/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-compat/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-core/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-core/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-error-diagnostics/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-error-diagnostics/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-model/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-model/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-monitor/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-monitor/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-plugin-api/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-plugin-api/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-plugin-descriptor/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-plugin-descriptor/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-plugin-parameter-documenter/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-plugin-parameter-documenter/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-plugin-registry/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-plugin-registry/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-profile/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-profile/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-project/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-project/pom.xml

maven/maven-2/tags/maven-2.2.1-RC1/maven-reporting/maven-reporting-api/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-reporting/maven-reporting-api/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-reporting/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-reporting/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-repository-metadata/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-repository-metadata/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-script/maven-script-ant/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-script/maven-script-ant/pom.xml

maven/maven-2/tags/maven-2.2.1-RC1/maven-script/maven-script-beanshell/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-script/maven-script-beanshell/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-script/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-script/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-settings/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-settings/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/maven-toolchain/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/pom.xml
maven/maven-2/tags/maven-2.2.1-RC1/pom.xml
  - copied unchanged from r797305, 
maven/maven-2/branches/maven-2.2.x/pom.xml

Propchange: maven/maven-2/tags/maven-2.2.1-RC1/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jul 24 01:48:43 2009
@@ -0,0 +1,19 @@
+bootstrap
+release.properties
+maven.log
+target
+.classpath
+.project
+bootstrap.repo
+maven-component.i*
+.settings
+mboot.jar
+dummy
+build.ajproperties
+.generated.lst
+*.iml
+*.iws
+*.ipr
+log.txt
+setup_env.sh
+target-eclipse

Propchange: maven/maven-2/tags/maven-2.2.1-RC1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 24 01:48:43 2009
@@ -0,0

svn commit: r797039 [2/2] - in /maven/plugins/trunk/maven-javadoc-plugin/src: main/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/ja

svn commit: r797077 - /maven/site/trunk/src/site/apt/shared/index.apt

svn commit: r797078 - /maven/site/trunk/src/site/apt/plugins/index.apt

svn commit: r797211 - /maven/plugins/trunk/maven-jarsigner-plugin/src/it/spacy path/pom.xml

svn commit: r797214 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/

svn commit: r797239 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

svn commit: r797286 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java

svn commit: r797278 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-4254/ core-it-support/core-it-wagon/src/main/java/

svn commit: r797294 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java

svn commit: r797298 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java

svn commit: r797303 - /maven/maven-2/branches/maven-2.2.x/pom.xml

svn commit: r797304 - /maven/maven-2/branches/maven-2.2.x/pom.xml

svn commit: r797306 - in /maven/maven-2/tags/maven-2.2.1-RC1: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-compat/ maven-core/ maven-error-diagnostics/ maven-mod

13 matches

Site Navigation

Mail list logo

Footer information