[maven-release] 15/21: Move constants, only used by ReleaseUtils

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

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

commit 31b00bcd6702c28f85cbec497af356f259331b98
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Fri Feb 9 15:49:21 2018 +0100

    Move constants, only used by ReleaseUtils
---
 .../apache/maven/shared/release/config/ReleaseUtils.java   | 14 ++++++++++----
 maven-release-manager/src/main/mdo/release-descriptor.mdo  |  6 ------
 .../maven/shared/release/config/ReleaseUtilsTest.java      |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

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
index ee2295a..8b7322a 100644
--- 
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
@@ -35,6 +35,12 @@ import org.apache.maven.shared.release.scm.IdentifiedScm;
  */
 public class ReleaseUtils
 {
+    private static final String DEVELOPMENT_KEY = "dev";
+
+    private static final String RELEASE_KEY = "rel";
+
+    private static final String ORIGINAL_VERSION = "original";
+
     private ReleaseUtils()
     {
         // nothing to see here
@@ -326,12 +332,12 @@ public class ReleaseUtils
                 if ( propertyName.indexOf( ".development" ) != -1 )
                 {
                     endIndex = propertyName.lastIndexOf( ".development" );
-                    versionType = ReleaseDescriptor.DEVELOPMENT_KEY;
+                    versionType = DEVELOPMENT_KEY;
                 }
                 else if ( propertyName.indexOf( ".release" ) != -1 )
                 {
                     endIndex = propertyName.lastIndexOf( ".release" );
-                    versionType = ReleaseDescriptor.RELEASE_KEY;
+                    versionType = RELEASE_KEY;
                 }
                 else
                 {
@@ -351,11 +357,11 @@ public class ReleaseUtils
                     resolvedDependencies.put( artifactVersionlessKey, 
versionMap );
                 }
 
-                if ( ReleaseDescriptor.RELEASE_KEY.equals( versionType ) )
+                if ( RELEASE_KEY.equals( versionType ) )
                 {
                     versionMap.setRelease( currentEntry.getValue() );
                 }
-                else if ( ReleaseDescriptor.DEVELOPMENT_KEY.equals( 
versionType ) )
+                else if ( DEVELOPMENT_KEY.equals( versionType ) )
                 {
                     versionMap.setDevelopment( currentEntry.getValue() );
                 }
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo 
b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index 3060125..1b86f65 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -535,12 +535,6 @@
         <codeSegment>
           <version>2.1.0+</version>
           <code><![CDATA[
-    public static final String DEVELOPMENT_KEY = "dev";
-
-    public static final String RELEASE_KEY = "rel";
-
-    public static final String ORIGINAL_VERSION = "original";
-
     /**
      * Field resolvedSnapshotDependencies.
      */
diff --git 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
index 454f126..746a9f2 100644
--- 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
+++ 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
@@ -76,12 +76,12 @@ public class ReleaseUtilsTest
         File workingDirectory = new File( "." );
 
         ReleaseDescriptor mergeDescriptor =
-            createMergeDescriptor( AbstractReleaseTestCase.getPath( 
workingDirectory ), "completed-phase-merge" );
+            createMergeDescriptor( AbstractReleaseTestCase.getPath( 
workingDirectory ), "completed-phase-merge" ).build();
 
         ReleaseDescriptor releaseDescriptor = ReleaseUtils.merge( 
createReleaseDescriptor(), mergeDescriptor ).build();
 
         ReleaseDescriptor expected =
-            createMergeDescriptor( releaseDescriptor.getWorkingDirectory(), 
releaseDescriptor.getCompletedPhase() );
+            createMergeDescriptor( releaseDescriptor.getWorkingDirectory(), 
releaseDescriptor.getCompletedPhase() ).build();
         assertEquals( "Check merge", expected, releaseDescriptor );
     }
 
@@ -311,9 +311,9 @@ public class ReleaseUtilsTest
         return scm;
     }
 
-    private static ReleaseDescriptor createMergeDescriptor( String 
workingDirectory, String completedPhase )
+    private static ReleaseDescriptorBuilder createMergeDescriptor( String 
workingDirectory, String completedPhase )
     {
-        ReleaseDescriptor mergeDescriptor = new 
ReleaseDescriptorBuilder().build();
+        ReleaseDescriptorBuilder mergeDescriptor = new 
ReleaseDescriptorBuilder();
         mergeDescriptor.setScmSourceUrl( "scm-url-merge" );
         mergeDescriptor.setCompletedPhase( completedPhase );
         mergeDescriptor.setScmPrivateKeyPassPhrase( "passphrase-merge" );

-- 
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.