You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/12/03 00:42:34 UTC
svn commit: r1643023 [1/2] - in /maven/release/trunk: ./
maven-release-api/src/main/java/org/apache/maven/shared/release/policy/
maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/
maven-release-api/src/main/java/org/apache/...
Author: hboutemy
Date: Tue Dec 2 23:42:32 2014
New Revision: 1643023
URL: http://svn.apache.org/r1643023
Log:
updated parent pom and fixed errors reported by Checkstyle
Modified:
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
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/env/DefaultReleaseEnvironment.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.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/CheckCompletedPreparePhasesPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.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/ScmCheckModificationsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
maven/release/trunk/pom.xml
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java Tue Dec 2 23:42:32 2014
@@ -19,6 +19,9 @@ package org.apache.maven.shared.release.
* under the License.
*/
+/**
+ *
+ */
public class PolicyException
extends Exception
{
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java Tue Dec 2 23:42:32 2014
@@ -22,10 +22,14 @@ package org.apache.maven.shared.release.
import org.apache.maven.shared.release.policy.PolicyException;
import org.apache.maven.shared.release.versions.VersionParseException;
+/**
+ *
+ */
public interface VersionPolicy
{
+ VersionPolicyResult getReleaseVersion( VersionPolicyRequest request )
+ throws PolicyException, VersionParseException;
- public VersionPolicyResult getReleaseVersion( VersionPolicyRequest request ) throws PolicyException, VersionParseException;
-
- public VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request ) throws PolicyException, VersionParseException;
+ VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request )
+ throws PolicyException, VersionParseException;
}
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java Tue Dec 2 23:42:32 2014
@@ -1,7 +1,5 @@
package org.apache.maven.shared.release.policy.version;
-import org.apache.maven.artifact.repository.metadata.Metadata;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,11 @@ import org.apache.maven.artifact.reposit
* under the License.
*/
+import org.apache.maven.artifact.repository.metadata.Metadata;
+
+/**
+ *
+ */
public class VersionPolicyRequest
{
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java Tue Dec 2 23:42:32 2014
@@ -19,6 +19,9 @@ package org.apache.maven.shared.release.
* under the License.
*/
+/**
+ *
+ */
public class VersionPolicyResult
{
private String version;
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java Tue Dec 2 23:42:32 2014
@@ -25,9 +25,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.codehaus.plexus.util.StringUtils;
+/**
+ *
+ */
public class Version
implements Comparable<Version>
{
@@ -82,15 +84,8 @@ public class Version
* cmaki 02242009 FIX for non-digit release numbers, e.g. trunk-SNAPSHOT or just SNAPSHOT This alternate pattern
* supports version numbers like: trunk-SNAPSHOT branchName-SNAPSHOT SNAPSHOT
*/
- public static final Pattern ALTERNATE_PATTERN = Pattern.compile( "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)" // for SNAPSHOT
- // releases
- // only
- // (possible
- // versions
- // include:
- // trunk-SNAPSHOT
- // or SNAPSHOT)
- );
+ // for SNAPSHOT releases only (possible versions include: trunk-SNAPSHOT or SNAPSHOT)
+ public static final Pattern ALTERNATE_PATTERN = Pattern.compile( "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)" );
public Version( String version )
throws VersionParseException
@@ -253,7 +248,7 @@ public class Version
/**
* @throws VersionComparisonConflictException if {@link org.eclipse.aether.version.Version} and
- * {@link ArtifactVersion} give different results
+ * {@link org.apache.maven.artifact.versioning.ArtifactVersion ArtifactVersion} give different results
*/
public int compareTo( Version other )
throws VersionComparisonConflictException
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java Tue Dec 2 23:42:32 2014
@@ -19,6 +19,9 @@ package org.apache.maven.shared.release.
* under the License.
*/
+/**
+ *
+ */
public class VersionComparisonConflictException
extends RuntimeException
{
Modified: maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java (original)
+++ maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java Tue Dec 2 23:42:32 2014
@@ -19,6 +19,9 @@ package org.apache.maven.shared.release.
* under the License.
*/
+/**
+ *
+ */
public class VersionParseException
extends Exception
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java Tue Dec 2 23:42:32 2014
@@ -540,7 +540,7 @@ public class DefaultReleaseManager
updateListener( updateVersionsRequest.getReleaseManagerListener(), "updateVersions", GOAL_START );
ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor( updateVersionsRequest.getReleaseDescriptor(),
- updateVersionsRequest.getReleaseManagerListener() );
+ updateVersionsRequest.getReleaseManagerListener() );
for ( String name : updateVersionsPhases )
{
@@ -747,7 +747,8 @@ public class DefaultReleaseManager
ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
- perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, listener );
+ perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects,
+ listener );
}
/** {@inheritDoc} */
@@ -803,7 +804,8 @@ public class DefaultReleaseManager
ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
- rollback( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, listener );
+ rollback( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects,
+ listener );
}
/** {@inheritDoc} */
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java Tue Dec 2 23:42:32 2014
@@ -91,7 +91,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*
- * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean)} instead.
+ * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean)}
+ * instead.
*/
void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
boolean resume, boolean dryRun )
@@ -135,7 +136,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*
- * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean, ReleaseManagerListener)} instead.
+ * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean,
+ * ReleaseManagerListener)} instead.
*/
void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
boolean resume, boolean dryRun, ReleaseManagerListener listener )
@@ -146,7 +148,8 @@ public interface ReleaseManager
ReleaseManagerListener listener );
/**
- * @deprecated Use {@link ReleaseManager#prepareWithResult(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean, ReleaseManagerListener)} instead.
+ * @deprecated Use {@link ReleaseManager#prepareWithResult(ReleaseDescriptor, ReleaseEnvironment, List, boolean,
+ * boolean, ReleaseManagerListener)} instead.
*/
ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
@@ -203,7 +206,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem performing the release
* @throws ReleaseFailureException if there is a problem performing the release
*
- * @deprecated Use {@link ReleaseManager#perform(ReleaseDescriptor, ReleaseEnvironment, List, ReleaseManagerListener)} instead.
+ * @deprecated Use {@link ReleaseManager#perform(ReleaseDescriptor, ReleaseEnvironment, List,
+ * ReleaseManagerListener)} instead.
*/
void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
ReleaseManagerListener listener )
@@ -213,7 +217,8 @@ public interface ReleaseManager
List<MavenProject> reactorProjects, ReleaseManagerListener listener );
/**
- * @deprecated Use {@link ReleaseManager#performWithResult(ReleaseDescriptor, ReleaseEnvironment, List, ReleaseManagerListener)} instead.
+ * @deprecated Use {@link ReleaseManager#performWithResult(ReleaseDescriptor, ReleaseEnvironment, List,
+ * ReleaseManagerListener)} instead.
*/
ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
List<MavenProject> reactorProjects, ReleaseManagerListener listener );
@@ -265,7 +270,8 @@ public interface ReleaseManager
* @param releaseDescriptor the configuration to use for release
* @param reactorProjects the reactor projects
*/
- void clean( ReleaseDescriptor releaseDescriptor, ReleaseManagerListener listener, List<MavenProject> reactorProjects );
+ void clean( ReleaseDescriptor releaseDescriptor, ReleaseManagerListener listener,
+ List<MavenProject> reactorProjects );
/**
* Clean a release.
@@ -326,7 +332,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release rollback
* @throws ReleaseFailureException if there is a problem during release rollback
*
- * @deprecated Use {@link ReleaseManager#rollback(ReleaseDescriptor, ReleaseEnvironment, List, ReleaseManagerListener)} instead.
+ * @deprecated Use {@link ReleaseManager#rollback(ReleaseDescriptor, ReleaseEnvironment, List,
+ * ReleaseManagerListener)} instead.
*/
void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
ReleaseManagerListener listener )
@@ -399,7 +406,8 @@ public interface ReleaseManager
* @throws ReleaseExecutionException if there is a problem during release branch
* @throws ReleaseFailureException if there is a problem during release branch
*
- * @deprecated Use {@link ReleaseManager#branch(ReleaseDescriptor, ReleaseEnvironment, List, boolean, ReleaseManagerListener)} instead.
+ * @deprecated Use {@link ReleaseManager#branch(ReleaseDescriptor, ReleaseEnvironment, List, boolean,
+ * ReleaseManagerListener)} instead.
*/
void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
boolean dryRun, ReleaseManagerListener listener )
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=1643023&r1=1643022&r2=1643023&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 Tue Dec 2 23:42:32 2014
@@ -342,7 +342,8 @@ public class PropertiesReleaseDescriptor
}
// From org.apache.maven.cli.MavenCli.encryption(CliRequest)
- private String encryptAndDecorate( String passwd ) throws IllegalStateException, SecDispatcherException, PlexusCipherException
+ private String encryptAndDecorate( String passwd )
+ throws IllegalStateException, SecDispatcherException, PlexusCipherException
{
String configurationFile = secDispatcher.getConfigurationFile();
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=1643023&r1=1643022&r2=1643023&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 Tue Dec 2 23:42:32 2014
@@ -56,7 +56,8 @@ public class ReleaseUtils
mergeInto.setScmSourceUrl( mergeOverride( mergeInto.getScmSourceUrl(), toBeMerged.getScmSourceUrl() ) );
mergeInto.setScmCommentPrefix(
mergeOverride( mergeInto.getScmCommentPrefix(), toBeMerged.getScmCommentPrefix() ) );
- mergeInto.setScmReleaseLabel( mergeOverride( mergeInto.getScmReleaseLabel(), toBeMerged.getScmReleaseLabel() ) );
+ mergeInto.setScmReleaseLabel( mergeOverride( mergeInto.getScmReleaseLabel(),
+ toBeMerged.getScmReleaseLabel() ) );
mergeInto.setScmTagBase( mergeOverride( mergeInto.getScmTagBase(), toBeMerged.getScmTagBase() ) );
mergeInto.setScmTagNameFormat(
mergeOverride( mergeInto.getScmTagNameFormat(), toBeMerged.getScmTagNameFormat() ) );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java Tue Dec 2 23:42:32 2014
@@ -24,6 +24,9 @@ import java.util.Locale;
import org.apache.maven.settings.Settings;
+/**
+ *
+ */
public class DefaultReleaseEnvironment
implements ReleaseEnvironment
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java Tue Dec 2 23:42:32 2014
@@ -24,6 +24,9 @@ import java.util.Locale;
import org.apache.maven.settings.Settings;
+/**
+ *
+ */
public interface ReleaseEnvironment
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java Tue Dec 2 23:42:32 2014
@@ -42,6 +42,9 @@ import org.sonatype.plexus.components.se
import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
+/**
+ *
+ */
public abstract class AbstractMavenExecutor
implements MavenExecutor, LogEnabled
{
@@ -70,7 +73,8 @@ public abstract class AbstractMavenExecu
String pomFileName, ReleaseResult result )
throws MavenExecutorException
{
- executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments, pomFileName, result );
+ executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments,
+ pomFileName, result );
}
/** {@inheritDoc} */
@@ -78,7 +82,8 @@ public abstract class AbstractMavenExecu
ReleaseResult result )
throws MavenExecutorException
{
- executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments, result );
+ executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments,
+ result );
}
/** {@inheritDoc} */
@@ -91,7 +96,8 @@ public abstract class AbstractMavenExecu
/** {@inheritDoc} */
public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, String pomFileName, ReleaseResult result )
+ boolean interactive, String additionalArguments, String pomFileName,
+ ReleaseResult result )
throws MavenExecutorException
{
List<String> goalsList = new ArrayList<String>();
@@ -100,21 +106,20 @@ public abstract class AbstractMavenExecu
// accept both space and comma, so the old way still work
// also accept line separators, so that goal lists can be spread
// across multiple lines in the POM.
- String[] tokens = StringUtils.split( goals, ", \n\r\t" );
-
- for ( int i = 0; i < tokens.length; ++i )
+ for ( String token : StringUtils.split( goals, ", \n\r\t" ) )
{
- goalsList.add( tokens[i] );
+ goalsList.add( token );
}
}
- executeGoals( workingDirectory, goalsList, releaseEnvironment, interactive, additionalArguments, pomFileName, result );
+ executeGoals( workingDirectory, goalsList, releaseEnvironment, interactive, additionalArguments, pomFileName,
+ result );
}
- protected abstract void executeGoals( File workingDirectory, List<String> goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, String pomFileName, ReleaseResult result )
+ protected abstract void executeGoals( File workingDirectory, List<String> goals,
+ ReleaseEnvironment releaseEnvironment, boolean interactive,
+ String additionalArguments, String pomFileName, ReleaseResult result )
throws MavenExecutorException;
-
protected final Logger getLogger()
{
return logger;
@@ -204,7 +209,8 @@ public abstract class AbstractMavenExecu
}
// From org.apache.maven.cli.MavenCli.encryption(CliRequest)
- private final String encryptAndDecorate( String passwd ) throws IllegalStateException, SecDispatcherException, PlexusCipherException
+ private String encryptAndDecorate( String passwd )
+ throws IllegalStateException, SecDispatcherException, PlexusCipherException
{
String configurationFile = secDispatcher.getConfigurationFile();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Tue Dec 2 23:42:32 2014
@@ -341,21 +341,21 @@ public class InvokerMavenExecutor
String mavenHome = System.getProperty( "maven.home" );
if ( mavenHome == null )
{
- mavenHome = System.getenv("MAVEN_HOME");
+ mavenHome = System.getenv( "MAVEN_HOME" );
}
if ( mavenHome == null )
{
- mavenHome = System.getenv("M2_HOME");
+ mavenHome = System.getenv( "M2_HOME" );
}
mavenPath = mavenHome == null ? null : new File( mavenHome );
}
Invoker invoker =
- new DefaultInvoker().setMavenHome( mavenPath ).setLogger( bridge ).setOutputHandler(
- handler ).setErrorHandler( handler );
+ new DefaultInvoker().setMavenHome( mavenPath ).setLogger( bridge )
+ .setOutputHandler( handler ).setErrorHandler( handler );
InvocationRequest req =
- new DefaultInvocationRequest().setDebug( getLogger().isDebugEnabled() ).setBaseDirectory(
- workingDirectory ).setInteractive( interactive );
+ new DefaultInvocationRequest().setDebug( getLogger().isDebugEnabled() )
+ .setBaseDirectory( workingDirectory ).setInteractive( interactive );
if ( pomFileName != null )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java Tue Dec 2 23:42:32 2014
@@ -78,7 +78,8 @@ public interface MavenExecutor
* @param result holds all results of the execution
* @throws MavenExecutorException if an error occurred executing Maven
*
- * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String, String, ReleaseResult)} instead
+ * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String, String,
+ * ReleaseResult)} instead
*/
void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
String pomFileName, ReleaseResult result )
@@ -94,7 +95,8 @@ public interface MavenExecutor
* @param result holds all results of the execution
* @throws MavenExecutorException if an error occurred executing Maven
*
- * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String, ReleaseResult)} instead
+ * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String,
+ * ReleaseResult)} instead
*/
void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
ReleaseResult result )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java Tue Dec 2 23:42:32 2014
@@ -23,6 +23,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+/**
+ *
+ */
public class RawStreamPumper
extends Thread
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java Tue Dec 2 23:42:32 2014
@@ -24,6 +24,9 @@ import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+/**
+ *
+ */
public class TeeOutputStream
extends FilterOutputStream
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java Tue Dec 2 23:42:32 2014
@@ -44,12 +44,14 @@ public abstract class AbstractReleasePom
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- protected ScmRepository getScmRepository( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment )
+ protected ScmRepository getScmRepository( ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment )
throws ReleaseFailureException, ReleaseExecutionException
{
try
{
- return scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+ return scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
+ releaseEnvironment.getSettings() );
}
catch ( ScmRepositoryException exception )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Tue Dec 2 23:42:32 2014
@@ -174,6 +174,7 @@ public abstract class AbstractRewritePom
* fail. So let's try harder. Maybe some day, when JDOM offers a StaxBuilder and this builder employes
* XMLInputFactory2.P_REPORT_PROLOG_WHITESPACE, this whole mess can be avoided.
*/
+ // CHECKSTYLE_OFF: LocalFinalVariableName
final String SPACE = "\\s++";
final String XML = "<\\?(?:(?:[^\"'>]++)|(?:\"[^\"]*+\")|(?:'[^\']*+'))*+>";
final String INTSUB = "\\[(?:(?:[^\"'\\]]++)|(?:\"[^\"]*+\")|(?:'[^\']*+'))*+\\]";
@@ -186,6 +187,7 @@ public abstract class AbstractRewritePom
"(?:(?:" + SPACE + ")|(?:" + XML + ")|(?:" + DOCTYPE + ")|(?:" + COMMENT + ")|(?:" + PI + "))*";
final String OUTRO = "(?:(?:" + SPACE + ")|(?:" + COMMENT + ")|(?:" + PI + "))*";
final String POM = "(?s)(" + INTRO + ")(.*?)(" + OUTRO + ")";
+ // CHECKSTYLE_ON: LocalFinalVariableName
Matcher matcher = Pattern.compile( POM ).matcher( content );
if ( matcher.matches() )
@@ -258,8 +260,8 @@ public abstract class AbstractRewritePom
}
private void transformDocument( MavenProject project, Element rootElement, ReleaseDescriptor releaseDescriptor,
- List<MavenProject> reactorProjects, ScmRepository scmRepository, ReleaseResult result,
- boolean simulate )
+ List<MavenProject> reactorProjects, ScmRepository scmRepository,
+ ReleaseResult result, boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
Namespace namespace = rootElement.getNamespace();
@@ -394,8 +396,8 @@ public abstract class AbstractRewritePom
}
}
- private void rewriteVersion( Element rootElement, Namespace namespace, Map<String, String> mappedVersions, String projectId,
- MavenProject project, String parentVersion )
+ private void rewriteVersion( Element rootElement, Namespace namespace, Map<String, String> mappedVersions,
+ String projectId, MavenProject project, String parentVersion )
throws ReleaseFailureException
{
Element versionElement = rootElement.getChild( "version", namespace );
@@ -425,8 +427,10 @@ public abstract class AbstractRewritePom
}
}
- private String rewriteParent( MavenProject project, Element rootElement, Namespace namespace, Map<String, String> mappedVersions,
- Map<String, Map<String, String>> resolvedSnapshotDependencies, Map<String, String> originalVersions )
+ private String rewriteParent( MavenProject project, Element rootElement, Namespace namespace,
+ Map<String, String> mappedVersions,
+ Map<String, Map<String, String>> resolvedSnapshotDependencies,
+ Map<String, String> originalVersions )
throws ReleaseFailureException
{
String parentVersion = null;
@@ -458,9 +462,9 @@ public abstract class AbstractRewritePom
}
private void rewriteArtifactVersions( Collection<Element> elements, Map<String, String> mappedVersions,
- Map<String, Map<String, String>> resolvedSnapshotDependencies, Map<String, String> originalVersions,
- Model projectModel, Element properties, ReleaseResult result,
- ReleaseDescriptor releaseDescriptor )
+ Map<String, Map<String, String>> resolvedSnapshotDependencies,
+ Map<String, String> originalVersions, Model projectModel, Element properties,
+ ReleaseResult result, ReleaseDescriptor releaseDescriptor )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( elements == null )
@@ -565,7 +569,8 @@ public abstract class AbstractRewritePom
else if ( !mappedVersion.equals( rawVersion ) )
{
if ( mappedVersion.matches( "\\$\\{project.+\\}" )
- || mappedVersion.matches( "\\$\\{pom.+\\}" ) || "${version}".equals( mappedVersion ) )
+ || mappedVersion.matches( "\\$\\{pom.+\\}" )
+ || "${version}".equals( mappedVersion ) )
{
logInfo( result, " Ignoring artifact version update for expression "
+ mappedVersion );
@@ -735,9 +740,10 @@ public abstract class AbstractRewritePom
Map<String, Map<String, String>> resolvedSnapshots );
protected abstract Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
- List<MavenProject> reactorProjects, boolean simulate );
+ List<MavenProject> reactorProjects,
+ boolean simulate );
- protected abstract Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor );
+ protected abstract Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor );
protected abstract void transformScm( MavenProject project, Element rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor, String projectId,
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java Tue Dec 2 23:42:32 2014
@@ -48,7 +48,8 @@ public abstract class AbstractRunGoalsPh
private Map<String, MavenExecutor> mavenExecutors;
/**
- * @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)} instead.
+ * @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)}
+ * instead.
*/
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, File workingDirectory,
String additionalArguments )
@@ -78,9 +79,10 @@ public abstract class AbstractRunGoalsPh
"Cannot find Maven executor with id: " + releaseEnvironment.getMavenExecutorId() );
}
- mavenExecutor.executeGoals( determineWorkingDirectory( workingDirectory,
- releaseDescriptor.getScmRelativePathProjectDirectory() ),
- goals, releaseEnvironment, releaseDescriptor.isInteractive(),
+ File wd =
+ determineWorkingDirectory( workingDirectory,
+ releaseDescriptor.getScmRelativePathProjectDirectory() );
+ mavenExecutor.executeGoals( wd, goals, releaseEnvironment, releaseDescriptor.isInteractive(),
additionalArguments, releaseDescriptor.getPomFileName(), result );
}
}
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=1643023&r1=1643022&r2=1643023&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 Tue Dec 2 23:42:32 2014
@@ -170,8 +170,8 @@ public abstract class AbstractScmCommitP
}
}
- protected void simulateCheckins( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects, ReleaseResult result,
- String message )
+ protected void simulateCheckins( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects,
+ ReleaseResult result, String message )
{
Collection<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
logInfo( result, "Full run would be commit " + pomFiles.size() + " files with message: '" + message + "'" );
@@ -206,7 +206,8 @@ public abstract class AbstractScmCommitP
return pomFiles;
}
- protected static List<File> createPomFiles( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects )
+ protected static List<File> createPomFiles( ReleaseDescriptor releaseDescriptor,
+ List<MavenProject> reactorProjects )
{
List<File> pomFiles = new ArrayList<File>();
for ( MavenProject project : reactorProjects )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java Tue Dec 2 23:42:32 2014
@@ -31,7 +31,8 @@ import org.apache.maven.shared.release.e
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="verify-completed-prepare-phases"
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
+ * role-hint="verify-completed-prepare-phases"
*/
public class CheckCompletedPreparePhasesPhase
extends AbstractReleasePhase
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Tue Dec 2 23:42:32 2014
@@ -91,7 +91,8 @@ public class CheckDependencySnapshotsPha
private Set<Artifact> usedSnapshotExtensions = new HashSet<Artifact>();
private Set<Artifact> usedSnapshotPlugins = new HashSet<Artifact>();
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -116,7 +117,8 @@ public class CheckDependencySnapshotsPha
return result;
}
- private void checkProject( MavenProject project, Map<String, String> originalVersions, ReleaseDescriptor releaseDescriptor )
+ private void checkProject( MavenProject project, Map<String, String> originalVersions,
+ ReleaseDescriptor releaseDescriptor )
throws ReleaseFailureException, ReleaseExecutionException
{
@SuppressWarnings( "unchecked" )
@@ -289,7 +291,9 @@ public class CheckDependencySnapshotsPha
}
}
- private static boolean checkArtifact( Artifact artifact, Map<String, String> originalVersions, Map<String, Artifact> artifactMapByVersionlessId, ReleaseDescriptor releaseDescriptor )
+ private static boolean checkArtifact( Artifact artifact, Map<String, String> originalVersions,
+ Map<String, Artifact> artifactMapByVersionlessId,
+ ReleaseDescriptor releaseDescriptor )
{
Artifact checkArtifact = getArtifactFromMap( artifact, artifactMapByVersionlessId );
@@ -308,14 +312,16 @@ public class CheckDependencySnapshotsPha
return checkArtifact;
}
- private static boolean checkArtifact( Artifact artifact, Map<String, String> originalVersions, ReleaseDescriptor releaseDescriptor )
+ private static boolean checkArtifact( Artifact artifact, Map<String, String> originalVersions,
+ ReleaseDescriptor releaseDescriptor )
{
String versionlessArtifactKey = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
// We are only looking at dependencies external to the project - ignore anything found in the reactor as
// it's version will be updated
boolean result =
- artifact.isSnapshot() && !artifact.getBaseVersion().equals( originalVersions.get( versionlessArtifactKey ) );
+ artifact.isSnapshot()
+ && !artifact.getBaseVersion().equals( originalVersions.get( versionlessArtifactKey ) );
// If we have a snapshot but allowTimestampedSnapshots is true, accept the artifact if the version
// indicates that it is a timestamped snapshot.
@@ -327,7 +333,8 @@ public class CheckDependencySnapshotsPha
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
// It makes no modifications, so simulate is the same as execute
@@ -357,8 +364,9 @@ public class CheckDependencySnapshotsPha
return message;
}
- private void resolveSnapshots( Set<Artifact> projectDependencies, Set<Artifact> reportDependencies, Set<Artifact> extensionDependencies,
- Set<Artifact> pluginDependencies, ReleaseDescriptor releaseDescriptor )
+ private void resolveSnapshots( Set<Artifact> projectDependencies, Set<Artifact> reportDependencies,
+ Set<Artifact> extensionDependencies, Set<Artifact> pluginDependencies,
+ ReleaseDescriptor releaseDescriptor )
throws ReleaseExecutionException
{
try
@@ -403,6 +411,8 @@ public class CheckDependencySnapshotsPha
case 4:
resolvedSnapshots = processSnapshot( extensionDependencies );
break;
+
+ default:
}
releaseDescriptor.getResolvedSnapshotDependencies().putAll( resolvedSnapshots );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java Tue Dec 2 23:42:32 2014
@@ -51,7 +51,8 @@ public class CheckPomPhase
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -83,7 +84,8 @@ public class CheckPomPhase
try
{
- scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+ scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
+ releaseEnvironment.getSettings() );
}
catch ( ScmRepositoryException e )
{
@@ -116,7 +118,8 @@ public class CheckPomPhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
// It makes no modifications, so simulate is the same as execute
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java Tue Dec 2 23:42:32 2014
@@ -37,7 +37,8 @@ import java.util.List;
public class EndReleasePhase
extends AbstractReleasePhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -49,7 +50,8 @@ public class EndReleasePhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java Tue Dec 2 23:42:32 2014
@@ -141,7 +141,8 @@ public class GenerateReleasePomsPhase
{
// create release pom
- Model releasePom = createReleaseModel( project, releaseDescriptor, releaseEnvironment, reactorProjects, result );
+ Model releasePom = createReleaseModel( project, releaseDescriptor, releaseEnvironment, reactorProjects,
+ result );
// write release pom to file
@@ -332,7 +333,8 @@ public class GenerateReleasePomsPhase
return releaseDescriptor.getReleaseVersions();
}
- private String getNextVersion( Map<String, String> mappedVersions, String groupId, String artifactId, String version )
+ private String getNextVersion( Map<String, String> mappedVersions, String groupId, String artifactId,
+ String version )
throws ReleaseFailureException
{
// TODO: share with RewritePomsForReleasePhase.rewriteVersion
@@ -429,7 +431,8 @@ public class GenerateReleasePomsPhase
return releaseDependencies;
}
- private String getReleaseVersion( Map<String, String> originalVersions, Map<String, String> mappedVersions, Artifact artifact )
+ private String getReleaseVersion( Map<String, String> originalVersions, Map<String, String> mappedVersions,
+ Artifact artifact )
throws ReleaseFailureException
{
String key = ArtifactUtils.versionlessKey( artifact );
@@ -461,7 +464,8 @@ public class GenerateReleasePomsPhase
return version;
}
- private List<Plugin> createReleasePlugins( Map<String, String> originalVersions, Map<String, String> mappedVersions, MavenProject project )
+ private List<Plugin> createReleasePlugins( Map<String, String> originalVersions,
+ Map<String, String> mappedVersions, MavenProject project )
throws ReleaseFailureException
{
List<Plugin> releasePlugins = null;
@@ -505,8 +509,8 @@ public class GenerateReleasePomsPhase
return releasePlugins;
}
- private List<ReportPlugin> createReleaseReportPlugins( Map<String, String> originalVersions, Map<String, String> mappedVersions,
- MavenProject project )
+ private List<ReportPlugin> createReleaseReportPlugins( Map<String, String> originalVersions,
+ Map<String, String> mappedVersions, MavenProject project )
throws ReleaseFailureException
{
List<ReportPlugin> releaseReportPlugins = null;
@@ -546,7 +550,8 @@ public class GenerateReleasePomsPhase
return releaseReportPlugins;
}
- private List<Extension> createReleaseExtensions( Map<String, String> originalVersions, Map<String, String> mappedVersions, MavenProject project )
+ private List<Extension> createReleaseExtensions( Map<String, String> originalVersions,
+ Map<String, String> mappedVersions, MavenProject project )
throws ReleaseFailureException
{
List<Extension> releaseExtensions = null;
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java Tue Dec 2 23:42:32 2014
@@ -78,7 +78,8 @@ public class InputVariablesPhase
try
{
ScmRepository repository =
- scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+ scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
+ releaseEnvironment.getSettings() );
return scmRepositoryConfigurator.getRepositoryProvider( repository );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Tue Dec 2 23:42:32 2014
@@ -52,7 +52,8 @@ import org.codehaus.plexus.util.StringUt
* <p>
* <table>
* <tr>
- * <th>MapVersionsPhase field</th><th>map-release-versions</th><th>map-branch-versions</th><th>map-development-versions</th>
+ * <th>MapVersionsPhase field</th><th>map-release-versions</th><th>map-branch-versions</th>
+ * <th>map-development-versions</th>
* </tr>
* <tr>
* <td>convertToSnapshot</td> <td>false</td> <td>true</td> <td>true</td>
@@ -205,7 +206,8 @@ public class MapVersionsPhase
{
// no branch modification
if ( !( releaseDescriptor.isUpdateBranchVersions()
- && ( ArtifactUtils.isSnapshot( project.getVersion() ) || releaseDescriptor.isUpdateVersionsToSnapshot() ) ) )
+ && ( ArtifactUtils.isSnapshot( project.getVersion() )
+ || releaseDescriptor.isUpdateVersionsToSnapshot() ) ) )
{
return project.getVersion();
}
@@ -263,19 +265,20 @@ public class MapVersionsPhase
{
try
{
- suggestedVersion = resolveSuggestedVersion( baseVersion, releaseDescriptor.getProjectVersionPolicyId() );
+ suggestedVersion =
+ resolveSuggestedVersion( baseVersion, releaseDescriptor.getProjectVersionPolicyId() );
}
catch ( VersionParseException e )
{
if ( releaseDescriptor.isInteractive() )
{
- suggestedVersion = resolveSuggestedVersion( "1.0", releaseDescriptor.getProjectVersionPolicyId() );
+ suggestedVersion =
+ resolveSuggestedVersion( "1.0", releaseDescriptor.getProjectVersionPolicyId() );
}
else
{
- throw new ReleaseExecutionException(
- "Error parsing version, cannot determine next version: "
- + e.getMessage(), e );
+ throw new ReleaseExecutionException( "Error parsing version, cannot determine next "
+ + "version: " + e.getMessage(), e );
}
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java Tue Dec 2 23:42:32 2014
@@ -51,7 +51,8 @@ public interface ReleasePhase
* @throws ReleaseFailureException a failure during the execution of the phase
* @return the release result
*/
- ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
@@ -64,7 +65,8 @@ public interface ReleasePhase
* @throws ReleaseFailureException a failure during the execution of the phase
* @return the release result
*/
- ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
/**
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java Tue Dec 2 23:42:32 2014
@@ -56,8 +56,8 @@ public class RewritePomVersionsPhase
@SuppressWarnings( "unchecked" )
@Override
- protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects,
- boolean simulate )
+ protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
+ List<MavenProject> reactorProjects, boolean simulate )
{
return releaseDescriptor.getReleaseVersions();
}
@@ -70,7 +70,8 @@ public class RewritePomVersionsPhase
}
@Override
- protected String getResolvedSnapshotVersion( String artifactVersionlessKey, Map<String, Map<String, String>> resolvedSnapshotsMap )
+ protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
+ Map<String, Map<String, String>> resolvedSnapshotsMap )
{
// Only update the pom version, not the dependency versions
return null;
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java Tue Dec 2 23:42:32 2014
@@ -60,7 +60,8 @@ public class RewritePomsForBranchPhase
try
{
- translateScm( project, releaseDescriptor, scmRoot, namespace, scmRepository, result, commonBasedir );
+ translateScm( project, releaseDescriptor, scmRoot, namespace, scmRepository, result,
+ commonBasedir );
}
catch ( IOException e )
{
@@ -153,7 +154,8 @@ public class RewritePomsForBranchPhase
}
String value =
- translator.translateBranchUrl( scm.getConnection(), branchName + subDirectoryBranch, scmConnectionBranch );
+ translator.translateBranchUrl( scm.getConnection(), branchName + subDirectoryBranch,
+ scmConnectionBranch );
if ( !value.equals( scm.getConnection() ) )
{
rewriteElement( "connection", value, scmRoot, namespace );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Tue Dec 2 23:42:32 2014
@@ -61,7 +61,8 @@ public class RewritePomsForReleasePhase
try
{
- translateScm( project, releaseDescriptor, scmRoot, namespace, scmRepository, result, commonBasedir );
+ translateScm( project, releaseDescriptor, scmRoot, namespace, scmRepository, result,
+ commonBasedir );
}
catch ( IOException 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=1643023&r1=1643022&r2=1643023&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 Tue Dec 2 23:42:32 2014
@@ -77,7 +77,8 @@ public class ScmBranchPhase
{
repository =
scmRepositoryConfigurator.getConfiguredRepository( basedirAlignedReleaseDescriptor.getScmSourceUrl(),
- releaseDescriptor, releaseEnvironment.getSettings() );
+ releaseDescriptor,
+ releaseEnvironment.getSettings() );
repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java Tue Dec 2 23:42:32 2014
@@ -94,7 +94,8 @@ public class ScmCheckModificationsPhase
// SelectorUtils expects OS-specific paths and patterns
for ( String additionalExclude : additionalExcludes )
{
- exclusionPatterns.add( additionalExclude.replace( "\\", File.separator ).replace( "/", File.separator ) );
+ exclusionPatterns.add( additionalExclude.replace( "\\", File.separator )
+ .replace( "/", File.separator ) );
}
}
@@ -106,7 +107,8 @@ public class ScmCheckModificationsPhase
try
{
repository =
- scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+ scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
+ releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java Tue Dec 2 23:42:32 2014
@@ -32,7 +32,8 @@ import org.apache.maven.shared.release.v
*
* @plexus.component role="org.apache.maven.shared.release.policy.version.VersionPolicy" role-hint="default"
*/
-public class DefaultVersionPolicy implements VersionPolicy
+public class DefaultVersionPolicy
+ implements VersionPolicy
{
public VersionPolicyResult getReleaseVersion( VersionPolicyRequest request )
@@ -45,7 +46,8 @@ public class DefaultVersionPolicy implem
public VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request )
throws PolicyException, VersionParseException
{
- String developmentVersion = new DefaultVersionInfo( request.getVersion() ).getNextVersion().getSnapshotVersionString();
+ String developmentVersion =
+ new DefaultVersionInfo( request.getVersion() ).getNextVersion().getSnapshotVersionString();
return new VersionPolicyResult().setVersion( developmentVersion );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java Tue Dec 2 23:42:32 2014
@@ -307,7 +307,8 @@ public class PomFinder
{
return false;
}
- if ( parentGroupId != null ? !parentGroupId.equals( pomInfo.parentGroupId ) : pomInfo.parentGroupId != null )
+ if ( parentGroupId != null ? !parentGroupId.equals( pomInfo.parentGroupId )
+ : pomInfo.parentGroupId != null )
{
return false;
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java Tue Dec 2 23:42:32 2014
@@ -47,8 +47,10 @@ import org.codehaus.plexus.util.ReaderFa
*/
public class ReleaseUtil
{
+ @SuppressWarnings( "checkstyle:constantname" )
public static final String RELEASE_POMv4 = "release-pom.xml";
+ @SuppressWarnings( "checkstyle:constantname" )
public static final String POMv4 = "pom.xml";
private static final String FS = File.separator;
@@ -183,7 +185,8 @@ public class ReleaseUtil
}
int parentLevels =
- getBaseWorkingDirectoryParentCount( basedir, FileUtils.normalize( releaseDescriptor.getWorkingDirectory() ) );
+ getBaseWorkingDirectoryParentCount( basedir,
+ FileUtils.normalize( releaseDescriptor.getWorkingDirectory() ) );
String url = releaseDescriptor.getScmSourceUrl();
url = realignScmUrl( parentLevels, url );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java Tue Dec 2 23:42:32 2014
@@ -54,7 +54,8 @@ import java.util.regex.Pattern;
* <p/>
* Leading zeros are significant when performing comparisons.
* <p/>
- * TODO: this parser is better than DefaultArtifactVersion - replace it with this (but align naming) and then remove this from here.
+ * TODO: this parser is better than DefaultArtifactVersion - replace it with this (but align naming) and then remove
+ * this from here.
*/
public class DefaultVersionInfo
implements VersionInfo
@@ -109,9 +110,8 @@ public class DefaultVersionInfo
* branchName-SNAPSHOT
* SNAPSHOT
*/
- public static final Pattern ALTERNATE_PATTERN = Pattern.compile(
- "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)" // for SNAPSHOT releases only (possible versions include: trunk-SNAPSHOT or SNAPSHOT)
- );
+ // for SNAPSHOT releases only (possible versions include: trunk-SNAPSHOT or SNAPSHOT)
+ public static final Pattern ALTERNATE_PATTERN = Pattern.compile( "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)" );
/**
* Constructs this object and parses the supplied version string.
@@ -214,12 +214,13 @@ public class DefaultVersionInfo
}
/**
- * Compares this {@link DefaultVersionInfo} to the supplied {@link DefaultVersionInfo}
- * to determine which version is greater.
+ * Compares this {@link DefaultVersionInfo} to the supplied {@link DefaultVersionInfo} to determine which version is
+ * greater.
*
* @param obj the comparison version
* @return the comparison value
- * @throws IllegalArgumentException if the components differ between the objects or if either of the annotations can not be determined.
+ * @throws IllegalArgumentException if the components differ between the objects or if either of the annotations can
+ * not be determined.
*/
public int compareTo( VersionInfo obj )
{
@@ -259,6 +260,11 @@ public class DefaultVersionInfo
return compareTo( (VersionInfo) obj ) == 0;
}
+ public int hashCode()
+ {
+ return strVersion.toLowerCase( Locale.ENGLISH ).hashCode();
+ }
+
/**
* Takes a string and increments it as an integer.
* Preserves any lpad of "0" zeros.
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=1643023&r1=1643022&r2=1643023&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 Tue Dec 2 23:42:32 2014
@@ -96,7 +96,8 @@ public abstract class AbstractScmRelease
/**
* 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}.
+ * The key is the scm prefix and the value is the role hint of the
+ * {@link org.apache.maven.scm.provider.ScmProvider}.
*
* @since 2.0-beta-6
* @see ScmManager#setScmProviderImplementation(String, String)
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java Tue Dec 2 23:42:32 2014
@@ -31,8 +31,9 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.config.ReleaseUtils;
/**
- * Branch a project in SCM, using the same steps as the <tt>release:prepare</tt> goal, creating a branch instead of a tag.
- * For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html">http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html</a>.
+ * Branch a project in SCM, using the same steps as the <tt>release:prepare</tt> goal, creating a branch instead of a
+ * tag. For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html"
+ * >http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html</a>.
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -52,9 +53,9 @@ public class BranchReleaseMojo
private String branchName;
/**
- * The branch base directory in SVN, you must define it if you don't use the standard svn layout (trunk/tags/branches).
- * For example, <code>http://svn.apache.org/repos/asf/maven/plugins/branches</code>. The URL is an SVN URL and does not
- * include the SCM provider and protocol.
+ * The branch base directory in SVN, you must define it if you don't use the standard svn layout
+ * (trunk/tags/branches). For example, <code>http://svn.apache.org/repos/asf/maven/plugins/branches</code>. The URL
+ * is an SVN URL and does not include the SCM provider and protocol.
*
* @since 2.0
*/