You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/04/25 21:18:40 UTC
svn commit: r1475910 - in /maven/shared/trunk/maven-project-utils: ./
src/it/aggregator-flat/ src/it/aggregator-flat/aggregator/
src/it/multimodule-hierarchical/
src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/
src/it/standal...
Author: rfscholte
Date: Thu Apr 25 19:18:40 2013
New Revision: 1475910
URL: http://svn.apache.org/r1475910
Log:
Add ITs for scm connections
Added:
maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveScmMojo.java
Modified:
maven/shared/trunk/maven-project-utils/pom.xml
maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/aggregator/pom.xml
maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/invoker.properties
maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/verify.groovy
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/invoker.properties
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/pom.xml
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy
maven/shared/trunk/maven-project-utils/src/it/standalone/invoker.properties
maven/shared/trunk/maven-project-utils/src/it/standalone/pom.xml
maven/shared/trunk/maven-project-utils/src/it/standalone/verify.groovy
Modified: maven/shared/trunk/maven-project-utils/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/pom.xml?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/pom.xml Thu Apr 25 19:18:40 2013
@@ -65,15 +65,15 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.1.0</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/aggregator/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/aggregator/pom.xml?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/aggregator/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/aggregator/pom.xml Thu Apr 25 19:18:40 2013
@@ -12,6 +12,11 @@
</site>
</distributionManagement>
+ <scm>
+ <connection>scm:local:/project</connection>
+ <developerConnection>scm:local:/sproject</developerConnection>
+ </scm>
+
<modules>
<module>../project</module>
</modules>
Modified: maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/invoker.properties
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/invoker.properties?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/invoker.properties (original)
+++ maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/invoker.properties Thu Apr 25 19:18:40 2013
@@ -1,3 +1,2 @@
-invoker.goals = org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-site
+invoker.goals = org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-site org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-scm
invoker.project = aggregator
-invoker.debug = true
\ No newline at end of file
Modified: maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/verify.groovy
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/verify.groovy?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/verify.groovy (original)
+++ maven/shared/trunk/maven-project-utils/src/it/aggregator-flat/verify.groovy Thu Apr 25 19:18:40 2013
@@ -20,3 +20,10 @@ File buildLog = new File( basedir, 'buil
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site URL for org.apache.maven.shared.project.utils.it.aggregator-flat:aggregator:pom:0.0.1-SNAPSHOT: http://localhost/aggregator')
// aggregator is not the parent of this project, so should use its own site URL
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site URL for org.apache.maven.shared.project.utils.it.aggregator-flat:project:pom:0.0.1-SNAPSHOT: null' )
+
+assert buildLog.text.contains( '[INFO] Resolved scm connection for org.apache.maven.shared.project.utils.it.aggregator-flat:aggregator:pom:0.0.1-SNAPSHOT: scm:local:/project' );
+assert buildLog.text.contains( '[INFO] Resolved scm developer connection for org.apache.maven.shared.project.utils.it.aggregator-flat:aggregator:pom:0.0.1-SNAPSHOT: scm:local:/sproject' );
+
+def LS = System.getProperty( "line.separator" )
+assert buildLog.text.contains( "[INFO] Resolved scm connection for org.apache.maven.shared.project.utils.it.aggregator-flat:project:pom:0.0.1-SNAPSHOT: ${LS}" );
+assert buildLog.text.contains( "[INFO] Resolved scm developer connection for org.apache.maven.shared.project.utils.it.aggregator-flat:project:pom:0.0.1-SNAPSHOT: ${LS}" );
Modified: maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/invoker.properties
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/invoker.properties?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/invoker.properties (original)
+++ maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/invoker.properties Thu Apr 25 19:18:40 2013
@@ -1,2 +1 @@
-invoker.goals = org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-site
-invoker.debug = true
\ No newline at end of file
+invoker.goals = org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-site org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-scm
Modified: maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/pom.xml?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/pom.xml Thu Apr 25 19:18:40 2013
@@ -12,6 +12,11 @@
</site>
</distributionManagement>
+ <scm>
+ <connection>scm:local:/project</connection>
+ <developerConnection>scm:local:/sproject</developerConnection>
+ </scm>
+
<modules>
<module>module</module>
</modules>
Modified: maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy (original)
+++ maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy Thu Apr 25 19:18:40 2013
@@ -20,3 +20,12 @@ File buildLog = new File( basedir, 'buil
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site URL for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:multimodule:pom:0.0.1-SNAPSHOT: http://localhost/multimodule')
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site URL for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:module:pom:0.0.1-SNAPSHOT: http://localhost/multimodule/module' )
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site URL for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:submodule:pom:0.0.1-SNAPSHOT: http://localhost/multimodule/module/submodule' )
+
+assert buildLog.text.contains( '[INFO] Resolved scm connection for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:multimodule:pom:0.0.1-SNAPSHOT: scm:local:/project' )
+assert buildLog.text.contains( '[INFO] Resolved scm developer connection for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:multimodule:pom:0.0.1-SNAPSHOT: scm:local:/sproject' )
+
+assert buildLog.text.contains( '[INFO] Resolved scm connection for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:module:pom:0.0.1-SNAPSHOT: scm:local:/project/module' )
+assert buildLog.text.contains( '[INFO] Resolved scm developer connection for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:module:pom:0.0.1-SNAPSHOT: scm:local:/sproject/module' )
+
+assert buildLog.text.contains( '[INFO] Resolved scm connection for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:submodule:pom:0.0.1-SNAPSHOT: scm:local:/project/module/submodule' )
+assert buildLog.text.contains( '[INFO] Resolved scm developer connection for org.apache.maven.shared.project.utils.it.multimodule-hierarchical:submodule:pom:0.0.1-SNAPSHOT: scm:local:/sproject/module/submodule' )
Added: maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveScmMojo.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveScmMojo.java?rev=1475910&view=auto
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveScmMojo.java (added)
+++ maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveScmMojo.java Thu Apr 25 19:18:40 2013
@@ -0,0 +1,25 @@
+package org.apache.maven.shared.project.utils.it;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.project.utils.ScmUtils;
+import org.apache.maven.shared.project.utils.SiteUtils;
+
+@Mojo( name="resolve-scm" )
+public class ResolveScmMojo
+ extends AbstractMojo
+{
+ @Parameter( defaultValue = "${project}", required = true, readonly = true )
+ private MavenProject project;
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ getLog().info( "Resolved scm connection for " + project.getId() + ": " + ScmUtils.resolveScmConnection( project ) );
+ getLog().info( "Resolved scm developer connection for " + project.getId() + ": " + ScmUtils.resolveScmDeveloperConnection( project ) );
+ }
+}
Modified: maven/shared/trunk/maven-project-utils/src/it/standalone/invoker.properties
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/standalone/invoker.properties?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/standalone/invoker.properties (original)
+++ maven/shared/trunk/maven-project-utils/src/it/standalone/invoker.properties Thu Apr 25 19:18:40 2013
@@ -1,2 +1 @@
-invoker.goals = org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-site
-invoker.debug = true
\ No newline at end of file
+invoker.goals = org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-site org.apache.maven.shared.project.utils.it:maven-projectutils-plugin:resolve-scm
Modified: maven/shared/trunk/maven-project-utils/src/it/standalone/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/standalone/pom.xml?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/standalone/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/src/it/standalone/pom.xml Thu Apr 25 19:18:40 2013
@@ -12,4 +12,8 @@
</site>
</distributionManagement>
+ <scm>
+ <connection>scm:local:/project</connection>
+ <developerConnection>scm:local:/sproject</developerConnection>
+ </scm>
</project>
\ No newline at end of file
Modified: maven/shared/trunk/maven-project-utils/src/it/standalone/verify.groovy
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/standalone/verify.groovy?rev=1475910&r1=1475909&r2=1475910&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/it/standalone/verify.groovy (original)
+++ maven/shared/trunk/maven-project-utils/src/it/standalone/verify.groovy Thu Apr 25 19:18:40 2013
@@ -18,3 +18,6 @@
*/
File buildLog = new File( basedir, 'build.log' )
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site URL for org.apache.maven.shared.project.utils.it.standalone:standalone:pom:0.0.1-SNAPSHOT: http://localhost/standalone')
+
+assert buildLog.text.contains( '[INFO] Resolved scm connection for org.apache.maven.shared.project.utils.it.standalone:standalone:pom:0.0.1-SNAPSHOT: scm:local:/project' )
+assert buildLog.text.contains( '[INFO] Resolved scm developer connection for org.apache.maven.shared.project.utils.it.standalone:standalone:pom:0.0.1-SNAPSHOT: scm:local:/sproject' )