[MRELEASE-1079] add edge case support: root pom inherits scm

apache · May 26, 2022 · 1c6f2c3 · 1c6f2c3
1 parent 1d5a846
commit 1c6f2c3
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -199,17 +199,18 @@ private void transform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
     {
         result.setStartTime( ( startTime >= 0 ) ? startTime : System.currentTimeMillis() );
 
+        boolean first = true;
         for ( MavenProject project : reactorProjects )
         {
             logInfo( result, "Transforming '" + project.getName() + "'..." );
 
-            transformProject( project, releaseDescriptor, releaseEnvironment, simulate, result );
+            transformProject( project, first, releaseDescriptor, releaseEnvironment, simulate, result );
+            first = false;
         }
     }
 
-    private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor,
-                                   ReleaseEnvironment releaseEnvironment, boolean simulate,
-                                   ReleaseResult result )
+    private void transformProject( MavenProject project, boolean first, ReleaseDescriptor releaseDescriptor,
+                                   ReleaseEnvironment releaseEnvironment, boolean simulate, ReleaseResult result )
             throws ReleaseExecutionException, ReleaseFailureException
     {
         File pomFile = ReleaseUtil.getStandardPom( project );
@@ -244,7 +245,7 @@ private void transformProject( MavenProject project, ReleaseDescriptor releaseDe
             }
         }
 
-        transformDocument( project, etl.getModel(), releaseDescriptor, scmRepository, result,
+        transformDocument( project, first, etl.getModel(), releaseDescriptor, scmRepository, result,
                 simulate );
 
         File outputFile;
@@ -261,9 +262,9 @@ private void transformProject( MavenProject project, ReleaseDescriptor releaseDe
 
     }
 
-    private void transformDocument( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
-                                    ScmRepository scmRepository, ReleaseResult result,
-                                    boolean simulate )
+    private void transformDocument( MavenProject project, boolean first, Model modelTarget,
+                                    ReleaseDescriptor releaseDescriptor, ScmRepository scmRepository,
+                                    ReleaseResult result, boolean simulate )
             throws ReleaseExecutionException, ReleaseFailureException
     {
         Model model = project.getModel();
@@ -356,7 +357,7 @@ private void transformDocument( MavenProject project, Model modelTarget, Release
             }
         }
 
-        transformScm( project, modelTarget, releaseDescriptor, projectId, scmRepository, result );
+        transformScm( project, first, modelTarget, releaseDescriptor, projectId, scmRepository, result );
 
         if ( properties != null )
         {
@@ -646,16 +647,17 @@ protected abstract String getOriginalVersion( ReleaseDescriptor releaseDescripto
      * <p>transformScm.</p>
      *
      * @param project           a {@link org.apache.maven.project.MavenProject} object
+     * @param first             is first project in reactor
      * @param modelTarget       a {@link org.apache.maven.model.Model} object
      * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object
      * @param projectId         a {@link java.lang.String} object
      * @param scmRepository     a {@link org.apache.maven.scm.repository.ScmRepository} object
      * @param result            a {@link org.apache.maven.shared.release.ReleaseResult} object
      * @throws org.apache.maven.shared.release.ReleaseExecutionException if any.
      */
-    protected abstract void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
-                                          String projectId, ScmRepository scmRepository,
-                                          ReleaseResult result )
+    protected abstract void transformScm( MavenProject project, boolean first, Model modelTarget,
+                                          ReleaseDescriptor releaseDescriptor, String projectId,
+                                          ScmRepository scmRepository, ReleaseResult result )
             throws ReleaseExecutionException;
 
     /**

diff --git a/...-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java b/...-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
@@ -59,8 +59,9 @@ protected final String getPomSuffix()
     }
 
     @Override
-    protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
-                                 String projectId, ScmRepository scmRepository, ReleaseResult result )
+    protected void transformScm( MavenProject project, boolean first, Model modelTarget,
+                                 ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
+                                 ReleaseResult result )
     {
         // We are only updating versions no mods to scm needed
     }

diff --git a/...anager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java b/...anager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
@@ -68,9 +68,10 @@ protected final String getPomSuffix()
     }
 
     @Override
-    protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
-                                 String projectId, ScmRepository scmRepository, ReleaseResult result )
-            throws ReleaseExecutionException
+    protected void transformScm( MavenProject project, boolean first, Model modelTarget,
+                                 ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
+                                 ReleaseResult result )
+        throws ReleaseExecutionException
     {
         // If SCM is null in original model, it is inherited, no mods needed
         if ( project.getScm() != null )

diff --git a/...r/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java b/...r/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
@@ -61,11 +61,12 @@ protected final String getPomSuffix()
     }
 
     @Override
-    protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
-                                 String projectId, ScmRepository scmRepository, ReleaseResult result )
+    protected void transformScm( MavenProject project, boolean first, Model modelTarget,
+                                 ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
+                                 ReleaseResult result )
     {
         // If SCM is null in original model, it is inherited, no mods needed
-        if ( project.getScm() != null )
+        if ( project.getOriginalModel().getScm() != null || ( first && project.getScm() != null ) )
         {
             Scm scmRoot = modelTarget.getScm();
             if ( scmRoot != null )

diff --git a/...nager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java b/...nager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
@@ -68,12 +68,13 @@ protected final String getPomSuffix()
     }
 
     @Override
-    protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
-                                 String projectId, ScmRepository scmRepository, ReleaseResult result )
+    protected void transformScm( MavenProject project, boolean first, Model modelTarget,
+                                 ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
+                                 ReleaseResult result )
             throws ReleaseExecutionException
     {
         // If SCM is null in original model, it is inherited, no mods needed
-        if ( project.getOriginalModel().getScm() != null )
+        if ( project.getOriginalModel().getScm() != null || ( first && project.getScm() != null ) )
         {
             Scm scmRoot = modelTarget.getScm();
             if ( scmRoot != null )

diff --git a/...r/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java b/...r/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -333,7 +333,7 @@ public void testRewriteInterpolatedVersionsDifferentVersion()
         }
     }
 
-    //@Test TODO fix
+    @Test
     public void testRewriteBasicPomWithInheritedScm()
         throws Exception
     {
@@ -449,7 +449,7 @@ protected ReleaseDescriptorBuilder createDescriptorFromProjects( List<MavenProje
         return builder;
     }
 
-    //@Test TODO fix
+    @Test
     public void testRewritePomWithExternallyReleasedParent()
         throws Exception
     {