svn commit: r1175853 - in /maven/wagon/trunk/wagon-providers: wagon-ssh-external/pom.xml wagon-ssh/pom.xml
Author: olamy
Date: Mon Sep 26 13:10:25 2011
New Revision: 1175853
URL: http://svn.apache.org/viewvc?rev=1175853view=rev
Log:
move tests with embedded ssh in a profile : not very stable...
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml?rev=1175853r1=1175852r2=1175853view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml Mon Sep 26
13:10:25 2011
@@ -109,11 +109,12 @@ under the License.
/build
/profile
profile
- idssh-tests/id
+ idssh-embedded/id
activation
-file
- exists/usr/bin/scp/exists
-/file
+property
+ namessh-embedded/name
+ valuetrue/value
+/property
/activation
build
plugins
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=1175853r1=1175852r2=1175853view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Mon Sep 26 13:10:25 2011
@@ -100,6 +100,7 @@ under the License.
exclude**/SshCommandExecutorTest.*/exclude
exclude**/KnownHostsProviderTest.*/exclude
exclude**/ScpWagon*Test.*/exclude
+exclude**/Embedded*Test.*/exclude
/excludes
systemPropertyVariables
java.io.tmpdir${project.build.outputDirectory}/java.io.tmpdir
@@ -140,5 +141,35 @@ under the License.
/plugins
/build
/profile
+profile
+ idssh-embedded/id
+ activation
+property
+ namessh-embedded/name
+ valuetrue/value
+/property
+ /activation
+ build
+plugins
+ plugin
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+ !-- Tests that currently doesn't work with embedded ssh server
--
+ excludes
+exclude**/SftpWagonTest.*/exclude
+exclude**/SshCommandExecutorTest.*/exclude
+exclude**/KnownHostsProviderTest.*/exclude
+exclude**/ScpWagon*Test.*/exclude
+ /excludes
+ systemPropertyVariables
+
java.io.tmpdir${project.build.outputDirectory}/java.io.tmpdir
+test.userolamy/test.user
+
sshd.stopImmediatly${sshd.stopImmediatly}/sshd.stopImmediatly
+ /systemPropertyVariables
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
svn commit: r1175860 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/ wagon-providers/wagon-file/ wagon-providers/wagon-ftp/ wagon-providers/wagon-http-lightweight
Author: olamy Date: Mon Sep 26 13:28:41 2011 New Revision: 1175860 URL: http://svn.apache.org/viewvc?rev=1175860view=rev Log: [maven-release-plugin] prepare release wagon-2.0 Modified: maven/wagon/trunk/pom.xml maven/wagon/trunk/wagon-provider-api/pom.xml maven/wagon/trunk/wagon-provider-test/pom.xml maven/wagon/trunk/wagon-providers/pom.xml maven/wagon/trunk/wagon-providers/wagon-file/pom.xml maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared4/pom.xml maven/wagon/trunk/wagon-providers/wagon-http/pom.xml maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml maven/wagon/trunk/wagon-tcks/pom.xml maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml Modified: maven/wagon/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1175860r1=1175859r2=1175860view=diff == --- maven/wagon/trunk/pom.xml (original) +++ maven/wagon/trunk/pom.xml Mon Sep 26 13:28:41 2011 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId - version2.0-SNAPSHOT/version + version2.0/version packagingpom/packaging nameApache Maven Wagon/name @@ -167,9 +167,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/wagon/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/wagon/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/maven/wagon/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-2.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/wagon/tags/wagon-2.0/developerConnection +urlhttp://svn.apache.org/viewvc/maven/wagon/tags/wagon-2.0/url /scm issueManagement systemjira/system Modified: maven/wagon/trunk/wagon-provider-api/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=1175860r1=1175859r2=1175860view=diff == --- maven/wagon/trunk/wagon-provider-api/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-api/pom.xml Mon Sep 26 13:28:41 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.0-SNAPSHOT/version +version2.0/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-provider-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=1175860r1=1175859r2=1175860view=diff == --- maven/wagon/trunk/wagon-provider-test/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-test/pom.xml Mon Sep 26 13:28:41 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.0-SNAPSHOT/version +version2.0/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?rev=1175860r1=1175859r2=1175860view=diff == --- maven/wagon/trunk/wagon-providers/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/pom.xml Mon Sep 26 13:28:41 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.0-SNAPSHOT/version +version2.0/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/wagon-file/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/pom.xml?rev=1175860r1=1175859r2=1175860view=diff == --- maven/wagon/trunk/wagon-providers/wagon-file/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-file/pom.xml Mon Sep 26 13:28:41 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon-providers/artifactId -version2.0-SNAPSHOT/version +version2.0/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml URL:
svn commit: r1175863 - /maven/wagon/tags/wagon-2.0/
Author: olamy Date: Mon Sep 26 13:32:16 2011 New Revision: 1175863 URL: http://svn.apache.org/viewvc?rev=1175863view=rev Log: [maven-release-plugin] copy for tag wagon-2.0 Added: maven/wagon/tags/wagon-2.0/ - copied from r1175862, maven/wagon/trunk/
svn commit: r1175864 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/ wagon-providers/wagon-file/ wagon-providers/wagon-ftp/ wagon-providers/wagon-http-lightweight
Author: olamy Date: Mon Sep 26 13:32:53 2011 New Revision: 1175864 URL: http://svn.apache.org/viewvc?rev=1175864view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/wagon/trunk/pom.xml maven/wagon/trunk/wagon-provider-api/pom.xml maven/wagon/trunk/wagon-provider-test/pom.xml maven/wagon/trunk/wagon-providers/pom.xml maven/wagon/trunk/wagon-providers/wagon-file/pom.xml maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared4/pom.xml maven/wagon/trunk/wagon-providers/wagon-http/pom.xml maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml maven/wagon/trunk/wagon-tcks/pom.xml maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml Modified: maven/wagon/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1175864r1=1175863r2=1175864view=diff == --- maven/wagon/trunk/pom.xml (original) +++ maven/wagon/trunk/pom.xml Mon Sep 26 13:32:53 2011 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId - version2.0/version + version2.1-SNAPSHOT/version packagingpom/packaging nameApache Maven Wagon/name @@ -167,9 +167,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-2.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/wagon/tags/wagon-2.0/developerConnection -urlhttp://svn.apache.org/viewvc/maven/wagon/tags/wagon-2.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/wagon/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/wagon/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/maven/wagon/trunk/url /scm issueManagement systemjira/system Modified: maven/wagon/trunk/wagon-provider-api/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=1175864r1=1175863r2=1175864view=diff == --- maven/wagon/trunk/wagon-provider-api/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-api/pom.xml Mon Sep 26 13:32:53 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.0/version +version2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-provider-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=1175864r1=1175863r2=1175864view=diff == --- maven/wagon/trunk/wagon-provider-test/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-test/pom.xml Mon Sep 26 13:32:53 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.0/version +version2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?rev=1175864r1=1175863r2=1175864view=diff == --- maven/wagon/trunk/wagon-providers/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/pom.xml Mon Sep 26 13:32:53 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.0/version +version2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/wagon-file/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/pom.xml?rev=1175864r1=1175863r2=1175864view=diff == --- maven/wagon/trunk/wagon-providers/wagon-file/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-file/pom.xml Mon Sep 26 13:32:53 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon-providers/artifactId -version2.0/version +version2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml URL:
svn commit: r1176032 - /maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Author: hboutemy
Date: Mon Sep 26 20:31:24 2011
New Revision: 1176032
URL: http://svn.apache.org/viewvc?rev=1176032view=rev
Log:
added an assertion to check a known problem when upgrading Maven core dependency
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=1176032r1=1176031r2=1176032view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Mon Sep 26 20:31:24 2011
@@ -121,6 +121,13 @@ public class DefaultProjectDependencyAna
MavenProject project2 = getProject(
jarWithCompileDependency/project2/pom.xml );
+if ( project2.getBuild().getOutputDirectory().contains( ${ ) )
+{
+// if Maven version used as dependency is upgraded to = 2.2.0
+throw new TestToolsException( output directory was not
interpolated:
++ project2.getBuild().getOutputDirectory() );
+}
+
ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2
);
Artifact project1 =
svn commit: r1176054 - /maven/surefire/tags/surefire-2.10/
Author: pgier Date: Mon Sep 26 21:00:11 2011 New Revision: 1176054 URL: http://svn.apache.org/viewvc?rev=1176054view=rev Log: [maven-release-plugin] copy for tag surefire-2.10 Added: maven/surefire/tags/surefire-2.10/ - copied from r1176053, maven/surefire/trunk/
svn commit: r1176053 - in /maven/surefire/trunk: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-booter/ surefire-integrati
Author: pgier Date: Mon Sep 26 21:00:05 2011 New Revision: 1176053 URL: http://svn.apache.org/viewvc?rev=1176053view=rev Log: [maven-release-plugin] prepare release surefire-2.10 Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml maven/surefire/trunk/maven-surefire-common/pom.xml maven/surefire/trunk/maven-surefire-plugin/pom.xml maven/surefire/trunk/maven-surefire-report-plugin/pom.xml maven/surefire/trunk/pom.xml maven/surefire/trunk/surefire-api/pom.xml maven/surefire/trunk/surefire-booter/pom.xml maven/surefire/trunk/surefire-integration-tests/pom.xml maven/surefire/trunk/surefire-providers/common-junit3/pom.xml maven/surefire/trunk/surefire-providers/common-junit4/pom.xml maven/surefire/trunk/surefire-providers/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/pom.xml maven/surefire/trunk/surefire-shadefire/pom.xml Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1176053r1=1176052r2=1176053view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Mon Sep 26 21:00:05 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10-SNAPSHOT/version +version2.10/version relativePath../pom.xml/relativePath /parent @@ -161,7 +161,7 @@ dependency groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId - version2.10-SNAPSHOT/version + version2.10/version scopeprovided/scope typezip/type classifiersite-source/classifier Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1176053r1=1176052r2=1176053view=diff == --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Mon Sep 26 21:00:05 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10-SNAPSHOT/version +version2.10/version relativePath../pom.xml/relativePath /parent Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1176053r1=1176052r2=1176053view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Mon Sep 26 21:00:05 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10-SNAPSHOT/version +version2.10/version relativePath../pom.xml/relativePath /parent Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=1176053r1=1176052r2=1176053view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Mon Sep 26 21:00:05 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10-SNAPSHOT/version +version2.10/version relativePath../pom.xml/relativePath /parent Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1176053r1=1176052r2=1176053view=diff == --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Mon Sep 26 21:00:05 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.10-SNAPSHOT/version + version2.10/version packagingpom/packaging nameSureFire/name @@ -100,9 +100,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk//developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/surefire/trunk/url +
svn commit: r1176055 - in /maven/surefire/trunk: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-booter/ surefire-integrati
Author: pgier Date: Mon Sep 26 21:00:17 2011 New Revision: 1176055 URL: http://svn.apache.org/viewvc?rev=1176055view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml maven/surefire/trunk/maven-surefire-common/pom.xml maven/surefire/trunk/maven-surefire-plugin/pom.xml maven/surefire/trunk/maven-surefire-report-plugin/pom.xml maven/surefire/trunk/pom.xml maven/surefire/trunk/surefire-api/pom.xml maven/surefire/trunk/surefire-booter/pom.xml maven/surefire/trunk/surefire-integration-tests/pom.xml maven/surefire/trunk/surefire-providers/common-junit3/pom.xml maven/surefire/trunk/surefire-providers/common-junit4/pom.xml maven/surefire/trunk/surefire-providers/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit3/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml maven/surefire/trunk/surefire-setup-integration-tests/pom.xml maven/surefire/trunk/surefire-shadefire/pom.xml Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1176055r1=1176054r2=1176055view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Mon Sep 26 21:00:17 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10/version +version2.11-SNAPSHOT/version relativePath../pom.xml/relativePath /parent @@ -161,7 +161,7 @@ dependency groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId - version2.10/version + version2.11-SNAPSHOT/version scopeprovided/scope typezip/type classifiersite-source/classifier Modified: maven/surefire/trunk/maven-surefire-common/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1176055r1=1176054r2=1176055view=diff == --- maven/surefire/trunk/maven-surefire-common/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-common/pom.xml Mon Sep 26 21:00:17 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10/version +version2.11-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1176055r1=1176054r2=1176055view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Mon Sep 26 21:00:17 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10/version +version2.11-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=1176055r1=1176054r2=1176055view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Mon Sep 26 21:00:17 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.10/version +version2.11-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1176055r1=1176054r2=1176055view=diff == --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Mon Sep 26 21:00:17 2011 @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.10/version + version2.11-SNAPSHOT/version packagingpom/packaging nameSureFire/name @@ -100,9 +100,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.10/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.10/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.10/url +
svn commit: r1176059 - in /maven/plugins/trunk/maven-javadoc-plugin/src: it/MJAVADOC-325/ it/MJAVADOC-325/src/ it/MJAVADOC-325/src/main/ it/MJAVADOC-325/src/main/java/ it/MJAVADOC-325/src/main/java/fo
Author: rfscholte
Date: Mon Sep 26 21:09:46 2011
New Revision: 1176059
URL: http://svn.apache.org/viewvc?rev=1176059view=rev
Log:
Fix for MJAVADOC-325: Incorrect -link is generated when its URL contains a comma
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties?rev=1176059view=auto
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/invoker.properties
Mon Sep 26 21:09:46 2011
@@ -0,0 +1 @@
+invoker.goals=clean javadoc:javadoc
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml?rev=1176059view=auto
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml Mon
Sep 26 21:09:46 2011
@@ -0,0 +1,56 @@
+?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 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
+
+ groupIdorg.apache.maven.plugins.maven-javadoc-plugin.it/groupId
+ artifactIdmjavadoc-325/artifactId
+ version1.0-SNAPSHOT/version
+
+ properties
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+ /properties
+
+ build
+pluginManagement
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-compiler-plugin/artifactId
+ version2.3.2/version
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-javadoc-plugin/artifactId
+ version2.8.1-SNAPSHOT/version
+ configuration
+debugtrue/debug
+links
+ linkhttp://download.oracle.com/javase/1,5,0/docs/api//link
+/links
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
+ /build
+
+/project
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java?rev=1176059view=auto
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/src/main/java/foo/Bar.java
Mon Sep 26 21:09:46 2011
@@ -0,0 +1,3 @@
+package foo;
+
+public class Bar {}
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh?rev=1176059view=auto
==
---
