You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2015/10/14 13:52:53 UTC
svn commit: r1708587 - in /maven/release/trunk: ./ maven-release-manager/
maven-release-manager/src/main/java/org/apache/maven/shared/release/config/
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
maven-release-manager/src/m...
Author: bimargulies
Date: Wed Oct 14 11:52:53 2015
New Revision: 1708587
URL: http://svn.apache.org/viewvc?rev=1708587&view=rev
Log:
SCM-775: revert the change, so that I can release this plugin.
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
maven/release/trunk/pom.xml
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:52:53 2015
@@ -235,7 +235,7 @@
</execution>
</executions>
<configuration>
- <version>2.5.3</version>
+ <version>2.5.1</version>
<packageWithVersion>false</packageWithVersion>
<useJava5>true</useJava5>
<models>
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java Wed Oct 14 11:52:53 2015
@@ -238,11 +238,6 @@ public class PropertiesReleaseDescriptor
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
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java Wed Oct 14 11:52:53 2015
@@ -101,7 +101,6 @@ public class ReleaseUtils
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 class ReleaseUtils
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 );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java Wed Oct 14 11:52:53 2015
@@ -116,8 +116,6 @@ public abstract class AbstractScmCommitP
repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
- repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
catch ( ScmRepositoryException e )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java Wed Oct 14 11:52:53 2015
@@ -82,8 +82,6 @@ public class ScmBranchPhase
repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
- repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java Wed Oct 14 11:52:53 2015
@@ -95,8 +95,6 @@ public class ScmTagPhase
repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
- repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
catch ( ScmRepositoryException e )
Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo (original)
+++ maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Wed Oct 14 11:52:53 2015
@@ -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 );
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java Wed Oct 14 11:52:53 2015
@@ -95,15 +95,6 @@ public abstract class AbstractScmRelease
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
* {@link org.apache.maven.scm.provider.ScmProvider}.
@@ -150,7 +141,6 @@ public abstract class AbstractScmRelease
descriptor.setScmCommentPrefix( scmCommentPrefix );
descriptor.setPushChanges( pushChanges );
- descriptor.setWorkItem( workItem );
return descriptor;
}
Modified: maven/release/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
==============================================================================
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Wed Oct 14 11:52:53 2015
@@ -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>
Re: svn commit: r1708587 - in /maven/release/trunk: ./
maven-release-manager/ maven-release-manager/src/main/java/org/apache/maven/shared/release/config/
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/m...
Posted by Benson Margulies <bi...@gmail.com>.
On Wed, Oct 14, 2015 at 6:41 PM, Olivier Lamy <ol...@apache.org> wrote:
> did you create a branch with this change?
> At least to help the guys who worked on that...
Since it was a single commit, I didn't think it necessary. I could
either reapply it to trunk or make a branch; to some extent I'm
waiting to hear from them.
In fact, my first thought was to release SCM and then apply it with
the -SNAPSHOT removed, but SCM seems clogged by incomplete jiras.
>
> On 14 October 2015 at 22:52, <bi...@apache.org> wrote:
>>
>> Author: bimargulies
>> Date: Wed Oct 14 11:52:53 2015
>> New Revision: 1708587
>>
>> URL: http://svn.apache.org/viewvc?rev=1708587&view=rev
>> Log:
>> SCM-775: revert the change, so that I can release this plugin.
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/pom.xml
>>
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
>>
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>>
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
>>
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
>>
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
>>
>> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
>>
>> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
>> maven/release/trunk/pom.xml
>>
>> Modified: maven/release/trunk/maven-release-manager/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> --- maven/release/trunk/maven-release-manager/pom.xml (original)
>> +++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:52:53
>> 2015
>> @@ -235,7 +235,7 @@
>> </execution>
>> </executions>
>> <configuration>
>> - <version>2.5.3</version>
>> + <version>2.5.1</version>
>> <packageWithVersion>false</packageWithVersion>
>> <useJava5>true</useJava5>
>> <models>
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
>> (original)
>> +++
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
>> Wed Oct 14 11:52:53 2015
>> @@ -238,11 +238,6 @@ public class PropertiesReleaseDescriptor
>>
>> 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
>>
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>> (original)
>> +++
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>> Wed Oct 14 11:52:53 2015
>> @@ -101,7 +101,6 @@ public class ReleaseUtils
>> 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 class ReleaseUtils
>> 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 );
>>
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
>> (original)
>> +++
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
>> Wed Oct 14 11:52:53 2015
>> @@ -116,8 +116,6 @@ public abstract class AbstractScmCommitP
>>
>> repository.getProviderRepository().setPushChanges(
>> releaseDescriptor.isPushChanges() );
>>
>> - repository.getProviderRepository().setWorkItem(
>> releaseDescriptor.getWorkItem() );
>> -
>> provider = scmRepositoryConfigurator.getRepositoryProvider(
>> repository );
>> }
>> catch ( ScmRepositoryException e )
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
>> (original)
>> +++
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
>> Wed Oct 14 11:52:53 2015
>> @@ -82,8 +82,6 @@ public class ScmBranchPhase
>>
>> repository.getProviderRepository().setPushChanges(
>> releaseDescriptor.isPushChanges() );
>>
>> - repository.getProviderRepository().setWorkItem(
>> releaseDescriptor.getWorkItem() );
>> -
>> provider = scmRepositoryConfigurator.getRepositoryProvider(
>> repository );
>>
>> }
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
>> (original)
>> +++
>> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
>> Wed Oct 14 11:52:53 2015
>> @@ -95,8 +95,6 @@ public class ScmTagPhase
>>
>> repository.getProviderRepository().setPushChanges(
>> releaseDescriptor.isPushChanges() );
>>
>> - repository.getProviderRepository().setWorkItem(
>> releaseDescriptor.getWorkItem() );
>> -
>> provider = scmRepositoryConfigurator.getRepositoryProvider(
>> repository );
>> }
>> catch ( ScmRepositoryException e )
>>
>> Modified:
>> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
>> (original)
>> +++
>> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
>> Wed Oct 14 11:52:53 2015
>> @@ -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 );
>>
>> Modified:
>> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> ---
>> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
>> (original)
>> +++
>> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
>> Wed Oct 14 11:52:53 2015
>> @@ -95,15 +95,6 @@ public abstract class AbstractScmRelease
>> 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
>> * {@link org.apache.maven.scm.provider.ScmProvider}.
>> @@ -150,7 +141,6 @@ public abstract class AbstractScmRelease
>> descriptor.setScmCommentPrefix( scmCommentPrefix );
>>
>> descriptor.setPushChanges( pushChanges );
>> - descriptor.setWorkItem( workItem );
>>
>> return descriptor;
>> }
>>
>> Modified: maven/release/trunk/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
>>
>> ==============================================================================
>> --- maven/release/trunk/pom.xml (original)
>> +++ maven/release/trunk/pom.xml Wed Oct 14 11:52:53 2015
>> @@ -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>
>>
>>
>
>
>
> --
> Olivier Lamy
> http://twitter.com/olamy | http://linkedin.com/in/olamy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1708587 - in /maven/release/trunk: ./
maven-release-manager/ maven-release-manager/src/main/java/org/apache/maven/shared/release/config/
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/m...
Posted by Olivier Lamy <ol...@apache.org>.
did you create a branch with this change?
At least to help the guys who worked on that...
On 14 October 2015 at 22:52, <bi...@apache.org> wrote:
> Author: bimargulies
> Date: Wed Oct 14 11:52:53 2015
> New Revision: 1708587
>
> URL: http://svn.apache.org/viewvc?rev=1708587&view=rev
> Log:
> SCM-775: revert the change, so that I can release this plugin.
>
> Modified:
> maven/release/trunk/maven-release-manager/pom.xml
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
>
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
>
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> maven/release/trunk/pom.xml
>
> Modified: maven/release/trunk/maven-release-manager/pom.xml
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> --- maven/release/trunk/maven-release-manager/pom.xml (original)
> +++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:52:53
> 2015
> @@ -235,7 +235,7 @@
> </execution>
> </executions>
> <configuration>
> - <version>2.5.3</version>
> + <version>2.5.1</version>
> <packageWithVersion>false</packageWithVersion>
> <useJava5>true</useJava5>
> <models>
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
> Wed Oct 14 11:52:53 2015
> @@ -238,11 +238,6 @@ public class PropertiesReleaseDescriptor
>
> 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
>
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> Wed Oct 14 11:52:53 2015
> @@ -101,7 +101,6 @@ public class ReleaseUtils
> 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 class ReleaseUtils
> 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 );
>
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
> Wed Oct 14 11:52:53 2015
> @@ -116,8 +116,6 @@ public abstract class AbstractScmCommitP
>
> repository.getProviderRepository().setPushChanges(
> releaseDescriptor.isPushChanges() );
>
> - repository.getProviderRepository().setWorkItem(
> releaseDescriptor.getWorkItem() );
> -
> provider = scmRepositoryConfigurator.getRepositoryProvider(
> repository );
> }
> catch ( ScmRepositoryException e )
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
> Wed Oct 14 11:52:53 2015
> @@ -82,8 +82,6 @@ public class ScmBranchPhase
>
> repository.getProviderRepository().setPushChanges(
> releaseDescriptor.isPushChanges() );
>
> - repository.getProviderRepository().setWorkItem(
> releaseDescriptor.getWorkItem() );
> -
> provider = scmRepositoryConfigurator.getRepositoryProvider(
> repository );
>
> }
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
> Wed Oct 14 11:52:53 2015
> @@ -95,8 +95,6 @@ public class ScmTagPhase
>
> repository.getProviderRepository().setPushChanges(
> releaseDescriptor.isPushChanges() );
>
> - repository.getProviderRepository().setWorkItem(
> releaseDescriptor.getWorkItem() );
> -
> provider = scmRepositoryConfigurator.getRepositoryProvider(
> repository );
> }
> catch ( ScmRepositoryException e )
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
> Wed Oct 14 11:52:53 2015
> @@ -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 );
>
> Modified:
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> (original)
> +++
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> Wed Oct 14 11:52:53 2015
> @@ -95,15 +95,6 @@ public abstract class AbstractScmRelease
> 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
> * {@link org.apache.maven.scm.provider.ScmProvider}.
> @@ -150,7 +141,6 @@ public abstract class AbstractScmRelease
> descriptor.setScmCommentPrefix( scmCommentPrefix );
>
> descriptor.setPushChanges( pushChanges );
> - descriptor.setWorkItem( workItem );
>
> return descriptor;
> }
>
> Modified: maven/release/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> --- maven/release/trunk/pom.xml (original)
> +++ maven/release/trunk/pom.xml Wed Oct 14 11:52:53 2015
> @@ -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>
>
>
>
--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy
Re: svn commit: r1708587 - in /maven/release/trunk: ./
maven-release-manager/ maven-release-manager/src/main/java/org/apache/maven/shared/release/config/
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/m...
Posted by Olivier Lamy <ol...@apache.org>.
did you create a branch with this change?
At least to help the guys who worked on that...
On 14 October 2015 at 22:52, <bi...@apache.org> wrote:
> Author: bimargulies
> Date: Wed Oct 14 11:52:53 2015
> New Revision: 1708587
>
> URL: http://svn.apache.org/viewvc?rev=1708587&view=rev
> Log:
> SCM-775: revert the change, so that I can release this plugin.
>
> Modified:
> maven/release/trunk/maven-release-manager/pom.xml
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
>
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
>
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
>
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> maven/release/trunk/pom.xml
>
> Modified: maven/release/trunk/maven-release-manager/pom.xml
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> --- maven/release/trunk/maven-release-manager/pom.xml (original)
> +++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:52:53
> 2015
> @@ -235,7 +235,7 @@
> </execution>
> </executions>
> <configuration>
> - <version>2.5.3</version>
> + <version>2.5.1</version>
> <packageWithVersion>false</packageWithVersion>
> <useJava5>true</useJava5>
> <models>
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
> Wed Oct 14 11:52:53 2015
> @@ -238,11 +238,6 @@ public class PropertiesReleaseDescriptor
>
> 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
>
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
> Wed Oct 14 11:52:53 2015
> @@ -101,7 +101,6 @@ public class ReleaseUtils
> 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 class ReleaseUtils
> 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 );
>
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
> Wed Oct 14 11:52:53 2015
> @@ -116,8 +116,6 @@ public abstract class AbstractScmCommitP
>
> repository.getProviderRepository().setPushChanges(
> releaseDescriptor.isPushChanges() );
>
> - repository.getProviderRepository().setWorkItem(
> releaseDescriptor.getWorkItem() );
> -
> provider = scmRepositoryConfigurator.getRepositoryProvider(
> repository );
> }
> catch ( ScmRepositoryException e )
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
> Wed Oct 14 11:52:53 2015
> @@ -82,8 +82,6 @@ public class ScmBranchPhase
>
> repository.getProviderRepository().setPushChanges(
> releaseDescriptor.isPushChanges() );
>
> - repository.getProviderRepository().setWorkItem(
> releaseDescriptor.getWorkItem() );
> -
> provider = scmRepositoryConfigurator.getRepositoryProvider(
> repository );
>
> }
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
> Wed Oct 14 11:52:53 2015
> @@ -95,8 +95,6 @@ public class ScmTagPhase
>
> repository.getProviderRepository().setPushChanges(
> releaseDescriptor.isPushChanges() );
>
> - repository.getProviderRepository().setWorkItem(
> releaseDescriptor.getWorkItem() );
> -
> provider = scmRepositoryConfigurator.getRepositoryProvider(
> repository );
> }
> catch ( ScmRepositoryException e )
>
> Modified:
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
> (original)
> +++
> maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
> Wed Oct 14 11:52:53 2015
> @@ -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 );
>
> Modified:
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> ---
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> (original)
> +++
> maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
> Wed Oct 14 11:52:53 2015
> @@ -95,15 +95,6 @@ public abstract class AbstractScmRelease
> 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
> * {@link org.apache.maven.scm.provider.ScmProvider}.
> @@ -150,7 +141,6 @@ public abstract class AbstractScmRelease
> descriptor.setScmCommentPrefix( scmCommentPrefix );
>
> descriptor.setPushChanges( pushChanges );
> - descriptor.setWorkItem( workItem );
>
> return descriptor;
> }
>
> Modified: maven/release/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
>
> ==============================================================================
> --- maven/release/trunk/pom.xml (original)
> +++ maven/release/trunk/pom.xml Wed Oct 14 11:52:53 2015
> @@ -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>
>
>
>
--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy