maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject [maven-release] branch master updated: Unittests expect expression for finalName, ITs expect explicit value. Let's make it explicit for both
Date Sat, 06 Jan 2018 20:26:34 GMT
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d3f020  Unittests expect expression for finalName, ITs expect explicit value. Let's make it explicit for both
2d3f020 is described below

commit 2d3f020ff659e56d421d4aa8c6567ab6304b18c0
Author: rfscholte <rfscholte@apache.org>
AuthorDate: Sat Jan 6 21:26:08 2018 +0100

    Unittests expect expression for finalName, ITs expect explicit value. Let's make it explicit for both
---
 .../release/phase/GenerateReleasePomsPhase.java    | 29 ++++++++++++----------
 .../basic-pom-entities/expected-release-pom.xml    |  2 +-
 .../basic-pom-namespace/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../basic-pom/expected-release-pom-with-schema.xml |  2 +-
 .../basic-pom/expected-release-pom.xml             |  2 +-
 .../cdata-around-values/expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../subproject3/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../subproject3/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../subproject3/expected-release-pom.xml           |  2 +-
 .../subproject4/expected-release-pom.xml           |  2 +-
 .../subsubproject/expected-release-pom.xml         |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../subproject3/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../subproject3/expected-release-pom.xml           |  2 +-
 .../subproject4/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../subproject3/expected-release-pom.xml           |  2 +-
 .../subproject4/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../expected-release-pom-version-changed.xml       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../pom-with-namespace/expected-release-pom.xml    |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 .../pom-with-parent/expected-release-pom.xml       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../expected-release-pom.xml                       |  2 +-
 .../subproject1/expected-release-pom.xml           |  2 +-
 .../subproject2/expected-release-pom.xml           |  2 +-
 66 files changed, 81 insertions(+), 78 deletions(-)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index a9cd688..969ccb9 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -234,27 +234,30 @@ public class GenerateReleasePomsPhase
             getNextVersion( mappedVersions, project.getGroupId(), project.getArtifactId(), projectVersion );
         releaseModel.setVersion( releaseVersion );
 
+        String originalFinalName = releaseModel.getBuild().getFinalName();
         // update final name if implicit
-        if ( !FINALNAME_EXPRESSION.equals( releaseModel.getBuild().getFinalName() ) )
+        if ( !FINALNAME_EXPRESSION.equals( originalFinalName ) )
         {
-            String originalFinalName = findOriginalFinalName( project );
+            originalFinalName = findOriginalFinalName( project );
             
             if ( originalFinalName == null )
             {
                 // as defined in super-pom
                 originalFinalName = FINALNAME_EXPRESSION;
             }
-            String finalName = ReleaseUtil.interpolate( originalFinalName, releaseModel );
-            
-            // still required?
-            if ( finalName.indexOf( Artifact.SNAPSHOT_VERSION ) != -1 )
-            {
-                throw new ReleaseFailureException( "Cannot reliably adjust the finalName of project: "
-                                + releaseProject.getId() );
-            }
-            
-            releaseModel.getBuild().setFinalName( finalName );
-        }        
+        }
+
+        // make finalName always explicit
+        String finalName = ReleaseUtil.interpolate( originalFinalName, releaseModel );
+        
+        // still required?
+        if ( finalName.indexOf( Artifact.SNAPSHOT_VERSION ) != -1 )
+        {
+            throw new ReleaseFailureException( "Cannot reliably adjust the finalName of project: "
+                            + releaseProject.getId() );
+        }
+        releaseModel.getBuild().setFinalName( finalName );
+        
 
         // update scm
         Scm scm = releaseModel.getScm();
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-entities/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-entities/expected-release-pom.xml
index 4c0501d..1114960 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-entities/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-entities/expected-release-pom.xml
@@ -41,7 +41,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-namespace/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-namespace/expected-release-pom.xml
index a2d7057..1d791b1 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-namespace/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-namespace/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/expected-release-pom.xml
index 31d13ee..b543722 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom-with-schema.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom-with-schema.xml
index 31d13ee..b543722 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom-with-schema.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom-with-schema.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml
index 31d13ee..b543722 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
index f4a0fca..b0319f3 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
@@ -48,7 +48,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
index ce6b2dd..7071499 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-2.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
index 696b7b2..f1adc3b 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/expected-release-pom.xml
index 0da4f41..1644780 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/expected-release-pom.xml
@@ -48,7 +48,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/subproject1/expected-release-pom.xml
index ce6b2dd..7071499 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/comments-around-values/subproject1/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-2.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
index 23b8906..ab9988a 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/expected-release-pom.xml
index 8568c1f..f321792 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject1/expected-release-pom.xml
index 53ef61e..d3b0052 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject2/expected-release-pom.xml
index 788a59f..becb46e 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-dependencies/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/expected-release-pom.xml
index 8568c1f..f321792 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject1/expected-release-pom.xml
index 3e7371d..fbb3bdb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject2/expected-release-pom.xml
index 8d9aa75..986fedc 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-extension/subproject2/expected-release-pom.xml
@@ -49,7 +49,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/expected-release-pom.xml
index 8568c1f..f321792 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject1/expected-release-pom.xml
index 3e7371d..fbb3bdb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject2/expected-release-pom.xml
index 2d9dfb2..af490da 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-plugins/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/expected-release-pom.xml
index 8568c1f..f321792 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject1/expected-release-pom.xml
index 3e7371d..fbb3bdb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject2/expected-release-pom.xml
index cf3b7f9..a05fe84 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-differing-snapshot-report-plugins/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/expected-release-pom.xml
index 2fc7e4d..2a41f87 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject1/expected-release-pom.xml
index 3e7371d..fbb3bdb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject2/expected-release-pom.xml
index 955218c..1d67dfb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject3/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject3/expected-release-pom.xml
index 0d7baaf..894ca1a 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject3/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-dependency/subproject3/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject3-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/expected-release-pom.xml
index 2fc7e4d..2a41f87 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject1/expected-release-pom.xml
index 3e7371d..fbb3bdb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject2/expected-release-pom.xml
index 5f35b25..8e20c64 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject3/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject3/expected-release-pom.xml
index b45277c..b98fd94 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject3/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-managed-snapshot-plugin/subproject3/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject3-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/expected-release-pom.xml
index a639f7a..f355141 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
index d87c515..de8b4a4 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject2/expected-release-pom.xml
index 040ece3..740a09b 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject3/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject3/expected-release-pom.xml
index 5170d4b..2d71364 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject3/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject3/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject3-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
index eafbea2..fb03b98 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject4-1.0</finalName>
   </build>
   <modules>
     <module>subsubproject</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
index 58b141d..6d554be 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subsubproject-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/expected-release-pom.xml
index 2fc7e4d..2a41f87 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
index d87c515..de8b4a4 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject2/expected-release-pom.xml
index 065333a..021806e 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject2/expected-release-pom.xml
@@ -49,7 +49,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>  
+    <finalName>subproject2-1.0</finalName>  
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject3/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject3/expected-release-pom.xml
index e48fff3..aef671c 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject3/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject3/expected-release-pom.xml
@@ -54,7 +54,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject3-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/expected-release-pom.xml
index a639f7a..f355141 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject1/expected-release-pom.xml
index 224fc06..4f6aaf5 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>external</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject2/expected-release-pom.xml
index 5f35b25..8e20c64 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject3/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject3/expected-release-pom.xml
index 7e847b0..f9cd16f 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject3/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject3/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject3-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject4/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject4/expected-release-pom.xml
index be19d38..b3741d1 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject4/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-plugins/subproject4/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject4-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/expected-release-pom.xml
index a639f7a..f355141 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject1/expected-release-pom.xml
index e448ff2..ea24e0d 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject2/expected-release-pom.xml
index 6e22244..7e859a1 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject3/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject3/expected-release-pom.xml
index 7cb65a0..ef406f3 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject3/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject3/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject3-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject4/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject4/expected-release-pom.xml
index 911d80d..786e56b 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject4/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-report-plugins/subproject4/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject4-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/expected-release-pom.xml
index f253324..1cdfa5f 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom-version-changed.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom-version-changed.xml
index 0715cb7..6ac2b76 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom-version-changed.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom-version-changed.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-2.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom.xml
index 3e7371d..fbb3bdb 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-inherited-version/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/expected-release-pom.xml
index 8568c1f..f321792 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
index d87c515..de8b4a4 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject2/expected-release-pom.xml
index 040ece3..740a09b 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject2/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/expected-release-pom.xml
index 0da4f41..1644780 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/expected-release-pom.xml
@@ -48,7 +48,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/subproject1/expected-release-pom.xml
index ce6b2dd..7071499 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-parent/subproject1/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-2.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/expected-release-pom.xml
index 62dce42..9e59c42 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/expected-release-pom.xml
@@ -43,7 +43,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml
index 0715cb7..6ac2b76 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-released-parent/subproject1/expected-release-pom.xml
@@ -42,7 +42,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-2.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml
index 59ae399..ed4b4c1 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-without-extension-version/expected-release-pom.xml
@@ -49,7 +49,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml
index f4a0fca..b0319f3 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/expected-release-pom.xml
@@ -48,7 +48,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>artifactId-1.0</finalName>
   </build>
   <modules>
     <module>subproject1</module>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml
index ce6b2dd..7071499 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject1/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject1-2.0</finalName>
   </build>
   <repositories>
     <repository>
diff --git a/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml
index 696b7b2..f1adc3b 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-values/subproject2/expected-release-pom.xml
@@ -47,7 +47,7 @@ under the License.
       </testResource>
     </testResources>
     <directory>${project.basedir}/target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
+    <finalName>subproject2-1.0</finalName>
     <plugins>
       <plugin>
         <groupId>groupId</groupId>

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <commits@maven.apache.org>'].

Mime
View raw message