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 2012/12/05 21:04:39 UTC
svn commit: r1417615 - in
/maven/release/trunk/maven-release-manager/src/test:
java/org/apache/maven/shared/release/phase/
resources/projects/generate-release-poms/pom-with-finalname/
Author: rfscholte
Date: Wed Dec 5 20:04:38 2012
New Revision: 1417615
URL: http://svn.apache.org/viewvc?rev=1417615&view=rev
Log:
[MRELEASE-808] Add unittest for finalName
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/expected-release-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=1417615&r1=1417614&r2=1417615&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java Wed Dec 5 20:04:38 2012
@@ -125,6 +125,17 @@ public class GenerateReleasePomsPhaseTes
verifyNoMoreInteractions( scmProviderMock );
}
+ // MRELEASE-808
+ public void testFinalName() throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-finalname" );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
+ config.setGenerateReleasePoms( true );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.util.List)
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/expected-release-pom.xml?rev=1417615&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/expected-release-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/expected-release-pom.xml Wed Dec 5 20:04:38 2012
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ </scm>
+ <build>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>${project.basedir}/target</directory>
+ <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ </build>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>${remoterepo}</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <reporting>
+ <excludeDefaults>false</excludeDefaults>
+ <outputDirectory>target/site</outputDirectory>
+ </reporting>
+</project>
\ No newline at end of file
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml?rev=1417615&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml Wed Dec 5 20:04:38 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
+ </scm>
+
+ <build>
+ <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ </build>
+</project>
\ No newline at end of file