SCM-775: revert the change, so that I can release this plugin.

git-svn-id: https://svn.apache.org/repos/asf/maven/release/trunk@1708587 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 14, 2015 · b639619 · b639619
1 parent bef0df9
commit b639619
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 41 deletions.
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
@@ -235,7 +235,7 @@
           </execution>
         </executions>
         <configuration>
-          <version>2.5.3</version>
+          <version>2.5.1</version>
           <packageWithVersion>false</packageWithVersion>
           <useJava5>true</useJava5>
           <models>

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
@@ -238,11 +238,6 @@ public void write( ReleaseDescriptor config, File file )
 
         properties.setProperty( "pushChanges", Boolean.toString( config.isPushChanges() ) );
 
-        if ( config.getWorkItem() != null )
-        {
-            properties.setProperty( "workItem", config.getWorkItem() );
-        }
-
         // others boolean properties are not written to the properties file because the value from the caller is always
         // used
 

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
@@ -101,7 +101,6 @@ public static ReleaseDescriptor merge( ReleaseDescriptor mergeInto, ReleaseDescr
         mergeInto.setRemoteTagging( toBeMerged.isRemoteTagging() );
         mergeInto.setLocalCheckout( toBeMerged.isLocalCheckout() );
         mergeInto.setPushChanges( toBeMerged.isPushChanges() );
-        mergeInto.setWorkItem( toBeMerged.getWorkItem() );
         mergeInto.setWaitBeforeTagging( toBeMerged.getWaitBeforeTagging() );
 
         // If the user specifies versions, these should be override the existing versions
@@ -174,7 +173,6 @@ public static ReleaseDescriptor copyPropertiesToReleaseDescriptor( Properties pr
             remoteTaggingStr == null ? false : Boolean.valueOf( remoteTaggingStr ).booleanValue() );
         String pushChanges = properties.getProperty( "pushChanges" );
         releaseDescriptor.setPushChanges( pushChanges == null ? true : Boolean.valueOf( pushChanges ).booleanValue() );
-        String workItem = properties.getProperty( "workItem" );
 
         loadResolvedDependencies( properties, releaseDescriptor );
 

diff --git a/...e-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java b/...e-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
@@ -116,8 +116,6 @@ protected void performCheckins( ReleaseDescriptor releaseDescriptor, ReleaseEnvi
 
             repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
 
-            repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-
             provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
         }
         catch ( ScmRepositoryException e )

diff --git a/...n-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java b/...n-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
@@ -82,8 +82,6 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
 
             repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
 
-            repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-
             provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
 
         }

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
@@ -95,8 +95,6 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
 
             repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
 
-            repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-
             provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
         }
         catch ( ScmRepositoryException e )

diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -499,17 +499,6 @@
           </description>
         </field>
 
-        <field>
-          <name>workItem</name>
-          <version>2.5.3+</version>
-          <type>String</type>
-          <description>
-            Some SCMs may require a Work Item or a Task to allow the changes to be pushed or delivered.
-            This field allows you to specify that Work Item or Task. It is optional, and only relevant
-            if pushChanges is true.
-          </description>
-        </field>
-
         <!-- Announcement Information
 
         Announcement related info, this can be a second part of the process.
@@ -729,10 +718,6 @@
         {
             return false;
         }
-        if ( !safeEquals( workItem, that.workItem ) )
-        {
-            return false;
-        }
         if ( ( checkModificationExcludes == null || ( checkModificationExcludes != null && checkModificationExcludes.size() == 0) ) &&
             ( that.checkModificationExcludes == null || ( that.checkModificationExcludes != null && that.checkModificationExcludes.size() == 0) ) )
         {
@@ -957,7 +942,6 @@
         result = 29 * result + ( remoteTagging ? 1 : 0 );
         result = 29 * result + ( localCheckout ? 1 : 0 );
         result = 29 * result + ( pushChanges ? 1 : 0 );
-        result = 29 * result + ( workItem != null ? workItem.hashCode() : 0 );
         result = 29 * result + ( defaultDevelopmentVersion != null ? defaultDevelopmentVersion.hashCode() : 0 );
         result = 29 * result + ( scmRelativePathProjectDirectory != null ? scmRelativePathProjectDirectory.hashCode() : 0 );
         result = 29 * result + ( checkoutDirectory != null ? checkoutDirectory.hashCode() : 0 );

diff --git a/...release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java b/...release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
@@ -94,15 +94,6 @@ public abstract class AbstractScmReleaseMojo
     @Parameter( defaultValue = "true", property = "pushChanges" )
     private boolean pushChanges = true;
 
-    /**
-     * A workItem for SCMs like RTC, TFS etc, that may require additional
-     * information to perform a pushChange operation.
-     *
-     * @since 2.5.3
-     */
-    @Parameter( property = "workItem" )
-    private String workItem;
-
     /**
      * Add a new or overwrite the default implementation per provider. 
      * The key is the scm prefix and the value is the role hint of the
@@ -150,7 +141,6 @@ protected ReleaseDescriptor createReleaseDescriptor()
         descriptor.setScmCommentPrefix( scmCommentPrefix );
 
         descriptor.setPushChanges( pushChanges );
-        descriptor.setWorkItem( workItem );
 
         return descriptor;
     }

diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
   </contributors>
 
   <properties>
-    <scmVersion>1.9.5-SNAPSHOT</scmVersion>
+    <scmVersion>1.9.4</scmVersion>
     <mavenVersion>2.2.1</mavenVersion>
     <maven.site.path>maven-release-archives/maven-release-LATEST</maven.site.path>
   </properties>