[MRELEASE-1088] Remove parsing of CLI arguments

apache · May 6, 2022 · 26cd6f6 · 26cd6f6
1 parent dafdd7f
commit 26cd6f6
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 492 deletions.
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
@@ -113,17 +113,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.12.0</version>
     </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
     <dependency>
       <groupId>org.eclipse.aether</groupId>

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
@@ -20,9 +20,13 @@
  */
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.maven.model.Scm;
 import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>ReleaseDescriptorBuilder class.</p>
@@ -32,6 +36,10 @@
  */
 public class ReleaseDescriptorBuilder
 {
+    private static final Pattern PROPERTY_PATTERN = Pattern.compile( "\\$\\{[^}]+}" );
+
+    private final Logger logger;
+
     /**
      * Hides inner logic of the release descriptor
      *
@@ -50,9 +58,18 @@ private BuilderReleaseDescriptor()
      * <p>Constructor for ReleaseDescriptorBuilder.</p>
      */
     public ReleaseDescriptorBuilder()
+    {
+        this( LoggerFactory.getLogger( ReleaseDescriptorBuilder.class ) );
+    }
+
+    /**
+     * Constructor for testing purpose.
+     */
+    ReleaseDescriptorBuilder( Logger logger )
     {
         this.releaseDescriptor = new BuilderReleaseDescriptor();
         this.releaseDescriptor.setLineSeparator( ReleaseUtil.LS );
+        this.logger = logger;
     }
 
     /**
@@ -99,7 +116,24 @@ public ReleaseDescriptorBuilder setAddSchema( boolean addSchema )
      */
     public ReleaseDescriptorBuilder setAdditionalArguments( String additionalArguments )
     {
-        releaseDescriptor.setAdditionalArguments( additionalArguments );
+        if ( additionalArguments != null )
+        {
+            Matcher matcher = PROPERTY_PATTERN.matcher( additionalArguments );
+            StringBuffer buf = new StringBuffer();
+            while ( matcher.find() )
+            {
+                matcher.appendReplacement( buf, "" );
+                logger.warn( "arguments parameter contains unresolved property: '{}'",
+                             matcher.group() );
+            }
+            matcher.appendTail( buf );
+
+            releaseDescriptor.setAdditionalArguments( buf.toString() );
+        }
+        else
+        {
+            releaseDescriptor.setAdditionalArguments( null );
+        }
         return this;
     }