[MRELEASE-1078] Support version policy to read and use SCM tags and c…

…ommits This closes #104
apache · Mar 12, 2023 · b899ace · b899ace
1 parent bf06ef2
commit b899ace
Show file tree

Hide file tree

Showing 26 changed files with 792 additions and 101 deletions.
diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
@@ -52,6 +52,10 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-api</artifactId>

diff --git a/...n-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/...n-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -426,6 +426,13 @@ public interface ReleaseDescriptor
      */
     String getProjectVersionPolicyId();
 
+    /**
+     * Get the (optional) config for the VersionPolicy implementation used to calculate the project versions.
+     *
+     * @return The parsed XML of the provided config (an instance of XmlPlexusConfiguration) or null.
+     */
+    Object getProjectVersionPolicyConfig();
+
     /**
      * Get the role-hint for the release Strategy implementation.
      *

diff --git a/...pi/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java b/...pi/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java
@@ -20,6 +20,8 @@
  */
 
 import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.repository.ScmRepository;
 
 /**
  * <p>VersionPolicyRequest class.</p>
@@ -33,6 +35,12 @@ public class VersionPolicyRequest
 
     private Metadata metaData;
 
+    private ScmRepository scmRepository;
+    private ScmProvider scmProvider;
+    private String workingDirectory;
+
+    private String config;
+
     /**
      * <p>Getter for the field <code>version</code>.</p>
      *
@@ -76,5 +84,93 @@ public VersionPolicyRequest setMetaData( Metadata metaData )
         this.metaData = metaData;
         return this;
     }
-
+
+    /**
+     * <p>Getter for the field <code>scmRepository</code>.</p>
+     *
+     * @return a {@link ScmRepository} object
+     */
+    public ScmRepository getScmRepository()
+    {
+        return scmRepository;
+    }
+
+    /**
+     * <p>Setter for the field <code>scmRepository</code>.</p>
+     *
+     * @param scmRepository The {@link ScmRepository} where the history can be retrieved.
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setScmRepository( ScmRepository scmRepository )
+    {
+        this.scmRepository = scmRepository;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>scmProvider</code>.</p>
+     *
+     * @return a {@link ScmProvider} object
+     */
+    public ScmProvider getScmProvider()
+    {
+        return scmProvider;
+    }
+
+    /**
+     * <p>Setter for the field <code>scmProvider</code>.</p>
+     *
+     * @param scmProvider The {@link ScmProvider} where the history can be retrieved.
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setScmProvider( ScmProvider scmProvider )
+    {
+        this.scmProvider = scmProvider;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>workingDirectory</code>.</p>
+     *
+     * @return the {@link String} that contains the workingDirectory (can be null or empty).
+     */
+    public String getWorkingDirectory()
+    {
+        return workingDirectory;
+    }
+
+    /**
+     * <p>Setter for the field <code>workingDirectory</code>.</p>
+     *
+     * @param workingDirectory The {@link String} that contains the workingDirectory (can be null or empty).
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setWorkingDirectory( String workingDirectory )
+    {
+        this.workingDirectory = workingDirectory;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>config</code>.</p>
+     *
+     * @return the {@link String} that contains the config (can be null or empty).
+     */
+    public String getConfig()
+    {
+        return config;
+    }
+
+    /**
+     * <p>Setter for the field <code>config</code>.</p>
+     *
+     * @param config The {@link String} that contains the config (can be null or empty).
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setConfig( String config )
+    {
+        this.config = config;
+        return this;
+    }
+
 }
diff --git a/...ase-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java b/...ase-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java
@@ -34,4 +34,14 @@ public VersionParseException( String message )
     {
         super( message );
     }
+
+    /**
+     * <p>Constructor for VersionParseException.</p>
+     *
+     * @param message a {@link java.lang.String} object
+     */
+    public VersionParseException( String message, Throwable e )
+    {
+        super( message, e );
+    }
 }
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
@@ -191,7 +191,6 @@
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
-      <scope>test</scope>
     </dependency>
 
     <dependency>

diff --git a/...rc/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/...rc/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -269,6 +269,10 @@ public void write( BuilderReleaseDescriptor config, File file )
         {
             properties.setProperty( "projectVersionPolicyId", config.getProjectVersionPolicyId() );
         }
+        if ( config.getProjectVersionPolicyConfig() != null )
+        {
+            properties.setProperty( "projectVersionPolicyConfig", config.getProjectVersionPolicyConfig().toString() );
+        }
         if ( config.getProjectNamingPolicyId() != null )
         {
             properties.setProperty( "projectNamingPolicyId", config.getProjectNamingPolicyId() );

diff --git a/...anager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java b/...anager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -401,6 +401,18 @@ public ReleaseDescriptorBuilder setProjectVersionPolicyId( String projectVersion
         return this;
     }
 
+    /**
+     * <p>setProjectVersionPolicyConfig.</p>
+     *
+     * @param setProjectVersionPolicyConfig a {@link java.lang.String} object
+     * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
+     */
+    public ReleaseDescriptorBuilder setProjectVersionPolicyConfig( String setProjectVersionPolicyConfig )
+    {
+        releaseDescriptor.setProjectVersionPolicyConfig( setProjectVersionPolicyConfig );
+        return this;
+    }
+
     /**
      * <p>setPushChanges.</p>
      *

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
@@ -156,6 +156,10 @@ public static void copyPropertiesToReleaseDescriptor( Properties properties, Rel
         {
             builder.setProjectVersionPolicyId( properties.getProperty( "projectVersionPolicyId" ) );
         }
+        if ( properties.containsKey( "projectVersionPolicyConfig" ) )
+        {
+            builder.setProjectVersionPolicyConfig( properties.getProperty( "projectVersionPolicyConfig" ) );
+        }
         if ( properties.containsKey( "projectNamingPolicyId" ) )
         {
             builder.setProjectNamingPolicyId( properties.getProperty( "projectNamingPolicyId" ) );

diff --git a/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java b/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
@@ -24,18 +24,24 @@
 
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.apache.maven.shared.release.policy.PolicyException;
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
 import org.apache.maven.shared.release.policy.version.VersionPolicyRequest;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.apache.maven.shared.release.util.ReleaseUtil;
 import org.apache.maven.shared.release.versions.VersionParseException;
 import org.codehaus.plexus.components.interactivity.Prompter;
 import org.codehaus.plexus.components.interactivity.PrompterException;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
 
 import static java.util.Objects.requireNonNull;
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -70,6 +76,11 @@
 public abstract class AbstractMapVersionsPhase
         extends AbstractReleasePhase
 {
+    /**
+     * Tool that gets a configured SCM repository from release configuration.
+     */
+    private final ScmRepositoryConfigurator scmRepositoryConfigurator;
+
     /**
      * Component used to prompt for input.
      */
@@ -90,9 +101,11 @@ public abstract class AbstractMapVersionsPhase
      */
     private final boolean convertToBranch;
 
-    public AbstractMapVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies,
+    public AbstractMapVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                     Prompter prompter, Map<String, VersionPolicy> versionPolicies,
                                      boolean convertToSnapshot, boolean convertToBranch )
     {
+        this.scmRepositoryConfigurator = requireNonNull( scmRepositoryConfigurator );
         this.prompter = requireNonNull( prompter );
         this.versionPolicies = requireNonNull( versionPolicies );
         this.convertToSnapshot = convertToSnapshot;
@@ -116,7 +129,7 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
 
             String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
 
-            String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor );
+            String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor, releaseEnvironment );
 
             if ( !convertToSnapshot )
             {
@@ -182,7 +195,7 @@ else if ( ArtifactUtils.isSnapshot( subProject.getVersion() ) )
             {
                 String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
 
-                String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor );
+                String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor, releaseEnvironment );
 
                 if ( !convertToSnapshot )
                 {
@@ -206,7 +219,8 @@ else if ( releaseDescriptor.isBranchCreation() && convertToBranch )
 
     private String resolveNextVersion( MavenProject project,
                                        String projectId,
-                                       ReleaseDescriptor releaseDescriptor )
+                                       ReleaseDescriptor releaseDescriptor,
+                                       ReleaseEnvironment releaseEnvironment )
             throws ReleaseExecutionException
     {
         String defaultVersion;
@@ -275,14 +289,15 @@ else if ( releaseDescriptor.isBranchCreation() )
                         {
                             suggestedVersion =
                                     resolveSuggestedVersion( baseVersion,
-                                            releaseDescriptor.getProjectVersionPolicyId() );
+                                            releaseDescriptor,
+                                            releaseEnvironment );
                         }
                         catch ( VersionParseException e )
                         {
                             if ( releaseDescriptor.isInteractive() )
                             {
                                 suggestedVersion =
-                                        resolveSuggestedVersion( "1.0", releaseDescriptor.getProjectVersionPolicyId() );
+                                        resolveSuggestedVersion( "1.0", releaseDescriptor, releaseEnvironment );
                             }
                             else
                             {
@@ -347,16 +362,55 @@ private String getContextString( ReleaseDescriptor releaseDescriptor )
         return "new development";
     }
 
-    private String resolveSuggestedVersion( String baseVersion, String policyId )
+    private String resolveSuggestedVersion( String baseVersion,
+                                            ReleaseDescriptor releaseDescriptor,
+                                            ReleaseEnvironment releaseEnvironment )
             throws PolicyException, VersionParseException
     {
+        String policyId = releaseDescriptor.getProjectVersionPolicyId();
         VersionPolicy policy = versionPolicies.get( policyId );
         if ( policy == null )
         {
             throw new PolicyException( "Policy '" + policyId + "' is unknown, available: " + versionPolicies.keySet() );
         }
 
         VersionPolicyRequest request = new VersionPolicyRequest().setVersion( baseVersion );
+
+        if ( releaseDescriptor.getProjectVersionPolicyConfig() != null )
+        {
+            request.setConfig( releaseDescriptor.getProjectVersionPolicyConfig().toString() );
+        }
+        request.setWorkingDirectory( releaseDescriptor.getWorkingDirectory() );
+
+        if ( scmRepositoryConfigurator != null && releaseDescriptor.getScmSourceUrl() != null )
+        {
+            try
+            {
+                ScmRepository repository = scmRepositoryConfigurator
+                        .getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+
+                ScmProvider provider = scmRepositoryConfigurator
+                        .getRepositoryProvider( repository );
+
+                request.setScmRepository( repository );
+                request.setScmProvider( provider );
+            }
+            catch ( ScmRepositoryException | NoSuchScmProviderException e )
+            {
+                Logger logger = getLogger();
+                if ( logger.isWarnEnabled() )
+                {
+                    logger.warn( "Next Version will NOT be based on the version control: {}", e.getMessage() );
+                }
+                else
+                {
+                    if ( logger.isDebugEnabled() )
+                    {
+                        logger.warn( "Next Version will NOT be based on the version control", e );
+                    }
+                }
+            }
+        }
         return convertToSnapshot ? policy.getDevelopmentVersion( request ).getVersion()
                 : policy.getReleaseVersion( request ).getVersion();
     }

diff --git a/...e-manager/src/main/java/org/apache/maven/shared/release/phase/MapBranchVersionsPhase.java b/...e-manager/src/main/java/org/apache/maven/shared/release/phase/MapBranchVersionsPhase.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.codehaus.plexus.components.interactivity.Prompter;
 
 /**
@@ -61,8 +62,9 @@ public class MapBranchVersionsPhase
         extends AbstractMapVersionsPhase
 {
     @Inject
-    public MapBranchVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies )
+    public MapBranchVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                   Prompter prompter, Map<String, VersionPolicy> versionPolicies )
     {
-        super( prompter, versionPolicies, true, true );
+        super( scmRepositoryConfigurator, prompter, versionPolicies, true, true );
     }
 }
diff --git a/...ager/src/main/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionsPhase.java b/...ager/src/main/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionsPhase.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.codehaus.plexus.components.interactivity.Prompter;
 
 /**
@@ -61,8 +62,9 @@ public class MapDevelopmentVersionsPhase
         extends AbstractMapVersionsPhase
 {
     @Inject
-    public MapDevelopmentVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies )
+    public MapDevelopmentVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                        Prompter prompter, Map<String, VersionPolicy> versionPolicies )
     {
-        super( prompter, versionPolicies, true, false );
+        super( scmRepositoryConfigurator, prompter, versionPolicies, true, false );
     }
 }