You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/03/12 14:48:18 UTC
[maven-release] branch MRELEASE-1115 updated (7d90fb31 -> f2f39436)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MRELEASE-1115
in repository https://gitbox.apache.org/repos/asf/maven-release.git
discard 7d90fb31 [MRELEASE-1115] Upgrade Parent to 39
new f2f39436 [MRELEASE-1115] Upgrade Parent to 39
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7d90fb31)
\
N -- N -- N refs/heads/MRELEASE-1115 (f2f39436)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
1 file changed, 1 insertion(+)
[maven-release] 01/01: [MRELEASE-1115] Upgrade Parent to 39
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1115
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit f2f394362e9be327d2a2b379183c4f4d12753ce3
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Mar 12 15:19:06 2023 +0100
[MRELEASE-1115] Upgrade Parent to 39
This closes #105
---
maven-release-api/pom.xml | 1 -
.../shared/release/ReleaseExecutionException.java | 17 +-
.../shared/release/ReleaseFailureException.java | 12 +-
.../apache/maven/shared/release/ReleaseResult.java | 82 +-
.../shared/release/config/ReleaseDescriptor.java | 43 +-
.../shared/release/env/ReleaseEnvironment.java | 6 +-
.../shared/release/phase/AbstractReleasePhase.java | 52 +-
.../maven/shared/release/phase/ReleasePhase.java | 27 +-
.../shared/release/phase/ResourceGenerator.java | 8 +-
.../shared/release/policy/PolicyException.java | 19 +-
.../shared/release/policy/naming/NamingPolicy.java | 10 +-
.../release/policy/naming/NamingPolicyRequest.java | 28 +-
.../release/policy/naming/NamingPolicyResult.java | 13 +-
.../release/policy/version/VersionPolicy.java | 13 +-
.../policy/version/VersionPolicyRequest.java | 49 +-
.../policy/version/VersionPolicyResult.java | 13 +-
.../maven/shared/release/strategy/Strategy.java | 14 +-
.../shared/release/versions/AetherVersion.java | 30 +-
.../release/versions/MavenArtifactVersion.java | 41 +-
.../maven/shared/release/versions/Version.java | 272 +--
.../VersionComparisonConflictException.java | 18 +-
.../release/versions/VersionParseException.java | 17 +-
maven-release-manager/pom.xml | 17 +-
.../shared/release/AbstractReleaseRequest.java | 24 +-
.../shared/release/DefaultReleaseManager.java | 723 +++---
.../release/DefaultReleaseManagerListener.java | 57 +-
.../maven/shared/release/ReleaseBranchRequest.java | 31 +-
.../maven/shared/release/ReleaseCleanRequest.java | 8 +-
.../maven/shared/release/ReleaseManager.java | 26 +-
.../shared/release/ReleaseManagerListener.java | 14 +-
.../shared/release/ReleasePerformRequest.java | 25 +-
.../shared/release/ReleasePrepareRequest.java | 37 +-
.../shared/release/ReleaseRollbackRequest.java | 13 +-
.../release/ReleaseUpdateVersionsRequest.java | 25 +-
.../config/PropertiesReleaseDescriptorStore.java | 351 ++-
.../release/config/ReleaseDescriptorBuilder.java | 395 ++--
.../release/config/ReleaseDescriptorStore.java | 14 +-
.../config/ReleaseDescriptorStoreException.java | 12 +-
.../maven/shared/release/config/ReleaseUtils.java | 358 ++-
.../release/env/DefaultReleaseEnvironment.java | 42 +-
.../shared/release/exec/AbstractMavenExecutor.java | 101 +-
.../shared/release/exec/CommandLineFactory.java | 9 +-
.../release/exec/DefaultCommandLineFactory.java | 22 +-
.../shared/release/exec/ForkedMavenExecutor.java | 214 +-
.../shared/release/exec/InvokerMavenExecutor.java | 202 +-
.../maven/shared/release/exec/MavenExecutor.java | 16 +-
.../release/exec/MavenExecutorException.java | 20 +-
.../maven/shared/release/exec/RawStreamPumper.java | 84 +-
.../maven/shared/release/exec/TeeConsumer.java | 32 +-
.../maven/shared/release/exec/TeeOutputStream.java | 59 +-
.../release/phase/AbstractBackupPomsPhase.java | 29 +-
.../release/phase/AbstractCheckPomPhase.java | 73 +-
.../release/phase/AbstractInputVariablesPhase.java | 252 +--
.../release/phase/AbstractMapVersionsPhase.java | 393 ++--
.../release/phase/AbstractReleasePomsPhase.java | 53 +-
.../release/phase/AbstractRewritePomsPhase.java | 720 +++---
.../release/phase/AbstractRunGoalsPhase.java | 121 +-
.../phase/AbstractScmCommitDevelopmentPhase.java | 81 +-
.../release/phase/AbstractScmCommitPhase.java | 233 +-
.../phase/AbstractScmCommitPreparationPhase.java | 76 +-
.../release/phase/BranchInputVariablesPhase.java | 18 +-
.../phase/CheckCompletedPreparePhasesPhase.java | 53 +-
.../phase/CheckDependencySnapshotsPhase.java | 484 ++--
.../maven/shared/release/phase/CheckPomsPhase.java | 14 +-
.../phase/CheckPomsUpdateversionsPhase.java | 14 +-
.../release/phase/CheckoutProjectFromScm.java | 239 +-
.../release/phase/CreateBackupPomsPhase.java | 67 +-
.../shared/release/phase/EndReleasePhase.java | 35 +-
.../release/phase/GenerateReleasePomsPhase.java | 630 +++---
.../shared/release/phase/InputVariablesPhase.java | 18 +-
.../release/phase/MapBranchVersionsPhase.java | 18 +-
.../release/phase/MapDevelopmentVersionsPhase.java | 18 +-
.../release/phase/MapReleaseVersionsPhase.java | 18 +-
.../release/phase/RemoveReleasePomsPhase.java | 151 +-
.../shared/release/phase/RemoveScmTagPhase.java | 129 +-
.../release/phase/RestoreBackupPomsPhase.java | 112 +-
.../release/phase/RewritePomVersionsPhase.java | 49 +-
.../release/phase/RewritePomsForBranchPhase.java | 210 +-
.../phase/RewritePomsForDevelopmentPhase.java | 91 +-
.../release/phase/RewritePomsForReleasePhase.java | 205 +-
.../release/phase/RunCompleteGoalsPhase.java | 45 +-
.../shared/release/phase/RunPerformGoalsPhase.java | 112 +-
.../shared/release/phase/RunPrepareGoalsPhase.java | 45 +-
.../maven/shared/release/phase/ScmBranchPhase.java | 125 +-
.../release/phase/ScmCheckModificationsPhase.java | 166 +-
.../shared/release/phase/ScmCommitBranchPhase.java | 14 +-
.../release/phase/ScmCommitDevelopmentPhase.java | 18 +-
.../release/phase/ScmCommitReleasePhase.java | 14 +-
.../release/phase/ScmCommitRollbackPhase.java | 14 +-
.../maven/shared/release/phase/ScmTagPhase.java | 168 +-
.../release/policies/DefaultNamingPolicy.java | 12 +-
.../release/policies/DefaultVersionPolicy.java | 24 +-
.../shared/release/scm/ClearCaseScmTranslator.java | 28 +-
.../maven/shared/release/scm/CvsScmTranslator.java | 28 +-
.../scm/DefaultScmRepositoryConfigurator.java | 147 +-
.../maven/shared/release/scm/GitScmTranslator.java | 21 +-
.../maven/shared/release/scm/HgScmTranslator.java | 21 +-
.../maven/shared/release/scm/IdentifiedScm.java | 13 +-
.../shared/release/scm/JazzScmTranslator.java | 50 +-
.../release/scm/ReleaseScmCommandException.java | 14 +-
.../release/scm/ReleaseScmRepositoryException.java | 29 +-
.../release/scm/ScmRepositoryConfigurator.java | 17 +-
.../maven/shared/release/scm/ScmTranslator.java | 14 +-
.../release/scm/SubversionScmTranslator.java | 26 +-
.../shared/release/strategies/DefaultStrategy.java | 77 +-
.../shared/release/transform/MavenCoordinate.java | 8 +-
.../maven/shared/release/transform/ModelETL.java | 10 +-
.../shared/release/transform/ModelETLFactory.java | 8 +-
.../shared/release/transform/ModelETLRequest.java | 21 +-
.../shared/release/transform/jdom2/JDomBuild.java | 181 +-
.../release/transform/jdom2/JDomDependency.java | 76 +-
.../transform/jdom2/JDomDependencyManagement.java | 40 +-
.../release/transform/jdom2/JDomExtension.java | 34 +-
.../transform/jdom2/JDomMavenCoordinate.java | 43 +-
.../shared/release/transform/jdom2/JDomModel.java | 172 +-
.../release/transform/jdom2/JDomModelBase.java | 58 +-
.../release/transform/jdom2/JDomModelETL.java | 168 +-
.../transform/jdom2/JDomModelETLFactory.java | 19 +-
.../shared/release/transform/jdom2/JDomParent.java | 38 +-
.../shared/release/transform/jdom2/JDomPlugin.java | 95 +-
.../transform/jdom2/JDomPluginManagement.java | 45 +-
.../release/transform/jdom2/JDomProfile.java | 21 +-
.../release/transform/jdom2/JDomProperties.java | 76 +-
.../release/transform/jdom2/JDomReportPlugin.java | 74 +-
.../release/transform/jdom2/JDomReporting.java | 57 +-
.../shared/release/transform/jdom2/JDomScm.java | 41 +-
.../shared/release/transform/jdom2/JDomUtils.java | 98 +-
.../maven/shared/release/util/MavenCrypto.java | 116 +-
.../maven/shared/release/util/PomFinder.java | 172 +-
.../maven/shared/release/util/ReleaseUtil.java | 153 +-
.../release/versions/DefaultVersionInfo.java | 295 ++-
.../maven/shared/release/versions/VersionInfo.java | 7 +-
.../shared/release/DefaultReleaseManagerTest.java | 970 ++++----
.../maven/shared/release/PlexusJUnit4TestCase.java | 233 +-
.../PropertiesReleaseDescriptorStoreTest.java | 567 +++--
.../config/ReleaseDescriptorBuilderTest.java | 46 +-
.../release/config/ReleaseDescriptorStoreStub.java | 21 +-
.../shared/release/config/ReleaseUtilsTest.java | 390 ++--
.../release/exec/AbstractMavenExecutorTest.java | 188 +-
.../release/exec/CommandLineFactoryTest.java | 25 +-
.../release/exec/ForkedMavenExecutorTest.java | 479 ++--
.../release/exec/InvokerMavenExecutorTest.java | 82 +-
.../maven/shared/release/exec/TeeConsumerTest.java | 26 +-
.../shared/release/exec/TeeOutputStreamTest.java | 22 +-
.../release/phase/AbstractBackupPomsPhaseTest.java | 56 +-
...tractEditModeRewritingReleasePhaseTestCase.java | 202 +-
.../release/phase/AbstractReleaseTestCase.java | 343 ++-
.../AbstractRewritingReleasePhaseTestCase.java | 800 +++----
.../release/phase/AbstractScmCommitPhaseTest.java | 89 +-
.../phase/BranchInputVariablesPhaseTest.java | 315 ++-
.../phase/CheckDependencySnapshotsPhaseTest.java | 1319 +++++------
.../shared/release/phase/CheckPomPhaseTest.java | 249 ++-
.../release/phase/CheckoutProjectFromScmTest.java | 290 ++-
.../release/phase/CreateBackupPomsPhaseTest.java | 95 +-
.../shared/release/phase/EndReleasePhaseTest.java | 39 +-
.../phase/GenerateReleasePomsPhaseTest.java | 248 +--
.../shared/release/phase/HasCommandParameter.java | 23 +-
.../release/phase/InputVariablesPhaseTest.java | 370 ++--
.../shared/release/phase/IsScmBranchEquals.java | 16 +-
.../release/phase/IsScmBranchParametersEquals.java | 23 +-
.../shared/release/phase/IsScmFileSetEquals.java | 29 +-
.../maven/shared/release/phase/IsScmTagEquals.java | 18 +-
.../release/phase/IsScmTagParametersEquals.java | 24 +-
.../phase/MapDevelopmentVersionPhaseIT.java | 40 +-
.../shared/release/phase/MapVersionsPhaseTest.java | 2340 +++++++++++---------
.../shared/release/phase/ReleasePhaseStub.java | 41 +-
.../release/phase/RemoveReleasePomsPhaseTest.java | 224 +-
.../release/phase/RemoveScmTagPhaseTest.java | 232 +-
.../release/phase/RestoreBackupPomsPhaseTest.java | 70 +-
.../phase/RewritePomsForBranchPhaseTest.java | 468 ++--
.../phase/RewritePomsForDevelopmentPhaseTest.java | 453 ++--
.../phase/RewritePomsForReleasePhaseTest.java | 489 ++--
.../release/phase/RunCompleteGoalsPhaseTest.java | 244 +-
.../release/phase/RunPerformGoalsPhaseTest.java | 484 ++--
.../release/phase/RunPrepareGoalsPhaseTest.java | 247 ++-
.../shared/release/phase/ScmBranchPhaseTest.java | 501 +++--
.../phase/ScmCheckModificationsPhaseTest.java | 432 ++--
.../phase/ScmCommitDevelopmentPhaseTest.java | 168 +-
.../phase/ScmCommitPreparationPhaseTest.java | 607 +++--
.../shared/release/phase/ScmTagPhaseTest.java | 514 +++--
.../release/policies/DefaultNamingPolicyTest.java | 29 +-
.../release/policies/DefaultVersionPolicyTest.java | 58 +-
.../release/scm/ClearCaseScmTranslatorTest.java | 32 +-
.../shared/release/scm/CvsScmTranslatorTest.java | 32 +-
.../scm/DefaultScmRepositoryConfiguratorTest.java | 192 +-
.../shared/release/scm/GitScmTranslatorTest.java | 35 +-
.../shared/release/scm/HgScmTranslatorTest.java | 32 +-
.../shared/release/scm/JazzScmTranslatorTest.java | 48 +-
.../release/scm/SubversionScmTranslatorTest.java | 34 +-
.../shared/release/stubs/MavenExecutorWrapper.java | 29 +-
.../shared/release/stubs/NamingPolicyStub.java | 14 +-
.../maven/shared/release/stubs/ScmManagerStub.java | 47 +-
.../release/transform/jdom2/JDomBuildTest.java | 321 ++-
.../jdom2/JDomDependencyManagementTest.java | 62 +-
.../transform/jdom2/JDomDependencyTest.java | 180 +-
.../release/transform/jdom2/JDomExtensionTest.java | 78 +-
.../release/transform/jdom2/JDomModelTest.java | 79 +-
.../release/transform/jdom2/JDomParentTest.java | 86 +-
.../transform/jdom2/JDomPropertiesTest.java | 141 +-
.../release/transform/jdom2/JDomScmTest.java | 120 +-
.../maven/shared/release/util/PomFinderTest.java | 43 +-
.../maven/shared/release/util/ReleaseUtilTest.java | 266 ++-
.../release/versions/DefaultVersionInfoTest.java | 440 ++--
maven-release-plugin/pom.xml | 51 +-
.../maven/plugins/release/AbstractReleaseMojo.java | 148 +-
.../plugins/release/AbstractScmReleaseMojo.java | 122 +-
.../maven/plugins/release/BranchReleaseMojo.java | 138 +-
.../maven/plugins/release/CleanReleaseMojo.java | 37 +-
.../maven/plugins/release/PerformReleaseMojo.java | 128 +-
.../maven/plugins/release/PrepareReleaseMojo.java | 227 +-
.../plugins/release/PrepareWithPomReleaseMojo.java | 17 +-
.../maven/plugins/release/RollbackReleaseMojo.java | 47 +-
.../maven/plugins/release/StageReleaseMojo.java | 33 +-
.../maven/plugins/release/UpdateVersionsMojo.java | 75 +-
.../plugins/release/CleanReleaseMojoTest.java | 51 +-
.../plugins/release/PerformReleaseMojoTest.java | 445 ++--
.../plugins/release/PrepareReleaseMojoTest.java | 446 ++--
.../plugins/release/StageReleaseMojoTest.java | 103 +-
.../stubs/FlatMultiModuleMavenProjectStub.java | 71 +-
.../plugins/release/stubs/MavenProjectStub.java | 42 +-
.../maven-release-oddeven-policy/pom.xml | 8 +-
.../policy/oddeven/OddEvenVersionPolicy.java | 95 +-
.../release/policy/oddeven/package-info.java | 4 -
.../oddeven/OddEvenVersionPolicyTestCase.java | 49 +-
.../maven-release-semver-policy/pom.xml | 7 +-
.../release/policy/semver/SemVerVersionPolicy.java | 50 +-
.../policy/semver/SemVerVersionPolicyTest.java | 37 +-
pom.xml | 102 +-
228 files changed, 14167 insertions(+), 17603 deletions(-)
diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
index 543900c3..cae47978 100644
--- a/maven-release-api/pom.xml
+++ b/maven-release-api/pom.xml
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
index de529f9b..c121f2e5 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,21 +16,19 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
/**
* Exception occurring during release execution.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ReleaseExecutionException
- extends Exception
-{
+public class ReleaseExecutionException extends Exception {
/**
* Creates a new instance of <code>ReleaseExecutionException</code> without detail message.
*/
- public ReleaseExecutionException( String message )
- {
- super( message );
+ public ReleaseExecutionException(String message) {
+ super(message);
}
/**
@@ -40,8 +36,7 @@ public class ReleaseExecutionException
*
* @param message the detail message.
*/
- public ReleaseExecutionException( String message, Throwable cause )
- {
- super( message, cause );
+ public ReleaseExecutionException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
index b93f4ef8..342eda4c 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,17 +16,15 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
/**
* A failure during the release process.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ReleaseFailureException
- extends Exception
-{
- public ReleaseFailureException( String message )
- {
- super( message );
+public class ReleaseFailureException extends Exception {
+ public ReleaseFailureException(String message) {
+ super(message);
}
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseResult.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
index 62fde5cd..57f3f4c1 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -25,8 +24,7 @@ import java.io.PrintStream;
/**
* @author Edwin Punzalan
*/
-public class ReleaseResult
-{
+public class ReleaseResult {
/** The result of the release. */
public static final int UNDEFINED = -1;
/** The release was successful. */
@@ -42,32 +40,29 @@ public class ReleaseResult
private long endTime;
- private static final String LS = System.getProperty( "line.separator" );
+ private static final String LS = System.getProperty("line.separator");
/**
* Append Info message to the output.
* @param message the message to append
*/
- public void appendInfo( String message )
- {
- stdOut.append( "[INFO] " ).append( message ).append( LS );
+ public void appendInfo(String message) {
+ stdOut.append("[INFO] ").append(message).append(LS);
}
/**
* Append warning message to the output.
* @param message the message to append
*/
- public void appendWarn( String message )
- {
- stdOut.append( "[WARN] " ).append( message ).append( LS );
+ public void appendWarn(String message) {
+ stdOut.append("[WARN] ").append(message).append(LS);
}
/**
* Append debug message to the output.
* @param message the message to append
*/
- public void appendDebug( String message )
- {
- stdOut.append( "[DEBUG] " ).append( message ).append( LS );
+ public void appendDebug(String message) {
+ stdOut.append("[DEBUG] ").append(message).append(LS);
}
/**
@@ -75,11 +70,10 @@ public class ReleaseResult
* @param message the message to append
* @param e the exception to append
*/
- public void appendDebug( String message, Exception e )
- {
- appendDebug( message );
+ public void appendDebug(String message, Exception e) {
+ appendDebug(message);
- stdOut.append( getStackTrace( e ) ).append( LS );
+ stdOut.append(getStackTrace(e)).append(LS);
}
/**
@@ -87,11 +81,10 @@ public class ReleaseResult
*
* @param message the message to append
*/
- public void appendError( String message )
- {
- stdOut.append( "[ERROR] " ).append( message ).append( LS );
+ public void appendError(String message) {
+ stdOut.append("[ERROR] ").append(message).append(LS);
- setResultCode( ERROR );
+ setResultCode(ERROR);
}
/**
@@ -99,9 +92,8 @@ public class ReleaseResult
*
* @param e the exception to append
*/
- public void appendError( Exception e )
- {
- appendError( getStackTrace( e ) );
+ public void appendError(Exception e) {
+ appendError(getStackTrace(e));
}
/**
@@ -110,11 +102,10 @@ public class ReleaseResult
* @param message the message to append
* @param e the exception to append
*/
- public void appendError( String message, Exception e )
- {
- appendError( message );
+ public void appendError(String message, Exception e) {
+ appendError(message);
- stdOut.append( getStackTrace( e ) ).append( LS );
+ stdOut.append(getStackTrace(e)).append(LS);
}
/**
@@ -122,53 +113,44 @@ public class ReleaseResult
*
* @param message the message to append
*/
- public void appendOutput( String message )
- {
- stdOut.append( message );
+ public void appendOutput(String message) {
+ stdOut.append(message);
}
- public String getOutput()
- {
+ public String getOutput() {
return stdOut.toString();
}
- public int getResultCode()
- {
+ public int getResultCode() {
return resultCode;
}
- public void setResultCode( int resultCode )
- {
+ public void setResultCode(int resultCode) {
this.resultCode = resultCode;
}
- public long getStartTime()
- {
+ public long getStartTime() {
return startTime;
}
- public void setStartTime( long startTime )
- {
+ public void setStartTime(long startTime) {
this.startTime = startTime;
}
- public long getEndTime()
- {
+ public long getEndTime() {
return endTime;
}
- public void setEndTime( long endTime )
- {
+ public void setEndTime(long endTime) {
this.endTime = endTime;
}
- private String getStackTrace( Exception e )
- {
+ private String getStackTrace(Exception e) {
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
- PrintStream stream = new PrintStream( byteStream );
+ PrintStream stream = new PrintStream(byteStream);
- e.printStackTrace( stream );
+ e.printStackTrace(stream);
stream.flush();
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
index 26a078d8..ed653c74 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.config;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.config;
import java.util.List;
@@ -28,8 +27,7 @@ import org.apache.maven.model.Scm;
*
* @author Robert Scholte
*/
-public interface ReleaseDescriptor
-{
+public interface ReleaseDescriptor {
/**
* Get if updateDependencies is false, dependencies version won't be updated to the next development version.
*
@@ -117,7 +115,6 @@ public interface ReleaseDescriptor
*/
boolean isRemoteTagging();
-
/**
* Get if the scm provider should sign the tag. NOTE: currently only implemented with git-exe.
*
@@ -446,7 +443,7 @@ public interface ReleaseDescriptor
* @return {@code String} The original version for the resolved snapshot dependency.
* @param artifactKey the artifact key {@code String}
*/
- String getDependencyOriginalVersion( String artifactKey );
+ String getDependencyOriginalVersion(String artifactKey);
/**
* <p>getDependencyReleaseVersion.</p>
@@ -454,7 +451,7 @@ public interface ReleaseDescriptor
* @return {@code String} the release version for the resolved snapshot dependency.
* @param artifactKey the artifact key {@code String}
*/
- String getDependencyReleaseVersion( String artifactKey );
+ String getDependencyReleaseVersion(String artifactKey);
/**
* <p>getDependencyDevelopmentVersion.</p>
@@ -462,8 +459,7 @@ public interface ReleaseDescriptor
* @return {@code String} the release version for the resolved snapshot dependency.
* @param artifactKey the artifact key {@code String}
*/
- String getDependencyDevelopmentVersion( String artifactKey );
-
+ String getDependencyDevelopmentVersion(String artifactKey);
/**
* <p>getProjectOriginalVersion.</p>
@@ -471,7 +467,7 @@ public interface ReleaseDescriptor
* @param projectKey a {@link java.lang.String} object
* @return a {@link java.lang.String} object
*/
- String getProjectOriginalVersion( String projectKey );
+ String getProjectOriginalVersion(String projectKey);
/**
* <p>getProjectDevelopmentVersion.</p>
@@ -479,7 +475,7 @@ public interface ReleaseDescriptor
* @param projectKey a {@link java.lang.String} object
* @return a {@link java.lang.String} object
*/
- String getProjectDevelopmentVersion( String projectKey );
+ String getProjectDevelopmentVersion(String projectKey);
/**
* <p>getProjectReleaseVersion.</p>
@@ -487,7 +483,7 @@ public interface ReleaseDescriptor
* @param key a {@link java.lang.String} object
* @return a {@link java.lang.String} object
*/
- String getProjectReleaseVersion( String key );
+ String getProjectReleaseVersion(String key);
/**
* <p>getOriginalScmInfo.</p>
@@ -495,7 +491,7 @@ public interface ReleaseDescriptor
* @param projectKey the project key {@code String}
* @return the original {@code Scm} information.
*/
- Scm getOriginalScmInfo( String projectKey );
+ Scm getOriginalScmInfo(String projectKey);
/**
* <p>hasOriginalScmInfo.</p>
@@ -503,8 +499,7 @@ public interface ReleaseDescriptor
* @param projectKey the project key {@code String}
* @return has original Scm info.
*/
- boolean hasOriginalScmInfo( String projectKey );
-
+ boolean hasOriginalScmInfo(String projectKey);
// Modifiable
/**
@@ -513,7 +508,7 @@ public interface ReleaseDescriptor
* @param versionlessKey a {@link java.lang.String} object
* @param string a {@link java.lang.String} object
*/
- void addDependencyOriginalVersion( String versionlessKey, String string );
+ void addDependencyOriginalVersion(String versionlessKey, String string);
/**
* <p>addDependencyReleaseVersion.</p>
@@ -521,7 +516,7 @@ public interface ReleaseDescriptor
* @param versionlessKey a {@link java.lang.String} object
* @param version a {@link java.lang.String} object
*/
- void addDependencyReleaseVersion( String versionlessKey, String version );
+ void addDependencyReleaseVersion(String versionlessKey, String version);
/**
* <p>addDependencyDevelopmentVersion.</p>
@@ -529,7 +524,7 @@ public interface ReleaseDescriptor
* @param versionlessKey a {@link java.lang.String} object
* @param version a {@link java.lang.String} object
*/
- void addDependencyDevelopmentVersion( String versionlessKey, String version );
+ void addDependencyDevelopmentVersion(String versionlessKey, String version);
/**
* <p>addReleaseVersion.</p>
@@ -537,7 +532,7 @@ public interface ReleaseDescriptor
* @param projectId a {@link java.lang.String} object
* @param nextVersion a {@link java.lang.String} object
*/
- void addReleaseVersion( String projectId, String nextVersion );
+ void addReleaseVersion(String projectId, String nextVersion);
/**
* <p>addDevelopmentVersion.</p>
@@ -545,35 +540,35 @@ public interface ReleaseDescriptor
* @param projectId a {@link java.lang.String} object
* @param nextVersion a {@link java.lang.String} object
*/
- void addDevelopmentVersion( String projectId, String nextVersion );
+ void addDevelopmentVersion(String projectId, String nextVersion);
/**
* <p>setScmReleaseLabel.</p>
*
* @param tag a {@link java.lang.String} object
*/
- void setScmReleaseLabel( String tag );
+ void setScmReleaseLabel(String tag);
/**
* <p>setScmReleasedPomRevision.</p>
*
* @param scmRevision a {@link java.lang.String} object
*/
- void setScmReleasedPomRevision( String scmRevision );
+ void setScmReleasedPomRevision(String scmRevision);
/**
* <p>setScmRelativePathProjectDirectory.</p>
*
* @param scmRelativePathProjectDirectory a {@link java.lang.String} object
*/
- void setScmRelativePathProjectDirectory( String scmRelativePathProjectDirectory );
+ void setScmRelativePathProjectDirectory(String scmRelativePathProjectDirectory);
/**
* <p>setScmSourceUrl.</p>
*
* @param scmUrl a {@link java.lang.String} object
*/
- void setScmSourceUrl( String scmUrl );
+ void setScmSourceUrl(String scmUrl);
/**
* Returns whether unresolved SNAPSHOT dependencies should automatically be resolved.
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
index df3ea3d9..6eae54ce 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.env;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.env;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.env;
import java.io.File;
@@ -27,8 +26,7 @@ import org.apache.maven.settings.Settings;
* <p>ReleaseEnvironment interface.</p>
*
*/
-public interface ReleaseEnvironment
-{
+public interface ReleaseEnvironment {
/** Constant <code>DEFAULT_MAVEN_EXECUTOR_ID="forked-path"</code> */
String DEFAULT_MAVEN_EXECUTOR_ID = "forked-path";
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
index 898bc0af..0422be7c 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import org.apache.maven.shared.release.ReleaseResult;
import org.slf4j.Logger;
@@ -28,13 +27,10 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public abstract class AbstractReleasePhase
- implements ReleasePhase
-{
- private final Logger logger = LoggerFactory.getLogger( getClass() );
+public abstract class AbstractReleasePhase implements ReleasePhase {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
- protected Logger getLogger()
- {
+ protected Logger getLogger() {
return logger;
}
@@ -44,10 +40,9 @@ public abstract class AbstractReleasePhase
* @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
* @param message a {@link java.lang.String} object
*/
- protected void logInfo( ReleaseResult result, String message )
- {
- result.appendInfo( message );
- getLogger().info( message );
+ protected void logInfo(ReleaseResult result, String message) {
+ result.appendInfo(message);
+ getLogger().info(message);
}
/**
@@ -56,10 +51,9 @@ public abstract class AbstractReleasePhase
* @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
* @param message a {@link java.lang.String} object
*/
- protected void logWarn( ReleaseResult result, String message )
- {
- result.appendWarn( message );
- getLogger().warn( message );
+ protected void logWarn(ReleaseResult result, String message) {
+ result.appendWarn(message);
+ getLogger().warn(message);
}
/**
@@ -68,10 +62,9 @@ public abstract class AbstractReleasePhase
* @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
* @param message a {@link java.lang.String} object
*/
- protected void logError( ReleaseResult result, String message )
- {
- result.appendWarn( message );
- getLogger().error( message );
+ protected void logError(ReleaseResult result, String message) {
+ result.appendWarn(message);
+ getLogger().error(message);
}
/**
@@ -80,10 +73,9 @@ public abstract class AbstractReleasePhase
* @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
* @param message a {@link java.lang.String} object
*/
- protected void logDebug( ReleaseResult result, String message )
- {
- result.appendDebug( message );
- getLogger().debug( message );
+ protected void logDebug(ReleaseResult result, String message) {
+ result.appendDebug(message);
+ getLogger().debug(message);
}
/**
@@ -93,10 +85,9 @@ public abstract class AbstractReleasePhase
* @param message a {@link java.lang.String} object
* @param e a {@link java.lang.Exception} object
*/
- protected void logDebug( ReleaseResult result, String message, Exception e )
- {
- result.appendDebug( message, e );
- getLogger().debug( message, e );
+ protected void logDebug(ReleaseResult result, String message, Exception e) {
+ result.appendDebug(message, e);
+ getLogger().debug(message, e);
}
/**
@@ -104,11 +95,10 @@ public abstract class AbstractReleasePhase
*
* @return a {@link org.apache.maven.shared.release.ReleaseResult} object
*/
- protected ReleaseResult getReleaseResultSuccess()
- {
+ protected ReleaseResult getReleaseResultSuccess() {
ReleaseResult result = new ReleaseResult();
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
index 1170856f..5f9359be 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
+
+import java.util.List;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -26,15 +27,12 @@ import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
-import java.util.List;
-
/**
* A phase in the release cycle.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface ReleasePhase
-{
+public interface ReleasePhase {
/**
* Execute the phase.
*
@@ -45,9 +43,11 @@ 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 )
- throws ReleaseExecutionException, ReleaseFailureException;
+ ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException, ReleaseFailureException;
/**
* Simulate the phase, but don't make any changes to the project.
@@ -59,8 +59,9 @@ 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 )
- throws ReleaseExecutionException, ReleaseFailureException;
-
+ ReleaseResult simulate(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException, ReleaseFailureException;
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
index 34e58a22..a4fb8645 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.util.List;
@@ -30,13 +29,12 @@ import org.apache.maven.shared.release.ReleaseResult;
* @author Robert Scholte
* @since 3.0.0-M5
*/
-public interface ResourceGenerator
-{
+public interface ResourceGenerator {
/**
* Clean up after a phase if it leaves any additional files in the checkout.
*
* @param reactorProjects the reactor projects
* @return the release result
*/
- ReleaseResult clean( List<MavenProject> reactorProjects );
+ ReleaseResult clean(List<MavenProject> reactorProjects);
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java
index 2531d7f0..92c8c733 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,34 +16,31 @@ package org.apache.maven.shared.release.policy;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy;
/**
* <p>PolicyException class.</p>
*
* @since 2.5.1 (MRELEASE-431)
*/
-public class PolicyException
- extends Exception
-{
+public class PolicyException extends Exception {
/**
* <p>Constructor for PolicyException.</p>
*
* @param message a {@link java.lang.String} object
*/
- public PolicyException( String message )
- {
- super( message );
+ public PolicyException(String message) {
+ super(message);
}
-
+
/**
* <p>Constructor for PolicyException.</p>
*
* @param message a {@link java.lang.String} object
* @param exception a {@link java.lang.Exception} object
*/
- public PolicyException( String message, Exception exception )
- {
- super( message, exception );
+ public PolicyException(String message, Exception exception) {
+ super(message, exception);
}
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java
index c2abbc22..22fe295c 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.naming;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.policy.naming;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy.naming;
import org.apache.maven.shared.release.policy.PolicyException;
@@ -26,8 +25,7 @@ import org.apache.maven.shared.release.policy.PolicyException;
*
* @since 3.0.0 (MRELEASE-979)
*/
-public interface NamingPolicy
-{
+public interface NamingPolicy {
/**
* <p>getName.</p>
*
@@ -35,7 +33,5 @@ public interface NamingPolicy
* @param request the {@code NamingPolicyRequest}
* @throws org.apache.maven.shared.release.policy.PolicyException if exception in the policy
*/
- NamingPolicyResult getName( NamingPolicyRequest request )
- throws PolicyException;
-
+ NamingPolicyResult getName(NamingPolicyRequest request) throws PolicyException;
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java
index 2c9df732..82e1224e 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.naming;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.policy.naming;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy.naming;
/**
* <p>NamingPolicyRequest class.</p>
@@ -25,12 +24,11 @@ package org.apache.maven.shared.release.policy.naming;
* @author Robert Scholte
* @since 3.0.0-M5
*/
-public class NamingPolicyRequest
-{
+public class NamingPolicyRequest {
private String groupId;
-
+
private String artifactId;
-
+
private String version;
/**
@@ -38,8 +36,7 @@ public class NamingPolicyRequest
*
* @return a {@link java.lang.String} object
*/
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
@@ -49,8 +46,7 @@ public class NamingPolicyRequest
* @param groupId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyRequest} object
*/
- public NamingPolicyRequest setGroupId( String groupId )
- {
+ public NamingPolicyRequest setGroupId(String groupId) {
this.groupId = groupId;
return this;
}
@@ -60,8 +56,7 @@ public class NamingPolicyRequest
*
* @return a {@link java.lang.String} object
*/
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
@@ -71,8 +66,7 @@ public class NamingPolicyRequest
* @param artifactId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyRequest} object
*/
- public NamingPolicyRequest setArtifactId( String artifactId )
- {
+ public NamingPolicyRequest setArtifactId(String artifactId) {
this.artifactId = artifactId;
return this;
}
@@ -82,8 +76,7 @@ public class NamingPolicyRequest
*
* @return a {@link java.lang.String} object
*/
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
@@ -93,8 +86,7 @@ public class NamingPolicyRequest
* @param version a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyRequest} object
*/
- public NamingPolicyRequest setVersion( String version )
- {
+ public NamingPolicyRequest setVersion(String version) {
this.version = version;
return this;
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyResult.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyResult.java
index 8920bf33..daf654d0 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyResult.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyResult.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.naming;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,14 +16,14 @@ package org.apache.maven.shared.release.policy.naming;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy.naming;
/**
* <p>NamingPolicyResult class.</p>
*
* @since 3.0.0 (MRELEASE-979)
*/
-public class NamingPolicyResult
-{
+public class NamingPolicyResult {
/**
* The tag or branch name to use.
*/
@@ -36,8 +34,7 @@ public class NamingPolicyResult
*
* @return a {@link java.lang.String} object
*/
- public String getName()
- {
+ public String getName() {
return name;
}
@@ -47,10 +44,8 @@ public class NamingPolicyResult
* @param name a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyResult} object
*/
- public NamingPolicyResult setName( String name )
- {
+ public NamingPolicyResult setName(String name) {
this.name = name;
return this;
}
-
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java
index 40c812cc..037b4de1 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.version;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.policy.version;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy.version;
import org.apache.maven.shared.release.policy.PolicyException;
import org.apache.maven.shared.release.versions.VersionParseException;
@@ -27,8 +26,7 @@ import org.apache.maven.shared.release.versions.VersionParseException;
*
* @since 2.5.1 (MRELEASE-431)
*/
-public interface VersionPolicy
-{
+public interface VersionPolicy {
/**
* <p>getReleaseVersion.</p>
*
@@ -37,8 +35,7 @@ public interface VersionPolicy
* @throws org.apache.maven.shared.release.policy.PolicyException if exception in the policy
* @throws org.apache.maven.shared.release.versions.VersionParseException if exception parsing the version
*/
- VersionPolicyResult getReleaseVersion( VersionPolicyRequest request )
- throws PolicyException, VersionParseException;
+ VersionPolicyResult getReleaseVersion(VersionPolicyRequest request) throws PolicyException, VersionParseException;
/**
* <p>getDevelopmentVersion.</p>
@@ -48,6 +45,6 @@ public interface VersionPolicy
* @throws org.apache.maven.shared.release.policy.PolicyException if exception in the policy
* @throws org.apache.maven.shared.release.versions.VersionParseException if exception parsing the version
*/
- VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request )
- throws PolicyException, VersionParseException;
+ VersionPolicyResult getDevelopmentVersion(VersionPolicyRequest request)
+ throws PolicyException, VersionParseException;
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java
index 9c771089..fffdd54f 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.version;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.policy.version;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy.version;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.scm.provider.ScmProvider;
@@ -28,11 +27,10 @@ import org.apache.maven.scm.repository.ScmRepository;
*
* @since 2.5.1 (MRELEASE-431)
*/
-public class VersionPolicyRequest
-{
+public class VersionPolicyRequest {
private String version;
-
+
private Metadata metaData;
private ScmRepository scmRepository;
@@ -46,8 +44,7 @@ public class VersionPolicyRequest
*
* @return a {@link java.lang.String} object
*/
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
@@ -57,30 +54,27 @@ public class VersionPolicyRequest
* @param version a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
*/
- public VersionPolicyRequest setVersion( String version )
- {
+ public VersionPolicyRequest setVersion(String version) {
this.version = version;
return this;
}
-
+
/**
* <p>Getter for the field <code>metaData</code>.</p>
*
* @return a {@link org.apache.maven.artifact.repository.metadata.Metadata} object
*/
- public Metadata getMetaData()
- {
+ public Metadata getMetaData() {
return metaData;
}
-
+
/**
* <p>Setter for the field <code>metaData</code>.</p>
*
* @param metaData a {@link org.apache.maven.artifact.repository.metadata.Metadata} object
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
*/
- public VersionPolicyRequest setMetaData( Metadata metaData )
- {
+ public VersionPolicyRequest setMetaData(Metadata metaData) {
this.metaData = metaData;
return this;
}
@@ -90,8 +84,7 @@ public class VersionPolicyRequest
*
* @return a {@link ScmRepository} object
*/
- public ScmRepository getScmRepository()
- {
+ public ScmRepository getScmRepository() {
return scmRepository;
}
@@ -101,8 +94,7 @@ public class VersionPolicyRequest
* @param scmRepository The {@link ScmRepository} where the history can be retrieved.
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
*/
- public VersionPolicyRequest setScmRepository( ScmRepository scmRepository )
- {
+ public VersionPolicyRequest setScmRepository(ScmRepository scmRepository) {
this.scmRepository = scmRepository;
return this;
}
@@ -112,8 +104,7 @@ public class VersionPolicyRequest
*
* @return a {@link ScmProvider} object
*/
- public ScmProvider getScmProvider()
- {
+ public ScmProvider getScmProvider() {
return scmProvider;
}
@@ -123,8 +114,7 @@ public class VersionPolicyRequest
* @param scmProvider The {@link ScmProvider} where the history can be retrieved.
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
*/
- public VersionPolicyRequest setScmProvider( ScmProvider scmProvider )
- {
+ public VersionPolicyRequest setScmProvider(ScmProvider scmProvider) {
this.scmProvider = scmProvider;
return this;
}
@@ -134,8 +124,7 @@ public class VersionPolicyRequest
*
* @return the {@link String} that contains the workingDirectory (can be null or empty).
*/
- public String getWorkingDirectory()
- {
+ public String getWorkingDirectory() {
return workingDirectory;
}
@@ -145,8 +134,7 @@ public class VersionPolicyRequest
* @param workingDirectory The {@link String} that contains the workingDirectory (can be null or empty).
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
*/
- public VersionPolicyRequest setWorkingDirectory( String workingDirectory )
- {
+ public VersionPolicyRequest setWorkingDirectory(String workingDirectory) {
this.workingDirectory = workingDirectory;
return this;
}
@@ -156,8 +144,7 @@ public class VersionPolicyRequest
*
* @return the {@link String} that contains the config (can be null or empty).
*/
- public String getConfig()
- {
+ public String getConfig() {
return config;
}
@@ -167,10 +154,8 @@ public class VersionPolicyRequest
* @param config The {@link String} that contains the config (can be null or empty).
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
*/
- public VersionPolicyRequest setConfig( String config )
- {
+ public VersionPolicyRequest setConfig(String config) {
this.config = config;
return this;
}
-
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java
index f1ccbf96..a5002d5c 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.version;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,14 +16,14 @@ package org.apache.maven.shared.release.policy.version;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.policy.version;
/**
* <p>VersionPolicyResult class.</p>
*
* @since 2.5.1 (MRELEASE-431)
*/
-public class VersionPolicyResult
-{
+public class VersionPolicyResult {
private String version;
/**
@@ -33,8 +31,7 @@ public class VersionPolicyResult
*
* @return a {@link java.lang.String} object
*/
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
@@ -44,10 +41,8 @@ public class VersionPolicyResult
* @param version a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyResult} object
*/
- public VersionPolicyResult setVersion( String version )
- {
+ public VersionPolicyResult setVersion(String version) {
this.version = version;
return this;
}
-
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
index b02b02bb..64d40d9e 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.strategy;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.strategy;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.strategy;
import java.util.List;
@@ -28,36 +27,35 @@ import java.util.List;
*
* @author Robert Scholte
*/
-public interface Strategy
-{
+public interface Strategy {
/**
* <p>getPreparePhases.</p>
*
* @return The release phases to execute the calling the prepare goal
*/
List<String> getPreparePhases();
-
+
/**
* <p>getPerformPhases.</p>
*
* @return The release phases to execute the calling the perform goal
*/
List<String> getPerformPhases();
-
+
/**
* <p>getBranchPhases.</p>
*
* @return The release phases to execute the calling the branch goal
*/
List<String> getBranchPhases();
-
+
/**
* <p>getRollbackPhases.</p>
*
* @return The release phases to execute the calling the rollback goal
*/
List<String> getRollbackPhases();
-
+
/**
* <p>getUpdateVersionsPhases.</p>
*
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java
index 7b3dd481..96941ded 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,31 +16,24 @@ package org.apache.maven.shared.release.versions;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.versions;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.InvalidVersionSpecificationException;
-class AetherVersion
- implements org.eclipse.aether.version.Version
-{
+class AetherVersion implements org.eclipse.aether.version.Version {
private final org.eclipse.aether.version.Version version;
- AetherVersion( String version )
- throws VersionParseException
- {
- try
- {
- this.version = new GenericVersionScheme().parseVersion( version );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new VersionParseException( e.getMessage() );
+ AetherVersion(String version) throws VersionParseException {
+ try {
+ this.version = new GenericVersionScheme().parseVersion(version);
+ } catch (InvalidVersionSpecificationException e) {
+ throw new VersionParseException(e.getMessage());
}
}
@Override
- public String toString()
- {
+ public String toString() {
return this.version.toString();
}
@@ -52,8 +43,7 @@ class AetherVersion
* @param other a {@link org.eclipse.aether.version.Version} object
* @return a int
*/
- public int compareTo( org.eclipse.aether.version.Version other )
- {
- return this.version.compareTo( other );
+ public int compareTo(org.eclipse.aether.version.Version other) {
+ return this.version.compareTo(other);
}
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java
index 51bc3a71..dafc9959 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,55 +16,44 @@ package org.apache.maven.shared.release.versions;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.versions;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-class MavenArtifactVersion
- implements Comparable<MavenArtifactVersion>
-{
+class MavenArtifactVersion implements Comparable<MavenArtifactVersion> {
private final ArtifactVersion version;
- MavenArtifactVersion( String version )
- {
- this.version = new DefaultArtifactVersion( version );
+ MavenArtifactVersion(String version) {
+ this.version = new DefaultArtifactVersion(version);
}
- public int compareTo( MavenArtifactVersion o )
- {
- return version.compareTo( o.version );
+ public int compareTo(MavenArtifactVersion o) {
+ return version.compareTo(o.version);
}
@Override
- public String toString()
- {
+ public String toString() {
return this.version.toString();
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return this.version.hashCode();
}
-
+
@Override
- public boolean equals( Object other )
- {
- if ( this == other )
- {
+ public boolean equals(Object other) {
+ if (this == other) {
return true;
}
- if ( other == null )
- {
+ if (other == null) {
return false;
}
- if ( other instanceof MavenArtifactVersion )
- {
- return version.equals( ( (MavenArtifactVersion) other ).version );
+ if (other instanceof MavenArtifactVersion) {
+ return version.equals(((MavenArtifactVersion) other).version);
}
return false;
}
-
-
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
index 6548e55f..c4a36a3a 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.versions;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.versions;
import java.util.Arrays;
import java.util.List;
@@ -31,9 +30,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* <p>Version class.</p>
*/
-public class Version
- implements Comparable<Version>, Cloneable
-{
+public class Version implements Comparable<Version>, Cloneable {
private final AetherVersion aetherVersion;
private final MavenArtifactVersion mavenArtifactVersion;
@@ -71,20 +68,21 @@ public class Version
private static final String SNAPSHOT_IDENTIFIER = "SNAPSHOT";
private static final String DIGIT_SEPARATOR_STRING = ".";
-
+
private static final String DEFAULT_ANNOTATION_REV_SEPARATOR = "-";
private static final String DEFAULT_BUILD_SEPARATOR = "-";
/** Constant <code>STANDARD_PATTERN</code> */
- public static final Pattern STANDARD_PATTERN = Pattern.compile( "^((?:\\d+\\.)*\\d+)" // digit(s) and '.' repeated -
- // followed by digit (version
- // digits 1.22.0, etc)
- + "([-_])?" // optional - or _ (annotation separator)
- + "([a-zA-Z]*)" // alpha characters (looking for annotation - alpha, beta, RC, etc.)
- + "([-_])?" // optional - or _ (annotation revision separator)
- + "(\\d*)" // digits (any digits after rc or beta is an annotation revision)
- + "(?:([-_])?(.*?))?$" ); // - or _ followed everything else (build specifier)
+ public static final Pattern STANDARD_PATTERN = Pattern.compile(
+ "^((?:\\d+\\.)*\\d+)" // digit(s) and '.' repeated -
+ // followed by digit (version
+ // digits 1.22.0, etc)
+ + "([-_])?" // optional - or _ (annotation separator)
+ + "([a-zA-Z]*)" // alpha characters (looking for annotation - alpha, beta, RC, etc.)
+ + "([-_])?" // optional - or _ (annotation revision separator)
+ + "(\\d*)" // digits (any digits after rc or beta is an annotation revision)
+ + "(?:([-_])?(.*?))?$"); // - or _ followed everything else (build specifier)
/* *
* cmaki 02242009 FIX for non-digit release numbers, e.g. trunk-SNAPSHOT or just SNAPSHOT This alternate pattern
@@ -92,11 +90,16 @@ public class Version
*/
// for SNAPSHOT releases only (possible versions include: trunk-SNAPSHOT or SNAPSHOT)
/** Constant <code>ALTERNATE_PATTERN</code> */
- public static final Pattern ALTERNATE_PATTERN = Pattern.compile( "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)" );
-
- private Version( List<String> digits, String annotation, String annotationRevision, String buildSpecifier,
- String annotationSeparator, String annotationRevSeparator, String buildSeparator )
- {
+ public static final Pattern ALTERNATE_PATTERN = Pattern.compile("^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)");
+
+ private Version(
+ List<String> digits,
+ String annotation,
+ String annotationRevision,
+ String buildSpecifier,
+ String annotationSeparator,
+ String annotationRevSeparator,
+ String buildSeparator) {
this.digits = digits;
this.annotation = annotation;
this.annotationRevision = annotationRevision;
@@ -104,9 +107,9 @@ public class Version
this.annotationSeparator = annotationSeparator;
this.annotationRevSeparator = annotationRevSeparator;
this.buildSeparator = buildSeparator;
- this.strVersion = getVersionString( this, buildSpecifier, buildSeparator );
+ this.strVersion = getVersionString(this, buildSpecifier, buildSeparator);
- // for now no need to reparse, original version was valid
+ // for now no need to reparse, original version was valid
this.aetherVersion = null;
this.mavenArtifactVersion = null;
}
@@ -117,18 +120,15 @@ public class Version
* @param version a {@link java.lang.String} object
* @throws org.apache.maven.shared.release.versions.VersionParseException if any.
*/
- public Version( String version )
- throws VersionParseException
- {
+ public Version(String version) throws VersionParseException {
this.strVersion = version;
- this.aetherVersion = new AetherVersion( version );
- this.mavenArtifactVersion = new MavenArtifactVersion( version );
+ this.aetherVersion = new AetherVersion(version);
+ this.mavenArtifactVersion = new MavenArtifactVersion(version);
// FIX for non-digit release numbers, e.g. trunk-SNAPSHOT or just SNAPSHOT
- Matcher matcher = ALTERNATE_PATTERN.matcher( strVersion );
+ Matcher matcher = ALTERNATE_PATTERN.matcher(strVersion);
// TODO: hack because it didn't support "SNAPSHOT"
- if ( matcher.matches() )
- {
+ if (matcher.matches()) {
annotation = null;
digits = null;
buildSpecifier = version;
@@ -136,41 +136,32 @@ public class Version
return;
}
- Matcher m = STANDARD_PATTERN.matcher( strVersion );
- if ( m.matches() )
- {
- digits = parseDigits( m.group( DIGITS_INDEX ) );
- if ( !SNAPSHOT_IDENTIFIER.equals( m.group( ANNOTATION_INDEX ) ) )
- {
- annotationSeparator = m.group( ANNOTATION_SEPARATOR_INDEX );
- annotation = nullIfEmpty( m.group( ANNOTATION_INDEX ) );
-
- if ( StringUtils.isNotEmpty( m.group( ANNOTATION_REV_SEPARATOR_INDEX ) )
- && StringUtils.isEmpty( m.group( ANNOTATION_REVISION_INDEX ) ) )
- {
- // The build separator was picked up as the annotation revision separator
- buildSeparator = m.group( ANNOTATION_REV_SEPARATOR_INDEX );
- buildSpecifier = nullIfEmpty( m.group( BUILD_SPECIFIER_INDEX ) );
- }
- else
- {
- annotationRevSeparator = m.group( ANNOTATION_REV_SEPARATOR_INDEX );
- annotationRevision = nullIfEmpty( m.group( ANNOTATION_REVISION_INDEX ) );
+ Matcher m = STANDARD_PATTERN.matcher(strVersion);
+ if (m.matches()) {
+ digits = parseDigits(m.group(DIGITS_INDEX));
+ if (!SNAPSHOT_IDENTIFIER.equals(m.group(ANNOTATION_INDEX))) {
+ annotationSeparator = m.group(ANNOTATION_SEPARATOR_INDEX);
+ annotation = nullIfEmpty(m.group(ANNOTATION_INDEX));
- buildSeparator = m.group( BUILD_SEPARATOR_INDEX );
- buildSpecifier = nullIfEmpty( m.group( BUILD_SPECIFIER_INDEX ) );
+ if (StringUtils.isNotEmpty(m.group(ANNOTATION_REV_SEPARATOR_INDEX))
+ && StringUtils.isEmpty(m.group(ANNOTATION_REVISION_INDEX))) {
+ // The build separator was picked up as the annotation revision separator
+ buildSeparator = m.group(ANNOTATION_REV_SEPARATOR_INDEX);
+ buildSpecifier = nullIfEmpty(m.group(BUILD_SPECIFIER_INDEX));
+ } else {
+ annotationRevSeparator = m.group(ANNOTATION_REV_SEPARATOR_INDEX);
+ annotationRevision = nullIfEmpty(m.group(ANNOTATION_REVISION_INDEX));
+
+ buildSeparator = m.group(BUILD_SEPARATOR_INDEX);
+ buildSpecifier = nullIfEmpty(m.group(BUILD_SPECIFIER_INDEX));
}
- }
- else
- {
+ } else {
// Annotation was "SNAPSHOT" so populate the build specifier with that data
- buildSeparator = m.group( ANNOTATION_SEPARATOR_INDEX );
- buildSpecifier = nullIfEmpty( m.group( ANNOTATION_INDEX ) );
+ buildSeparator = m.group(ANNOTATION_SEPARATOR_INDEX);
+ buildSpecifier = nullIfEmpty(m.group(ANNOTATION_INDEX));
}
- }
- else
- {
- throw new VersionParseException( "Unable to parse the version string: \"" + version + "\"" );
+ } else {
+ throw new VersionParseException("Unable to parse the version string: \"" + version + "\"");
}
}
@@ -179,9 +170,8 @@ public class Version
*
* @return a boolean
*/
- public boolean isSnapshot()
- {
- return ArtifactUtils.isSnapshot( strVersion );
+ public boolean isSnapshot() {
+ return ArtifactUtils.isSnapshot(strVersion);
}
/**
@@ -189,8 +179,7 @@ public class Version
*
* @return a {@link java.lang.String} object
*/
- public String toString()
- {
+ public String toString() {
return strVersion;
}
@@ -202,38 +191,30 @@ public class Version
* @param buildSeparator a {@link java.lang.String} object
* @return a {@link java.lang.String} object
*/
- protected static String getVersionString( Version info, String buildSpecifier, String buildSeparator )
- {
+ protected static String getVersionString(Version info, String buildSpecifier, String buildSeparator) {
StringBuilder sb = new StringBuilder();
- if ( info.digits != null )
- {
- sb.append( joinDigitString( info.digits ) );
+ if (info.digits != null) {
+ sb.append(joinDigitString(info.digits));
}
- if ( StringUtils.isNotEmpty( info.annotation ) )
- {
- sb.append( StringUtils.defaultString( info.annotationSeparator ) );
- sb.append( info.annotation );
+ if (StringUtils.isNotEmpty(info.annotation)) {
+ sb.append(StringUtils.defaultString(info.annotationSeparator));
+ sb.append(info.annotation);
}
- if ( StringUtils.isNotEmpty( info.annotationRevision ) )
- {
- if ( StringUtils.isEmpty( info.annotation ) )
- {
- sb.append( StringUtils.defaultString( info.annotationSeparator ) );
- }
- else
- {
- sb.append( StringUtils.defaultString( info.annotationRevSeparator ) );
+ if (StringUtils.isNotEmpty(info.annotationRevision)) {
+ if (StringUtils.isEmpty(info.annotation)) {
+ sb.append(StringUtils.defaultString(info.annotationSeparator));
+ } else {
+ sb.append(StringUtils.defaultString(info.annotationRevSeparator));
}
- sb.append( info.annotationRevision );
+ sb.append(info.annotationRevision);
}
- if ( StringUtils.isNotEmpty( buildSpecifier ) )
- {
- sb.append( StringUtils.defaultString( buildSeparator ) );
- sb.append( buildSpecifier );
+ if (StringUtils.isNotEmpty(buildSpecifier)) {
+ sb.append(StringUtils.defaultString(buildSeparator));
+ sb.append(buildSpecifier);
}
return sb.toString();
@@ -245,24 +226,21 @@ public class Version
* @return a {@code String} containing the items in the list joined by "." period
* @param digits the list of digits {@code List<String>}
*/
- protected static String joinDigitString( List<String> digits )
- {
- return digits != null ? StringUtils.join( digits.iterator(), DIGIT_SEPARATOR_STRING ) : null;
+ protected static String joinDigitString(List<String> digits) {
+ return digits != null ? StringUtils.join(digits.iterator(), DIGIT_SEPARATOR_STRING) : null;
}
/**
* Splits the string on "." and returns a list containing each digit.
- *
+ *
* @param strDigits
*/
- private List<String> parseDigits( String strDigits )
- {
- return Arrays.asList( StringUtils.split( strDigits, DIGIT_SEPARATOR_STRING ) );
+ private List<String> parseDigits(String strDigits) {
+ return Arrays.asList(StringUtils.split(strDigits, DIGIT_SEPARATOR_STRING));
}
- private static String nullIfEmpty( String s )
- {
- return StringUtils.isEmpty( s ) ? null : s;
+ private static String nullIfEmpty(String s) {
+ return StringUtils.isEmpty(s) ? null : s;
}
/**
@@ -270,18 +248,16 @@ public class Version
*
* @return a {@link java.util.List} object
*/
- public List<String> getDigits()
- {
+ public List<String> getDigits() {
return digits;
}
-
+
/**
* <p>Getter for the field <code>annotation</code>.</p>
*
* @return a {@link java.lang.String} object
*/
- public String getAnnotation()
- {
+ public String getAnnotation() {
return annotation;
}
@@ -290,8 +266,7 @@ public class Version
*
* @return a {@link java.lang.String} object
*/
- public String getAnnotationRevSeparator()
- {
+ public String getAnnotationRevSeparator() {
return annotationRevSeparator;
}
@@ -300,8 +275,7 @@ public class Version
*
* @return a {@link java.lang.String} object
*/
- public String getAnnotationRevision()
- {
+ public String getAnnotationRevision() {
return annotationRevision;
}
@@ -310,8 +284,7 @@ public class Version
*
* @return a {@link java.lang.String} object
*/
- public String getBuildSeparator()
- {
+ public String getBuildSeparator() {
return buildSeparator;
}
@@ -320,48 +293,59 @@ public class Version
*
* @return a {@link java.lang.String} object
*/
- public String getBuildSpecifier()
- {
+ public String getBuildSpecifier() {
return buildSpecifier;
}
-
+
/**
* <p>Setter for the field <code>digits</code>.</p>
*
* @param newDigits the new list of digits
* @return a new instance of Version
*/
- public Version setDigits( List<String> newDigits )
- {
- return new Version( newDigits, this.annotation, this.annotationRevision, this.buildSpecifier,
- this.annotationSeparator, this.annotationRevSeparator, this.buildSeparator );
+ public Version setDigits(List<String> newDigits) {
+ return new Version(
+ newDigits,
+ this.annotation,
+ this.annotationRevision,
+ this.buildSpecifier,
+ this.annotationSeparator,
+ this.annotationRevSeparator,
+ this.buildSeparator);
}
-
+
/**
* <p>Setter for the field <code>annotationRevision</code>.</p>
*
* @param newAnnotationRevision the new annotation revision
* @return a new instance of Version
*/
- public Version setAnnotationRevision( String newAnnotationRevision )
- {
- return new Version( this.digits, this.annotation, newAnnotationRevision, this.buildSpecifier,
- this.annotationSeparator,
- Objects.toString( this.annotationRevSeparator, DEFAULT_ANNOTATION_REV_SEPARATOR ),
- this.buildSeparator );
+ public Version setAnnotationRevision(String newAnnotationRevision) {
+ return new Version(
+ this.digits,
+ this.annotation,
+ newAnnotationRevision,
+ this.buildSpecifier,
+ this.annotationSeparator,
+ Objects.toString(this.annotationRevSeparator, DEFAULT_ANNOTATION_REV_SEPARATOR),
+ this.buildSeparator);
}
-
+
/**
* <p>Setter for the field <code>buildSpecifier</code>.</p>
*
* @param newBuildSpecifier the new build specifier
* @return a new instance of Version
*/
- public Version setBuildSpecifier( String newBuildSpecifier )
- {
- return new Version( this.digits, this.annotation, this.annotationRevision, newBuildSpecifier,
- this.annotationSeparator, this.annotationRevSeparator,
- Objects.toString( this.buildSeparator, DEFAULT_BUILD_SEPARATOR ) );
+ public Version setBuildSpecifier(String newBuildSpecifier) {
+ return new Version(
+ this.digits,
+ this.annotation,
+ this.annotationRevision,
+ newBuildSpecifier,
+ this.annotationSeparator,
+ this.annotationRevSeparator,
+ Objects.toString(this.buildSeparator, DEFAULT_BUILD_SEPARATOR));
}
/**
@@ -373,29 +357,19 @@ public class Version
* @param other a {@link org.apache.maven.shared.release.versions.Version} object
* @return a int
*/
- public int compareTo( Version other )
- throws VersionComparisonConflictException
- {
- int aetherComparisonResult = this.aetherVersion.compareTo( other.aetherVersion );
- int mavenComparisonResult = this.mavenArtifactVersion.compareTo( other.mavenArtifactVersion );
-
- if ( aetherComparisonResult < 0 && mavenComparisonResult < 0 )
- {
+ public int compareTo(Version other) throws VersionComparisonConflictException {
+ int aetherComparisonResult = this.aetherVersion.compareTo(other.aetherVersion);
+ int mavenComparisonResult = this.mavenArtifactVersion.compareTo(other.mavenArtifactVersion);
+
+ if (aetherComparisonResult < 0 && mavenComparisonResult < 0) {
return -1;
- }
- else if ( aetherComparisonResult == 0 && mavenComparisonResult == 0 )
- {
+ } else if (aetherComparisonResult == 0 && mavenComparisonResult == 0) {
return 0;
- }
- else if ( aetherComparisonResult > 0 && mavenComparisonResult > 0 )
- {
+ } else if (aetherComparisonResult > 0 && mavenComparisonResult > 0) {
return 1;
- }
- else
- {
- throw new VersionComparisonConflictException( this.strVersion, other.strVersion, aetherComparisonResult,
- mavenComparisonResult );
+ } else {
+ throw new VersionComparisonConflictException(
+ this.strVersion, other.strVersion, aetherComparisonResult, mavenComparisonResult);
}
}
-
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java
index 80011ac9..9dc2c010 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,12 @@ package org.apache.maven.shared.release.versions;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.versions;
/**
* <p>VersionComparisonConflictException class.</p>
*/
-public class VersionComparisonConflictException
- extends RuntimeException
-{
+public class VersionComparisonConflictException extends RuntimeException {
private final String lhsVersion;
@@ -42,9 +39,8 @@ public class VersionComparisonConflictException
* @param aetherComparisonResult a int
* @param mavenComparisonResult a int
*/
- public VersionComparisonConflictException( String lhsVersion, String rhsVersion, int aetherComparisonResult,
- int mavenComparisonResult )
- {
+ public VersionComparisonConflictException(
+ String lhsVersion, String rhsVersion, int aetherComparisonResult, int mavenComparisonResult) {
this.lhsVersion = lhsVersion;
this.rhsVersion = rhsVersion;
this.aetherComparisonResult = aetherComparisonResult;
@@ -52,10 +48,8 @@ public class VersionComparisonConflictException
}
@Override
- public String getMessage()
- {
+ public String getMessage() {
return "Conflict when comparing " + lhsVersion + " with " + rhsVersion + "; Aether: " + aetherComparisonResult
- + "; Maven: " + mavenComparisonResult;
+ + "; Maven: " + mavenComparisonResult;
}
-
}
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java
index ec8ed5d4..5ca0f6f4 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,21 +16,19 @@ package org.apache.maven.shared.release.versions;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.versions;
/**
* <p>VersionParseException class.</p>
*/
-public class VersionParseException
- extends Exception
-{
+public class VersionParseException extends Exception {
/**
* <p>Constructor for VersionParseException.</p>
*
* @param message a {@link java.lang.String} object
*/
- public VersionParseException( String message )
- {
- super( message );
+ public VersionParseException(String message) {
+ super(message);
}
/**
@@ -40,8 +36,7 @@ public class VersionParseException
*
* @param message a {@link java.lang.String} object
*/
- public VersionParseException( String message, Throwable e )
- {
- super( message, e );
+ public VersionParseException(String message, Throwable e) {
+ super(message, e);
}
}
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 7488a60d..c68edcd6 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
+<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -240,13 +239,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<version>3.0.0</version>
<packageWithVersion>false</packageWithVersion>
@@ -254,6 +246,13 @@
<model>src/main/mdo/release-descriptor.mdo</model>
</models>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java
index d1314c2a..6184016f 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.util.List;
@@ -30,8 +29,7 @@ import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
* @author Robert Scholte
* @since 2.3
*/
-public abstract class AbstractReleaseRequest
-{
+public abstract class AbstractReleaseRequest {
private ReleaseDescriptorBuilder releaseDescriptorBuilder;
private List<MavenProject> reactorProjects;
@@ -43,8 +41,7 @@ public abstract class AbstractReleaseRequest
*
* @return the releaseDescriptor
*/
- public ReleaseDescriptorBuilder getReleaseDescriptorBuilder()
- {
+ public ReleaseDescriptorBuilder getReleaseDescriptorBuilder() {
return releaseDescriptorBuilder;
}
@@ -53,8 +50,7 @@ public abstract class AbstractReleaseRequest
*
* @param releaseDescriptor the releaseDescriptor to set
*/
- public void setReleaseDescriptorBuilder( ReleaseDescriptorBuilder releaseDescriptor )
- {
+ public void setReleaseDescriptorBuilder(ReleaseDescriptorBuilder releaseDescriptor) {
this.releaseDescriptorBuilder = releaseDescriptor;
}
@@ -63,8 +59,7 @@ public abstract class AbstractReleaseRequest
*
* @return the reactorProjects
*/
- public List<MavenProject> getReactorProjects()
- {
+ public List<MavenProject> getReactorProjects() {
return reactorProjects;
}
@@ -73,8 +68,7 @@ public abstract class AbstractReleaseRequest
*
* @param reactorProjects the reactorProjects to set
*/
- public void setReactorProjects( List<MavenProject> reactorProjects )
- {
+ public void setReactorProjects(List<MavenProject> reactorProjects) {
this.reactorProjects = reactorProjects;
}
@@ -83,8 +77,7 @@ public abstract class AbstractReleaseRequest
*
* @return the releaseManagerListener
*/
- public ReleaseManagerListener getReleaseManagerListener()
- {
+ public ReleaseManagerListener getReleaseManagerListener() {
return releaseManagerListener;
}
@@ -93,8 +86,7 @@ public abstract class AbstractReleaseRequest
*
* @param releaseManagerListener the releaseManagerListener to set
*/
- public void setReleaseManagerListener( ReleaseManagerListener releaseManagerListener )
- {
+ public void setReleaseManagerListener(ReleaseManagerListener releaseManagerListener) {
this.releaseManagerListener = releaseManagerListener;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index 3ad03bd7..6358f241 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import javax.inject.Inject;
import javax.inject.Named;
@@ -55,10 +54,8 @@ import static java.util.Objects.requireNonNull;
*/
@Singleton
@Named
-public class DefaultReleaseManager
- implements ReleaseManager
-{
- private final Logger logger = LoggerFactory.getLogger( getClass() );
+public class DefaultReleaseManager implements ReleaseManager {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private final Map<String, Strategy> strategies;
@@ -73,464 +70,382 @@ public class DefaultReleaseManager
private final AtomicReference<ReleaseDescriptorStore> configStore;
@Inject
- public DefaultReleaseManager( Map<String, Strategy> strategies,
- Map<String, ReleasePhase> releasePhases,
- @Named( "properties" ) ReleaseDescriptorStore configStore )
- {
- this.strategies = requireNonNull( strategies );
- this.releasePhases = requireNonNull( releasePhases );
- this.configStore = new AtomicReference<>( requireNonNull( configStore ) );
+ public DefaultReleaseManager(
+ Map<String, Strategy> strategies,
+ Map<String, ReleasePhase> releasePhases,
+ @Named("properties") ReleaseDescriptorStore configStore) {
+ this.strategies = requireNonNull(strategies);
+ this.releasePhases = requireNonNull(releasePhases);
+ this.configStore = new AtomicReference<>(requireNonNull(configStore));
}
/**
* For easier testing only!
*/
- public void setConfigStore( ReleaseDescriptorStore configStore )
- {
- this.configStore.set( configStore );
+ public void setConfigStore(ReleaseDescriptorStore configStore) {
+ this.configStore.set(configStore);
}
@Override
- public ReleaseResult prepareWithResult( ReleasePrepareRequest prepareRequest )
- {
+ public ReleaseResult prepareWithResult(ReleasePrepareRequest prepareRequest) {
ReleaseResult result = new ReleaseResult();
- result.setStartTime( System.currentTimeMillis() );
+ result.setStartTime(System.currentTimeMillis());
- try
- {
- prepare( prepareRequest, result );
+ try {
+ prepare(prepareRequest, result);
- result.setResultCode( ReleaseResult.SUCCESS );
- }
- catch ( ReleaseExecutionException | ReleaseFailureException e )
- {
- captureException( result, prepareRequest.getReleaseManagerListener(), e );
- }
- finally
- {
- result.setEndTime( System.currentTimeMillis() );
+ result.setResultCode(ReleaseResult.SUCCESS);
+ } catch (ReleaseExecutionException | ReleaseFailureException e) {
+ captureException(result, prepareRequest.getReleaseManagerListener(), e);
+ } finally {
+ result.setEndTime(System.currentTimeMillis());
}
return result;
}
@Override
- public void prepare( ReleasePrepareRequest prepareRequest )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- prepare( prepareRequest, new ReleaseResult() );
+ public void prepare(ReleasePrepareRequest prepareRequest)
+ throws ReleaseExecutionException, ReleaseFailureException {
+ prepare(prepareRequest, new ReleaseResult());
}
- private void prepare( ReleasePrepareRequest prepareRequest, ReleaseResult result )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ private void prepare(ReleasePrepareRequest prepareRequest, ReleaseResult result)
+ throws ReleaseExecutionException, ReleaseFailureException {
final ReleaseDescriptorBuilder builder = prepareRequest.getReleaseDescriptorBuilder();
// Create a config containing values from the session properties (ie command line properties with cli).
- ReleaseUtils.copyPropertiesToReleaseDescriptor( prepareRequest.getUserProperties(),
- new ReleaseDescriptorBuilder()
- {
- public ReleaseDescriptorBuilder addDevelopmentVersion( String key,
- String value )
- {
- builder.addDevelopmentVersion( key, value );
+ ReleaseUtils.copyPropertiesToReleaseDescriptor(
+ prepareRequest.getUserProperties(), new ReleaseDescriptorBuilder() {
+ public ReleaseDescriptorBuilder addDevelopmentVersion(String key, String value) {
+ builder.addDevelopmentVersion(key, value);
return this;
}
- public ReleaseDescriptorBuilder addReleaseVersion( String key,
- String value )
- {
- builder.addReleaseVersion( key, value );
+ public ReleaseDescriptorBuilder addReleaseVersion(String key, String value) {
+ builder.addReleaseVersion(key, value);
return this;
}
- public ReleaseDescriptorBuilder addDependencyReleaseVersion( String dependencyKey,
- String version )
- {
- builder.addDependencyReleaseVersion( dependencyKey, version );
+ public ReleaseDescriptorBuilder addDependencyReleaseVersion(String dependencyKey, String version) {
+ builder.addDependencyReleaseVersion(dependencyKey, version);
return this;
}
- public ReleaseDescriptorBuilder addDependencyDevelopmentVersion( String dependencyKey,
- String version )
- {
- builder.addDependencyDevelopmentVersion( dependencyKey, version );
+ public ReleaseDescriptorBuilder addDependencyDevelopmentVersion(
+ String dependencyKey, String version) {
+ builder.addDependencyDevelopmentVersion(dependencyKey, version);
return this;
}
- } );
+ });
BuilderReleaseDescriptor config;
- if ( BooleanUtils.isNotFalse( prepareRequest.getResume() ) )
- {
- config = loadReleaseDescriptor( builder, prepareRequest.getReleaseManagerListener() );
- }
- else
- {
- config = ReleaseUtils.buildReleaseDescriptor( builder );
+ if (BooleanUtils.isNotFalse(prepareRequest.getResume())) {
+ config = loadReleaseDescriptor(builder, prepareRequest.getReleaseManagerListener());
+ } else {
+ config = ReleaseUtils.buildReleaseDescriptor(builder);
}
- Strategy releaseStrategy = getStrategy( config.getReleaseStrategyId() );
+ Strategy releaseStrategy = getStrategy(config.getReleaseStrategyId());
- List<String> preparePhases = getGoalPhases( releaseStrategy, "prepare" );
+ List<String> preparePhases = getGoalPhases(releaseStrategy, "prepare");
- goalStart( prepareRequest.getReleaseManagerListener(), "prepare", preparePhases );
+ goalStart(prepareRequest.getReleaseManagerListener(), "prepare", preparePhases);
// Later, it would be a good idea to introduce a proper workflow tool so that the release can be made up of a
// more flexible set of steps.
String completedPhase = config.getCompletedPhase();
- int index = preparePhases.indexOf( completedPhase );
+ int index = preparePhases.indexOf(completedPhase);
- for ( int idx = 0; idx <= index; idx++ )
- {
- phaseSkip( prepareRequest.getReleaseManagerListener(), preparePhases.get( idx ) );
+ for (int idx = 0; idx <= index; idx++) {
+ phaseSkip(prepareRequest.getReleaseManagerListener(), preparePhases.get(idx));
}
- if ( index == preparePhases.size() - 1 )
- {
- logInfo( result, "Release preparation already completed. You can now continue with release:perform, "
- + "or start again using the -Dresume=false flag" );
- }
- else if ( index >= 0 )
- {
- logInfo( result, "Resuming release from phase '" + preparePhases.get( index + 1 ) + "'" );
+ if (index == preparePhases.size() - 1) {
+ logInfo(
+ result,
+ "Release preparation already completed. You can now continue with release:perform, "
+ + "or start again using the -Dresume=false flag");
+ } else if (index >= 0) {
+ logInfo(result, "Resuming release from phase '" + preparePhases.get(index + 1) + "'");
}
// start from next phase
- for ( int i = index + 1; i < preparePhases.size(); i++ )
- {
- String name = preparePhases.get( i );
+ for (int i = index + 1; i < preparePhases.size(); i++) {
+ String name = preparePhases.get(i);
- ReleasePhase phase = releasePhases.get( name );
+ ReleasePhase phase = releasePhases.get(name);
- if ( phase == null )
- {
- throw new ReleaseExecutionException( "Unable to find phase '" + name + "' to execute" );
+ if (phase == null) {
+ throw new ReleaseExecutionException("Unable to find phase '" + name + "' to execute");
}
- phaseStart( prepareRequest.getReleaseManagerListener(), name );
+ phaseStart(prepareRequest.getReleaseManagerListener(), name);
ReleaseResult phaseResult = null;
- try
- {
- if ( BooleanUtils.isTrue( prepareRequest.getDryRun() ) )
- {
- phaseResult = phase.simulate( config,
- prepareRequest.getReleaseEnvironment(),
- prepareRequest.getReactorProjects() );
- }
- else
- {
- phaseResult = phase.execute( config,
- prepareRequest.getReleaseEnvironment(),
- prepareRequest.getReactorProjects() );
+ try {
+ if (BooleanUtils.isTrue(prepareRequest.getDryRun())) {
+ phaseResult = phase.simulate(
+ config, prepareRequest.getReleaseEnvironment(), prepareRequest.getReactorProjects());
+ } else {
+ phaseResult = phase.execute(
+ config, prepareRequest.getReleaseEnvironment(), prepareRequest.getReactorProjects());
}
- }
- finally
- {
- if ( result != null && phaseResult != null )
- {
- result.appendOutput( phaseResult.getOutput() );
+ } finally {
+ if (result != null && phaseResult != null) {
+ result.appendOutput(phaseResult.getOutput());
}
}
- config.setCompletedPhase( name );
- try
- {
- configStore.get().write( config );
- }
- catch ( ReleaseDescriptorStoreException e )
- {
+ config.setCompletedPhase(name);
+ try {
+ configStore.get().write(config);
+ } catch (ReleaseDescriptorStoreException e) {
// TODO: rollback?
- throw new ReleaseExecutionException( "Error writing release properties after completing phase", e );
+ throw new ReleaseExecutionException("Error writing release properties after completing phase", e);
}
- phaseEnd( prepareRequest.getReleaseManagerListener() );
+ phaseEnd(prepareRequest.getReleaseManagerListener());
}
- goalEnd( prepareRequest.getReleaseManagerListener() );
+ goalEnd(prepareRequest.getReleaseManagerListener());
}
@Override
- public void rollback( ReleaseRollbackRequest rollbackRequest )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public void rollback(ReleaseRollbackRequest rollbackRequest)
+ throws ReleaseExecutionException, ReleaseFailureException {
ReleaseDescriptor releaseDescriptor =
- loadReleaseDescriptor( rollbackRequest.getReleaseDescriptorBuilder(), null );
+ loadReleaseDescriptor(rollbackRequest.getReleaseDescriptorBuilder(), null);
- Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
+ Strategy releaseStrategy = getStrategy(releaseDescriptor.getReleaseStrategyId());
- List<String> rollbackPhases = getGoalPhases( releaseStrategy, "rollback" );
+ List<String> rollbackPhases = getGoalPhases(releaseStrategy, "rollback");
- goalStart( rollbackRequest.getReleaseManagerListener(), "rollback", rollbackPhases );
+ goalStart(rollbackRequest.getReleaseManagerListener(), "rollback", rollbackPhases);
- for ( String name : rollbackPhases )
- {
- ReleasePhase phase = releasePhases.get( name );
+ for (String name : rollbackPhases) {
+ ReleasePhase phase = releasePhases.get(name);
- if ( phase == null )
- {
- throw new ReleaseExecutionException( "Unable to find phase '" + name + "' to execute" );
+ if (phase == null) {
+ throw new ReleaseExecutionException("Unable to find phase '" + name + "' to execute");
}
- phaseStart( rollbackRequest.getReleaseManagerListener(), name );
- phase.execute( releaseDescriptor,
- rollbackRequest.getReleaseEnvironment(),
- rollbackRequest.getReactorProjects() );
- phaseEnd( rollbackRequest.getReleaseManagerListener() );
+ phaseStart(rollbackRequest.getReleaseManagerListener(), name);
+ phase.execute(
+ releaseDescriptor, rollbackRequest.getReleaseEnvironment(), rollbackRequest.getReactorProjects());
+ phaseEnd(rollbackRequest.getReleaseManagerListener());
}
- //call release:clean so that resume will not be possible anymore after a rollback
- clean( rollbackRequest );
- goalEnd( rollbackRequest.getReleaseManagerListener() );
+ // call release:clean so that resume will not be possible anymore after a rollback
+ clean(rollbackRequest);
+ goalEnd(rollbackRequest.getReleaseManagerListener());
}
@Override
- public ReleaseResult performWithResult( ReleasePerformRequest performRequest )
- {
+ public ReleaseResult performWithResult(ReleasePerformRequest performRequest) {
ReleaseResult result = new ReleaseResult();
- try
- {
- result.setStartTime( System.currentTimeMillis() );
+ try {
+ result.setStartTime(System.currentTimeMillis());
- perform( performRequest, result );
+ perform(performRequest, result);
- result.setResultCode( ReleaseResult.SUCCESS );
- }
- catch ( ReleaseExecutionException | ReleaseFailureException e )
- {
- captureException( result, performRequest.getReleaseManagerListener(), e );
- }
- finally
- {
- result.setEndTime( System.currentTimeMillis() );
+ result.setResultCode(ReleaseResult.SUCCESS);
+ } catch (ReleaseExecutionException | ReleaseFailureException e) {
+ captureException(result, performRequest.getReleaseManagerListener(), e);
+ } finally {
+ result.setEndTime(System.currentTimeMillis());
}
return result;
}
@Override
- public void perform( ReleasePerformRequest performRequest )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- perform( performRequest, new ReleaseResult() );
+ public void perform(ReleasePerformRequest performRequest)
+ throws ReleaseExecutionException, ReleaseFailureException {
+ perform(performRequest, new ReleaseResult());
}
- private void perform( ReleasePerformRequest performRequest, ReleaseResult result )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ private void perform(ReleasePerformRequest performRequest, ReleaseResult result)
+ throws ReleaseExecutionException, ReleaseFailureException {
// https://issues.apache.org/jira/browse/MRELEASE-1104 because stageRepository is an additional arg
// and only adding at perform stage it's not available during prepare and so not save the not available
// when reloading. save this then change again after load
- String additionalArguments = performRequest.getReleaseDescriptorBuilder().build().getAdditionalArguments();
-
- List<String> specificProfiles =
- ReleaseUtils.buildReleaseDescriptor( performRequest.getReleaseDescriptorBuilder() )
- .getActivateProfiles();
+ String additionalArguments =
+ performRequest.getReleaseDescriptorBuilder().build().getAdditionalArguments();
- ReleaseDescriptorBuilder builder =
- loadReleaseDescriptorBuilder( performRequest.getReleaseDescriptorBuilder(),
- performRequest.getReleaseManagerListener() );
+ List<String> specificProfiles = ReleaseUtils.buildReleaseDescriptor(
+ performRequest.getReleaseDescriptorBuilder())
+ .getActivateProfiles();
+ ReleaseDescriptorBuilder builder = loadReleaseDescriptorBuilder(
+ performRequest.getReleaseDescriptorBuilder(), performRequest.getReleaseManagerListener());
- builder.setAdditionalArguments( additionalArguments );
+ builder.setAdditionalArguments(additionalArguments);
- if ( specificProfiles != null && !specificProfiles.isEmpty() )
- {
+ if (specificProfiles != null && !specificProfiles.isEmpty()) {
List<String> allProfiles =
- new ArrayList<>( ReleaseUtils.buildReleaseDescriptor( builder ).getActivateProfiles() );
- for ( String specificProfile : specificProfiles )
- {
- if ( !allProfiles.contains( specificProfile ) )
- {
- allProfiles.add( specificProfile );
+ new ArrayList<>(ReleaseUtils.buildReleaseDescriptor(builder).getActivateProfiles());
+ for (String specificProfile : specificProfiles) {
+ if (!allProfiles.contains(specificProfile)) {
+ allProfiles.add(specificProfile);
}
}
- builder.setActivateProfiles( allProfiles );
+ builder.setActivateProfiles(allProfiles);
}
- ReleaseDescriptor releaseDescriptor = ReleaseUtils.buildReleaseDescriptor( builder );
+ ReleaseDescriptor releaseDescriptor = ReleaseUtils.buildReleaseDescriptor(builder);
- Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
+ Strategy releaseStrategy = getStrategy(releaseDescriptor.getReleaseStrategyId());
- List<String> performPhases = getGoalPhases( releaseStrategy, "perform" );
+ List<String> performPhases = getGoalPhases(releaseStrategy, "perform");
- goalStart( performRequest.getReleaseManagerListener(), "perform", performPhases );
+ goalStart(performRequest.getReleaseManagerListener(), "perform", performPhases);
- for ( String name : performPhases )
- {
- ReleasePhase phase = releasePhases.get( name );
+ for (String name : performPhases) {
+ ReleasePhase phase = releasePhases.get(name);
- if ( phase == null )
- {
- throw new ReleaseExecutionException( "Unable to find phase '" + name + "' to execute" );
+ if (phase == null) {
+ throw new ReleaseExecutionException("Unable to find phase '" + name + "' to execute");
}
- phaseStart( performRequest.getReleaseManagerListener(), name );
+ phaseStart(performRequest.getReleaseManagerListener(), name);
ReleaseResult phaseResult = null;
- try
- {
- if ( BooleanUtils.isTrue( performRequest.getDryRun() ) )
- {
- phaseResult = phase.simulate( releaseDescriptor,
- performRequest.getReleaseEnvironment(),
- performRequest.getReactorProjects() );
+ try {
+ if (BooleanUtils.isTrue(performRequest.getDryRun())) {
+ phaseResult = phase.simulate(
+ releaseDescriptor,
+ performRequest.getReleaseEnvironment(),
+ performRequest.getReactorProjects());
+ } else {
+ phaseResult = phase.execute(
+ releaseDescriptor,
+ performRequest.getReleaseEnvironment(),
+ performRequest.getReactorProjects());
}
- else
- {
- phaseResult = phase.execute( releaseDescriptor,
- performRequest.getReleaseEnvironment(),
- performRequest.getReactorProjects() );
- }
- }
- finally
- {
- if ( result != null && phaseResult != null )
- {
- result.appendOutput( phaseResult.getOutput() );
+ } finally {
+ if (result != null && phaseResult != null) {
+ result.appendOutput(phaseResult.getOutput());
}
}
- phaseEnd( performRequest.getReleaseManagerListener() );
+ phaseEnd(performRequest.getReleaseManagerListener());
}
- if ( BooleanUtils.isNotFalse( performRequest.getClean() ) )
- {
+ if (BooleanUtils.isNotFalse(performRequest.getClean())) {
// call release:clean so that resume will not be possible anymore after a perform
- clean( performRequest );
+ clean(performRequest);
}
- goalEnd( performRequest.getReleaseManagerListener() );
+ goalEnd(performRequest.getReleaseManagerListener());
}
@Override
- public void branch( ReleaseBranchRequest branchRequest )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public void branch(ReleaseBranchRequest branchRequest) throws ReleaseExecutionException, ReleaseFailureException {
final ReleaseDescriptorBuilder builder = branchRequest.getReleaseDescriptorBuilder();
-
- ReleaseUtils.copyPropertiesToReleaseDescriptor( branchRequest.getUserProperties(),
- new ReleaseDescriptorBuilder()
- {
- public ReleaseDescriptorBuilder addDevelopmentVersion( String key,
- String value )
- {
- builder.addDevelopmentVersion( key, value );
- return this;
- }
-
- public ReleaseDescriptorBuilder addReleaseVersion( String key,
- String value )
- {
- builder.addReleaseVersion( key, value );
- return this;
- }
- } );
-
- ReleaseDescriptor releaseDescriptor =
- loadReleaseDescriptor( builder, branchRequest.getReleaseManagerListener() );
- boolean dryRun = BooleanUtils.isTrue( branchRequest.getDryRun() );
+ ReleaseUtils.copyPropertiesToReleaseDescriptor(
+ branchRequest.getUserProperties(), new ReleaseDescriptorBuilder() {
+ public ReleaseDescriptorBuilder addDevelopmentVersion(String key, String value) {
+ builder.addDevelopmentVersion(key, value);
+ return this;
+ }
+
+ public ReleaseDescriptorBuilder addReleaseVersion(String key, String value) {
+ builder.addReleaseVersion(key, value);
+ return this;
+ }
+ });
- Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
+ ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor(builder, branchRequest.getReleaseManagerListener());
- List<String> branchPhases = getGoalPhases( releaseStrategy, "branch" );
+ boolean dryRun = BooleanUtils.isTrue(branchRequest.getDryRun());
- goalStart( branchRequest.getReleaseManagerListener(), "branch", branchPhases );
+ Strategy releaseStrategy = getStrategy(releaseDescriptor.getReleaseStrategyId());
- for ( String name : branchPhases )
- {
- ReleasePhase phase = releasePhases.get( name );
+ List<String> branchPhases = getGoalPhases(releaseStrategy, "branch");
- if ( phase == null )
- {
- throw new ReleaseExecutionException( "Unable to find phase '" + name + "' to execute" );
- }
+ goalStart(branchRequest.getReleaseManagerListener(), "branch", branchPhases);
- phaseStart( branchRequest.getReleaseManagerListener(), name );
+ for (String name : branchPhases) {
+ ReleasePhase phase = releasePhases.get(name);
- if ( dryRun )
- {
- phase.simulate( releaseDescriptor,
- branchRequest.getReleaseEnvironment(),
- branchRequest.getReactorProjects() );
+ if (phase == null) {
+ throw new ReleaseExecutionException("Unable to find phase '" + name + "' to execute");
}
- else // getDryRun is null or FALSE
+
+ phaseStart(branchRequest.getReleaseManagerListener(), name);
+
+ if (dryRun) {
+ phase.simulate(
+ releaseDescriptor, branchRequest.getReleaseEnvironment(), branchRequest.getReactorProjects());
+ } else // getDryRun is null or FALSE
{
- phase.execute( releaseDescriptor,
- branchRequest.getReleaseEnvironment(),
- branchRequest.getReactorProjects() );
+ phase.execute(
+ releaseDescriptor, branchRequest.getReleaseEnvironment(), branchRequest.getReactorProjects());
}
- phaseEnd( branchRequest.getReleaseManagerListener() );
+ phaseEnd(branchRequest.getReleaseManagerListener());
}
- if ( !dryRun )
- {
- clean( branchRequest );
+ if (!dryRun) {
+ clean(branchRequest);
}
- goalEnd( branchRequest.getReleaseManagerListener() );
+ goalEnd(branchRequest.getReleaseManagerListener());
}
@Override
- public void updateVersions( ReleaseUpdateVersionsRequest updateVersionsRequest )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public void updateVersions(ReleaseUpdateVersionsRequest updateVersionsRequest)
+ throws ReleaseExecutionException, ReleaseFailureException {
final ReleaseDescriptorBuilder builder = updateVersionsRequest.getReleaseDescriptorBuilder();
-
+
// Create a config containing values from the session properties (ie command line properties with cli).
- ReleaseUtils.copyPropertiesToReleaseDescriptor( updateVersionsRequest.getUserProperties(),
- new ReleaseDescriptorBuilder()
- {
- public ReleaseDescriptorBuilder addDevelopmentVersion( String key,
- String value )
- {
- builder.addDevelopmentVersion( key, value );
- return this;
- }
-
- public ReleaseDescriptorBuilder addReleaseVersion( String key,
- String value )
- {
- builder.addReleaseVersion( key, value );
- return this;
- }
- } );
+ ReleaseUtils.copyPropertiesToReleaseDescriptor(
+ updateVersionsRequest.getUserProperties(), new ReleaseDescriptorBuilder() {
+ public ReleaseDescriptorBuilder addDevelopmentVersion(String key, String value) {
+ builder.addDevelopmentVersion(key, value);
+ return this;
+ }
+
+ public ReleaseDescriptorBuilder addReleaseVersion(String key, String value) {
+ builder.addReleaseVersion(key, value);
+ return this;
+ }
+ });
ReleaseDescriptor releaseDescriptor =
- loadReleaseDescriptor( builder, updateVersionsRequest.getReleaseManagerListener() );
+ loadReleaseDescriptor(builder, updateVersionsRequest.getReleaseManagerListener());
- Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
+ Strategy releaseStrategy = getStrategy(releaseDescriptor.getReleaseStrategyId());
- List<String> updateVersionsPhases = getGoalPhases( releaseStrategy, "updateVersions" );
+ List<String> updateVersionsPhases = getGoalPhases(releaseStrategy, "updateVersions");
- goalStart( updateVersionsRequest.getReleaseManagerListener(), "updateVersions", updateVersionsPhases );
+ goalStart(updateVersionsRequest.getReleaseManagerListener(), "updateVersions", updateVersionsPhases);
- for ( String name : updateVersionsPhases )
- {
- ReleasePhase phase = releasePhases.get( name );
+ for (String name : updateVersionsPhases) {
+ ReleasePhase phase = releasePhases.get(name);
- if ( phase == null )
- {
- throw new ReleaseExecutionException( "Unable to find phase '" + name + "' to execute" );
+ if (phase == null) {
+ throw new ReleaseExecutionException("Unable to find phase '" + name + "' to execute");
}
- phaseStart( updateVersionsRequest.getReleaseManagerListener(), name );
- phase.execute( releaseDescriptor,
- updateVersionsRequest.getReleaseEnvironment(),
- updateVersionsRequest.getReactorProjects() );
- phaseEnd( updateVersionsRequest.getReleaseManagerListener() );
+ phaseStart(updateVersionsRequest.getReleaseManagerListener(), name);
+ phase.execute(
+ releaseDescriptor,
+ updateVersionsRequest.getReleaseEnvironment(),
+ updateVersionsRequest.getReactorProjects());
+ phaseEnd(updateVersionsRequest.getReleaseManagerListener());
}
- clean( updateVersionsRequest );
+ clean(updateVersionsRequest);
- goalEnd( updateVersionsRequest.getReleaseManagerListener() );
+ goalEnd(updateVersionsRequest.getReleaseManagerListener());
}
/**
@@ -543,36 +458,25 @@ public class DefaultReleaseManager
* directory or ""
* @return The working directory
*/
- protected File determineWorkingDirectory( File checkoutDirectory, String relativePathProjectDirectory )
- {
- if ( StringUtils.isNotEmpty( relativePathProjectDirectory ) )
- {
- return new File( checkoutDirectory, relativePathProjectDirectory );
- }
- else
- {
+ protected File determineWorkingDirectory(File checkoutDirectory, String relativePathProjectDirectory) {
+ if (StringUtils.isNotEmpty(relativePathProjectDirectory)) {
+ return new File(checkoutDirectory, relativePathProjectDirectory);
+ } else {
return checkoutDirectory;
}
}
- private BuilderReleaseDescriptor loadReleaseDescriptor( ReleaseDescriptorBuilder builder,
- ReleaseManagerListener listener )
- throws ReleaseExecutionException
- {
- return ReleaseUtils.buildReleaseDescriptor( loadReleaseDescriptorBuilder( builder, listener ) );
+ private BuilderReleaseDescriptor loadReleaseDescriptor(
+ ReleaseDescriptorBuilder builder, ReleaseManagerListener listener) throws ReleaseExecutionException {
+ return ReleaseUtils.buildReleaseDescriptor(loadReleaseDescriptorBuilder(builder, listener));
}
- private ReleaseDescriptorBuilder loadReleaseDescriptorBuilder( ReleaseDescriptorBuilder builder,
- ReleaseManagerListener listener )
- throws ReleaseExecutionException
- {
- try
- {
- return configStore.get().read( builder );
- }
- catch ( ReleaseDescriptorStoreException e )
- {
- throw new ReleaseExecutionException( "Error reading stored configuration: " + e.getMessage(), e );
+ private ReleaseDescriptorBuilder loadReleaseDescriptorBuilder(
+ ReleaseDescriptorBuilder builder, ReleaseManagerListener listener) throws ReleaseExecutionException {
+ try {
+ return configStore.get().read(builder);
+ } catch (ReleaseDescriptorStoreException e) {
+ throw new ReleaseExecutionException("Error reading stored configuration: " + e.getMessage(), e);
}
}
@@ -582,172 +486,133 @@ public class DefaultReleaseManager
* @param releaseRequest a {@link org.apache.maven.shared.release.AbstractReleaseRequest} object
* @throws org.apache.maven.shared.release.ReleaseFailureException if any.
*/
- protected void clean( AbstractReleaseRequest releaseRequest ) throws ReleaseFailureException
- {
+ protected void clean(AbstractReleaseRequest releaseRequest) throws ReleaseFailureException {
ReleaseCleanRequest cleanRequest = new ReleaseCleanRequest();
- cleanRequest.setReleaseDescriptorBuilder( releaseRequest.getReleaseDescriptorBuilder() );
- cleanRequest.setReleaseManagerListener( releaseRequest.getReleaseManagerListener() );
- cleanRequest.setReactorProjects( releaseRequest.getReactorProjects() );
+ cleanRequest.setReleaseDescriptorBuilder(releaseRequest.getReleaseDescriptorBuilder());
+ cleanRequest.setReleaseManagerListener(releaseRequest.getReleaseManagerListener());
+ cleanRequest.setReactorProjects(releaseRequest.getReactorProjects());
- clean( cleanRequest );
+ clean(cleanRequest);
}
@Override
- public void clean( ReleaseCleanRequest cleanRequest ) throws ReleaseFailureException
- {
- logger.info( "Cleaning up after release..." );
+ public void clean(ReleaseCleanRequest cleanRequest) throws ReleaseFailureException {
+ logger.info("Cleaning up after release...");
ReleaseDescriptor releaseDescriptor =
- ReleaseUtils.buildReleaseDescriptor( cleanRequest.getReleaseDescriptorBuilder() );
+ ReleaseUtils.buildReleaseDescriptor(cleanRequest.getReleaseDescriptorBuilder());
- configStore.get().delete( releaseDescriptor );
+ configStore.get().delete(releaseDescriptor);
- Strategy releaseStrategy = getStrategy( releaseDescriptor.getReleaseStrategyId() );
+ Strategy releaseStrategy = getStrategy(releaseDescriptor.getReleaseStrategyId());
Set<String> phases = new LinkedHashSet<>();
- phases.addAll( getGoalPhases( releaseStrategy, "prepare" ) );
- phases.addAll( getGoalPhases( releaseStrategy, "branch" ) );
-
- for ( String name : phases )
- {
- ReleasePhase phase = releasePhases.get( name );
-
- if ( phase instanceof ResourceGenerator )
- {
- ( (ResourceGenerator) phase ).clean( cleanRequest.getReactorProjects() );
+ phases.addAll(getGoalPhases(releaseStrategy, "prepare"));
+ phases.addAll(getGoalPhases(releaseStrategy, "branch"));
+
+ for (String name : phases) {
+ ReleasePhase phase = releasePhases.get(name);
+
+ if (phase instanceof ResourceGenerator) {
+ ((ResourceGenerator) phase).clean(cleanRequest.getReactorProjects());
}
}
}
- void goalStart( ReleaseManagerListener listener, String goal, List<String> phases )
- {
- if ( listener != null )
- {
- listener.goalStart( goal, phases );
+ void goalStart(ReleaseManagerListener listener, String goal, List<String> phases) {
+ if (listener != null) {
+ listener.goalStart(goal, phases);
}
}
- void goalEnd( ReleaseManagerListener listener )
- {
- if ( listener != null )
- {
+ void goalEnd(ReleaseManagerListener listener) {
+ if (listener != null) {
listener.goalEnd();
}
}
- void phaseSkip( ReleaseManagerListener listener, String name )
- {
- if ( listener != null )
- {
- listener.phaseSkip( name );
+ void phaseSkip(ReleaseManagerListener listener, String name) {
+ if (listener != null) {
+ listener.phaseSkip(name);
}
}
- void phaseStart( ReleaseManagerListener listener, String name )
- {
- if ( listener != null )
- {
- listener.phaseStart( name );
+ void phaseStart(ReleaseManagerListener listener, String name) {
+ if (listener != null) {
+ listener.phaseStart(name);
}
}
- void phaseEnd( ReleaseManagerListener listener )
- {
- if ( listener != null )
- {
+ void phaseEnd(ReleaseManagerListener listener) {
+ if (listener != null) {
listener.phaseEnd();
}
}
- void error( ReleaseManagerListener listener, String name )
- {
- if ( listener != null )
- {
- listener.error( name );
+ void error(ReleaseManagerListener listener, String name) {
+ if (listener != null) {
+ listener.error(name);
}
}
- private Strategy getStrategy( String strategyId ) throws ReleaseFailureException
- {
- Strategy strategy = strategies.get( strategyId );
- if ( strategy == null )
- {
- throw new ReleaseFailureException( "Unknown strategy: " + strategyId );
+ private Strategy getStrategy(String strategyId) throws ReleaseFailureException {
+ Strategy strategy = strategies.get(strategyId);
+ if (strategy == null) {
+ throw new ReleaseFailureException("Unknown strategy: " + strategyId);
}
return strategy;
}
- private List<String> getGoalPhases( Strategy strategy, String goal )
- {
+ private List<String> getGoalPhases(Strategy strategy, String goal) {
List<String> phases;
- if ( "prepare".equals( goal ) )
- {
+ if ("prepare".equals(goal)) {
phases = strategy.getPreparePhases();
- if ( phases == null )
- {
- phases = strategies.get( "default" ).getPreparePhases();
+ if (phases == null) {
+ phases = strategies.get("default").getPreparePhases();
}
- }
- else if ( "perform".equals( goal ) )
- {
+ } else if ("perform".equals(goal)) {
phases = strategy.getPerformPhases();
- if ( phases == null )
- {
- phases = strategies.get( "default" ).getPerformPhases();
+ if (phases == null) {
+ phases = strategies.get("default").getPerformPhases();
}
- }
- else if ( "rollback".equals( goal ) )
- {
+ } else if ("rollback".equals(goal)) {
phases = strategy.getRollbackPhases();
- if ( phases == null )
- {
- phases = strategies.get( "default" ).getRollbackPhases();
+ if (phases == null) {
+ phases = strategies.get("default").getRollbackPhases();
}
- }
- else if ( "branch".equals( goal ) )
- {
+ } else if ("branch".equals(goal)) {
phases = strategy.getBranchPhases();
- if ( phases == null )
- {
- phases = strategies.get( "default" ).getBranchPhases();
+ if (phases == null) {
+ phases = strategies.get("default").getBranchPhases();
}
- }
- else if ( "updateVersions".equals( goal ) )
- {
+ } else if ("updateVersions".equals(goal)) {
phases = strategy.getUpdateVersionsPhases();
- if ( phases == null )
- {
- phases = strategies.get( "default" ).getUpdateVersionsPhases();
+ if (phases == null) {
+ phases = strategies.get("default").getUpdateVersionsPhases();
}
- }
- else
- {
+ } else {
phases = null;
}
- return Collections.unmodifiableList( phases ); // TODO: NPE here in phases=null above!
+ return Collections.unmodifiableList(phases); // TODO: NPE here in phases=null above!
}
- private void logInfo( ReleaseResult result, String message )
- {
- if ( result != null )
- {
- result.appendInfo( message );
+ private void logInfo(ReleaseResult result, String message) {
+ if (result != null) {
+ result.appendInfo(message);
}
- logger.info( message );
+ logger.info(message);
}
- private void captureException( ReleaseResult result, ReleaseManagerListener listener, Exception e )
- {
- if ( listener != null )
- {
- listener.error( e.getMessage() );
+ private void captureException(ReleaseResult result, ReleaseManagerListener listener, Exception e) {
+ if (listener != null) {
+ listener.error(e.getMessage());
}
- result.appendError( e );
+ result.appendError(e);
- result.setResultCode( ReleaseResult.ERROR );
+ result.setResultCode(ReleaseResult.ERROR);
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManagerListener.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManagerListener.java
index d177879e..4a504421 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManagerListener.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManagerListener.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.util.List;
@@ -31,9 +30,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
*
* @author Hervé Boutemy
*/
-public class DefaultReleaseManagerListener
- implements ReleaseManagerListener
-{
+public class DefaultReleaseManagerListener implements ReleaseManagerListener {
private final Log log;
private final boolean dryRun;
@@ -49,9 +46,8 @@ public class DefaultReleaseManagerListener
*
* @param log a {@link org.apache.maven.plugin.logging.Log} object
*/
- public DefaultReleaseManagerListener( Log log )
- {
- this( log, false );
+ public DefaultReleaseManagerListener(Log log) {
+ this(log, false);
}
/**
@@ -60,62 +56,53 @@ public class DefaultReleaseManagerListener
* @param log a {@link org.apache.maven.plugin.logging.Log} object
* @param dryRun a boolean
*/
- public DefaultReleaseManagerListener( Log log, boolean dryRun )
- {
+ public DefaultReleaseManagerListener(Log log, boolean dryRun) {
this.log = log;
this.dryRun = dryRun;
}
- private void nextPhase( String name )
- {
+ private void nextPhase(String name) {
currentPhase++;
- if ( !name.equals( phases.get( currentPhase ) ) )
- {
- log.warn( "inconsistent phase name: expected '" + phases.get( currentPhase ) + "' but got '" + name + "'" );
+ if (!name.equals(phases.get(currentPhase))) {
+ log.warn("inconsistent phase name: expected '" + phases.get(currentPhase) + "' but got '" + name + "'");
}
}
- public void goalStart( String goal, List<String> phases )
- {
- log.info( "starting " + buffer().mojo( goal ) + " goal" + ( dryRun ? " in dry-run mode" : "" )
- + ", composed of " + phases.size() + " phases: " + StringUtils.join( phases.iterator(), ", " ) );
+ public void goalStart(String goal, List<String> phases) {
+ log.info("starting " + buffer().mojo(goal) + " goal" + (dryRun ? " in dry-run mode" : "") + ", composed of "
+ + phases.size() + " phases: " + StringUtils.join(phases.iterator(), ", "));
currentPhase = -1;
this.phases = phases;
this.goal = goal;
}
- public void phaseStart( String name )
- {
- nextPhase( name );
- log.info( ( currentPhase + 1 ) + "/" + phases.size() + ' ' + buffer().mojo( goal + ':' + name )
- + ( dryRun ? " dry-run" : "" ) );
+ public void phaseStart(String name) {
+ nextPhase(name);
+ log.info((currentPhase + 1) + "/" + phases.size() + ' ' + buffer().mojo(goal + ':' + name)
+ + (dryRun ? " dry-run" : ""));
}
/**
* <p>phaseEnd.</p>
*/
- public void phaseEnd()
- {
+ public void phaseEnd() {
// NOOP
}
- public void phaseSkip( String name )
- {
- nextPhase( name );
+ public void phaseSkip(String name) {
+ nextPhase(name);
}
/**
* <p>goalEnd.</p>
*/
- public void goalEnd()
- {
+ public void goalEnd() {
goal = null;
phases = null;
}
- public void error( String reason )
- {
- log.error( "error during phase " + ( currentPhase + 1 ) + "/" + phases.size() + " " + phases.get( currentPhase )
- + ": " + reason );
+ public void error(String reason) {
+ log.error("error during phase " + (currentPhase + 1) + "/" + phases.size() + " " + phases.get(currentPhase)
+ + ": " + reason);
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java
index 94725a0b..9500032d 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,8 +16,10 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.util.Properties;
+
import org.apache.maven.shared.release.env.ReleaseEnvironment;
/**
@@ -28,13 +28,12 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseBranchRequest extends AbstractReleaseRequest
-{
+public class ReleaseBranchRequest extends AbstractReleaseRequest {
// using Boolean to detect if has been set explicitly
private Boolean dryRun;
private ReleaseEnvironment releaseEnvironment;
-
+
private Properties userProperties;
/**
@@ -42,8 +41,7 @@ public class ReleaseBranchRequest extends AbstractReleaseRequest
*
* @return the dryRun
*/
- public Boolean getDryRun()
- {
+ public Boolean getDryRun() {
return dryRun;
}
@@ -52,8 +50,7 @@ public class ReleaseBranchRequest extends AbstractReleaseRequest
*
* @param dryRun the dryRun to set
*/
- public void setDryRun( Boolean dryRun )
- {
+ public void setDryRun(Boolean dryRun) {
this.dryRun = dryRun;
}
@@ -62,8 +59,7 @@ public class ReleaseBranchRequest extends AbstractReleaseRequest
*
* @return the releaseEnvironment
*/
- public ReleaseEnvironment getReleaseEnvironment()
- {
+ public ReleaseEnvironment getReleaseEnvironment() {
return releaseEnvironment;
}
@@ -72,28 +68,25 @@ public class ReleaseBranchRequest extends AbstractReleaseRequest
*
* @param releaseEnvironment the releaseEnvironment to set
*/
- public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
- {
+ public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
this.releaseEnvironment = releaseEnvironment;
}
-
+
/**
* <p>Getter for the field <code>userProperties</code>.</p>
*
* @return a {@link java.util.Properties} object
*/
- public Properties getUserProperties()
- {
+ public Properties getUserProperties() {
return userProperties;
}
-
+
/**
* <p>Setter for the field <code>userProperties</code>.</p>
*
* @param userProperties a {@link java.util.Properties} object
*/
- public void setUserProperties( Properties userProperties )
- {
+ public void setUserProperties(Properties userProperties) {
this.userProperties = userProperties;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
index 0aca351b..2346d95f 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
/**
* <p>ReleaseCleanRequest class.</p>
@@ -25,7 +24,4 @@ package org.apache.maven.shared.release;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseCleanRequest
- extends AbstractReleaseRequest
-{
-}
+public class ReleaseCleanRequest extends AbstractReleaseRequest {}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
index 791e7060..499528f0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,14 +16,14 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
/**
* Release management classes.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface ReleaseManager
-{
+public interface ReleaseManager {
/**
* Prepare a release.
*
@@ -34,7 +32,7 @@ public interface ReleaseManager
* @throws org.apache.maven.shared.release.ReleaseFailureException if there is a problem performing the release
* @since 2.3
*/
- void prepare( ReleasePrepareRequest prepareRequest ) throws ReleaseExecutionException, ReleaseFailureException;
+ void prepare(ReleasePrepareRequest prepareRequest) throws ReleaseExecutionException, ReleaseFailureException;
/**
* <p>prepareWithResult.</p>
@@ -42,7 +40,7 @@ public interface ReleaseManager
* @param prepareRequest a {@link org.apache.maven.shared.release.ReleasePrepareRequest} object
* @return a {@link org.apache.maven.shared.release.ReleaseResult} object
*/
- ReleaseResult prepareWithResult( ReleasePrepareRequest prepareRequest );
+ ReleaseResult prepareWithResult(ReleasePrepareRequest prepareRequest);
/**
* <p>performWithResult.</p>
@@ -50,7 +48,7 @@ public interface ReleaseManager
* @param performRequest a {@link org.apache.maven.shared.release.ReleasePerformRequest} object
* @return a {@link org.apache.maven.shared.release.ReleaseResult} object
*/
- ReleaseResult performWithResult( ReleasePerformRequest performRequest );
+ ReleaseResult performWithResult(ReleasePerformRequest performRequest);
/**
* Perform a release
@@ -60,8 +58,7 @@ public interface ReleaseManager
* @throws org.apache.maven.shared.release.ReleaseFailureException if there is a problem performing the release
* @since 2.3
*/
- void perform( ReleasePerformRequest performRequest )
- throws ReleaseExecutionException, ReleaseFailureException;
+ void perform(ReleasePerformRequest performRequest) throws ReleaseExecutionException, ReleaseFailureException;
/**
* Clean a release.
@@ -70,7 +67,7 @@ public interface ReleaseManager
* @throws org.apache.maven.shared.release.ReleaseFailureException if exception when releasing
* @since 2.3
*/
- void clean( ReleaseCleanRequest cleanRequest ) throws ReleaseFailureException;
+ void clean(ReleaseCleanRequest cleanRequest) throws ReleaseFailureException;
/**
* Rollback changes made by the previous release
@@ -80,8 +77,7 @@ public interface ReleaseManager
* @throws org.apache.maven.shared.release.ReleaseFailureException if there is a problem during release rollback
* @since 2.3
*/
- void rollback( ReleaseRollbackRequest rollbackRequest )
- throws ReleaseExecutionException, ReleaseFailureException;
+ void rollback(ReleaseRollbackRequest rollbackRequest) throws ReleaseExecutionException, ReleaseFailureException;
/**
* Branch a project
@@ -91,7 +87,7 @@ public interface ReleaseManager
* @throws org.apache.maven.shared.release.ReleaseFailureException if there is a problem during release branch
* @since 2.3
*/
- void branch( ReleaseBranchRequest branchRequest ) throws ReleaseExecutionException, ReleaseFailureException;
+ void branch(ReleaseBranchRequest branchRequest) throws ReleaseExecutionException, ReleaseFailureException;
/**
* Update version numbers for a project
@@ -101,6 +97,6 @@ public interface ReleaseManager
* @throws org.apache.maven.shared.release.ReleaseFailureException if there is a problem during update versions
* @since 2.3
*/
- void updateVersions( ReleaseUpdateVersionsRequest updateVersionsRequest )
- throws ReleaseExecutionException, ReleaseFailureException;
+ void updateVersions(ReleaseUpdateVersionsRequest updateVersionsRequest)
+ throws ReleaseExecutionException, ReleaseFailureException;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManagerListener.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManagerListener.java
index e4292eed..b0ea2941 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManagerListener.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManagerListener.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.util.List;
@@ -26,22 +25,21 @@ import java.util.List;
*
* @author Edwin Punzalan
*/
-public interface ReleaseManagerListener
-{
+public interface ReleaseManagerListener {
/**
* <p>goalStart.</p>
*
* @param goal a {@link java.lang.String} object
* @param phases a {@link java.util.List} object
*/
- void goalStart( String goal, List<String> phases );
+ void goalStart(String goal, List<String> phases);
/**
* <p>phaseStart.</p>
*
* @param name a {@link java.lang.String} object
*/
- void phaseStart( String name );
+ void phaseStart(String name);
/**
* <p>phaseEnd.</p>
@@ -53,7 +51,7 @@ public interface ReleaseManagerListener
*
* @param name a {@link java.lang.String} object
*/
- void phaseSkip( String name );
+ void phaseSkip(String name);
/**
* <p>goalEnd.</p>
@@ -65,5 +63,5 @@ public interface ReleaseManagerListener
*
* @param reason a {@link java.lang.String} object
*/
- void error( String reason );
+ void error(String reason);
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
index f4b37a45..c3783c05 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
@@ -27,9 +26,7 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleasePerformRequest
- extends AbstractReleaseRequest
-{
+public class ReleasePerformRequest extends AbstractReleaseRequest {
// using Boolean to detect if has been set explicitly
private Boolean dryRun;
@@ -43,8 +40,7 @@ public class ReleasePerformRequest
*
* @return the dryRun
*/
- public Boolean getDryRun()
- {
+ public Boolean getDryRun() {
return dryRun;
}
@@ -53,8 +49,7 @@ public class ReleasePerformRequest
*
* @param dryRun the dryRun to set
*/
- public void setDryRun( Boolean dryRun )
- {
+ public void setDryRun(Boolean dryRun) {
this.dryRun = dryRun;
}
@@ -63,8 +58,7 @@ public class ReleasePerformRequest
*
* @return the clean
*/
- public Boolean getClean()
- {
+ public Boolean getClean() {
return clean;
}
@@ -73,8 +67,7 @@ public class ReleasePerformRequest
*
* @param clean the clean to set
*/
- public void setClean( Boolean clean )
- {
+ public void setClean(Boolean clean) {
this.clean = clean;
}
@@ -83,8 +76,7 @@ public class ReleasePerformRequest
*
* @return the releaseEnvironment
*/
- public ReleaseEnvironment getReleaseEnvironment()
- {
+ public ReleaseEnvironment getReleaseEnvironment() {
return releaseEnvironment;
}
@@ -93,8 +85,7 @@ public class ReleasePerformRequest
*
* @param releaseEnvironment the releaseEnvironment to set
*/
- public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
- {
+ public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
this.releaseEnvironment = releaseEnvironment;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
index 99223932..4d680367 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.util.Properties;
@@ -29,9 +28,7 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleasePrepareRequest
- extends AbstractReleaseRequest
-{
+public class ReleasePrepareRequest extends AbstractReleaseRequest {
// using Boolean to detect if has been set explicitly
private Boolean dryRun;
@@ -39,7 +36,7 @@ public class ReleasePrepareRequest
private Boolean resume;
private ReleaseEnvironment releaseEnvironment;
-
+
private Properties userProperties;
/**
@@ -47,8 +44,7 @@ public class ReleasePrepareRequest
*
* @return the dryRun
*/
- public Boolean getDryRun()
- {
+ public Boolean getDryRun() {
return dryRun;
}
@@ -57,8 +53,7 @@ public class ReleasePrepareRequest
*
* @param dryRun the dryRun to set
*/
- public void setDryRun( Boolean dryRun )
- {
+ public void setDryRun(Boolean dryRun) {
this.dryRun = dryRun;
}
@@ -67,8 +62,7 @@ public class ReleasePrepareRequest
*
* @return the resume
*/
- public Boolean getResume()
- {
+ public Boolean getResume() {
return resume;
}
@@ -77,8 +71,7 @@ public class ReleasePrepareRequest
*
* @param resume the resume to set
*/
- public void setResume( Boolean resume )
- {
+ public void setResume(Boolean resume) {
this.resume = resume;
}
@@ -87,8 +80,7 @@ public class ReleasePrepareRequest
*
* @return the releaseEnvironment
*/
- public ReleaseEnvironment getReleaseEnvironment()
- {
+ public ReleaseEnvironment getReleaseEnvironment() {
return releaseEnvironment;
}
@@ -97,28 +89,25 @@ public class ReleasePrepareRequest
*
* @param releaseEnvironment the releaseEnvironment to set
*/
- public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
- {
+ public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
this.releaseEnvironment = releaseEnvironment;
}
-
+
/**
* <p>Getter for the field <code>userProperties</code>.</p>
*
* @return a {@link java.util.Properties} object
*/
- public Properties getUserProperties()
- {
+ public Properties getUserProperties() {
return userProperties;
}
-
+
/**
* <p>Setter for the field <code>userProperties</code>.</p>
*
* @param userProperties a {@link java.util.Properties} object
*/
- public void setUserProperties( Properties userProperties )
- {
+ public void setUserProperties(Properties userProperties) {
this.userProperties = userProperties;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
index 45d24de8..126f4c5e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
@@ -27,9 +26,7 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseRollbackRequest
- extends AbstractReleaseRequest
-{
+public class ReleaseRollbackRequest extends AbstractReleaseRequest {
private ReleaseEnvironment releaseEnvironment;
/**
@@ -37,8 +34,7 @@ public class ReleaseRollbackRequest
*
* @return the releaseEnvironment
*/
- public ReleaseEnvironment getReleaseEnvironment()
- {
+ public ReleaseEnvironment getReleaseEnvironment() {
return releaseEnvironment;
}
@@ -47,8 +43,7 @@ public class ReleaseRollbackRequest
*
* @param releaseEnvironment the releaseEnvironment to set
*/
- public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
- {
+ public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
this.releaseEnvironment = releaseEnvironment;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
index 3412fc46..434f2ba6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release;
import java.util.Properties;
@@ -29,11 +28,9 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
* @author Robert Scholte
* @since 2.3
*/
-public class ReleaseUpdateVersionsRequest
- extends AbstractReleaseRequest
-{
+public class ReleaseUpdateVersionsRequest extends AbstractReleaseRequest {
private ReleaseEnvironment releaseEnvironment;
-
+
private Properties userProperties;
/**
@@ -41,8 +38,7 @@ public class ReleaseUpdateVersionsRequest
*
* @return the releaseEnvironment
*/
- public ReleaseEnvironment getReleaseEnvironment()
- {
+ public ReleaseEnvironment getReleaseEnvironment() {
return releaseEnvironment;
}
@@ -51,28 +47,25 @@ public class ReleaseUpdateVersionsRequest
*
* @param releaseEnvironment the releaseEnvironment to set
*/
- public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
- {
+ public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
this.releaseEnvironment = releaseEnvironment;
}
-
+
/**
* <p>Getter for the field <code>userProperties</code>.</p>
*
* @return a {@link java.util.Properties} object
*/
- public Properties getUserProperties()
- {
+ public Properties getUserProperties() {
return userProperties;
}
-
+
/**
* <p>Setter for the field <code>userProperties</code>.</p>
*
* @param userProperties a {@link java.util.Properties} object
*/
- public void setUserProperties( Properties userProperties )
- {
+ public void setUserProperties(Properties userProperties) {
this.userProperties = userProperties;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 9d3246c0..2ebb584d 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.config;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.config;
import javax.inject.Inject;
import javax.inject.Named;
@@ -50,25 +49,21 @@ import static java.util.Objects.requireNonNull;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@Singleton
-@Named( "properties" )
-public class PropertiesReleaseDescriptorStore
- implements ReleaseDescriptorStore
-{
- private final Logger logger = LoggerFactory.getLogger( getClass() );
+@Named("properties")
+public class PropertiesReleaseDescriptorStore implements ReleaseDescriptorStore {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private final MavenCrypto mavenCrypto;
@Inject
- public PropertiesReleaseDescriptorStore( MavenCrypto mavenCrypto )
- {
- this.mavenCrypto = requireNonNull( mavenCrypto );
+ public PropertiesReleaseDescriptorStore(MavenCrypto mavenCrypto) {
+ this.mavenCrypto = requireNonNull(mavenCrypto);
}
@Override
- public ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor )
- throws ReleaseDescriptorStoreException
- {
- return read( mergeDescriptor, getDefaultReleasePropertiesFile( mergeDescriptor.build() ) );
+ public ReleaseDescriptorBuilder read(ReleaseDescriptorBuilder mergeDescriptor)
+ throws ReleaseDescriptorStoreException {
+ return read(mergeDescriptor, getDefaultReleasePropertiesFile(mergeDescriptor.build()));
}
/**
@@ -78,10 +73,8 @@ public class PropertiesReleaseDescriptorStore
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
*/
- public ReleaseDescriptorBuilder read( File file )
- throws ReleaseDescriptorStoreException
- {
- return read( null, file );
+ public ReleaseDescriptorBuilder read(File file) throws ReleaseDescriptorStoreException {
+ return read(null, file);
}
/**
@@ -92,62 +85,46 @@ public class PropertiesReleaseDescriptorStore
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
*/
- public ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor, File file )
- throws ReleaseDescriptorStoreException
- {
+ public ReleaseDescriptorBuilder read(ReleaseDescriptorBuilder mergeDescriptor, File file)
+ throws ReleaseDescriptorStoreException {
Properties properties = new Properties();
- try ( InputStream inStream = new FileInputStream( file ) )
- {
- properties.load( inStream );
- }
- catch ( FileNotFoundException e )
- {
- logger.debug( file.getName() + " not found - using empty properties" );
- }
- catch ( IOException e )
- {
+ try (InputStream inStream = new FileInputStream(file)) {
+ properties.load(inStream);
+ } catch (FileNotFoundException e) {
+ logger.debug(file.getName() + " not found - using empty properties");
+ } catch (IOException e) {
throw new ReleaseDescriptorStoreException(
- "Error reading properties file '" + file.getName() + "': " + e.getMessage(), e );
+ "Error reading properties file '" + file.getName() + "': " + e.getMessage(), e);
}
- try
- {
- mavenCrypto.decryptProperties( properties );
- }
- catch ( MavenCryptoException e )
- {
- logger.debug( e.getMessage() );
+ try {
+ mavenCrypto.decryptProperties(properties);
+ } catch (MavenCryptoException e) {
+ logger.debug(e.getMessage());
}
ReleaseDescriptorBuilder builder;
- if ( mergeDescriptor != null )
- {
+ if (mergeDescriptor != null) {
builder = mergeDescriptor;
- }
- else
- {
+ } else {
builder = new ReleaseDescriptorBuilder();
}
- ReleaseUtils.copyPropertiesToReleaseDescriptor( properties, builder );
+ ReleaseUtils.copyPropertiesToReleaseDescriptor(properties, builder);
return builder;
}
@Override
- public void write( ReleaseDescriptor config )
- throws ReleaseDescriptorStoreException
- {
- write( (BuilderReleaseDescriptor) config, getDefaultReleasePropertiesFile( config ) );
+ public void write(ReleaseDescriptor config) throws ReleaseDescriptorStoreException {
+ write((BuilderReleaseDescriptor) config, getDefaultReleasePropertiesFile(config));
}
@Override
- public void delete( ReleaseDescriptor config )
- {
- File file = getDefaultReleasePropertiesFile( config );
- if ( file.exists() )
- {
+ public void delete(ReleaseDescriptor config) {
+ File file = getDefaultReleasePropertiesFile(config);
+ if (file.exists()) {
file.delete();
}
}
@@ -160,232 +137,182 @@ public class PropertiesReleaseDescriptorStore
* @param file a {@link java.io.File} object
* @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
*/
- public void write( BuilderReleaseDescriptor config, File file )
- throws ReleaseDescriptorStoreException
- {
+ public void write(BuilderReleaseDescriptor config, File file) throws ReleaseDescriptorStoreException {
Properties properties = new Properties();
- properties.setProperty( "completedPhase", config.getCompletedPhase() );
- if ( config.isCommitByProject() ) //default is false
+ properties.setProperty("completedPhase", config.getCompletedPhase());
+ if (config.isCommitByProject()) // default is false
{
- properties.setProperty( "commitByProject", "true" );
+ properties.setProperty("commitByProject", "true");
}
- properties.setProperty( "scm.url", config.getScmSourceUrl() );
- if ( config.getScmId() != null )
- {
- properties.setProperty( "scm.id", config.getScmId() );
+ properties.setProperty("scm.url", config.getScmSourceUrl());
+ if (config.getScmId() != null) {
+ properties.setProperty("scm.id", config.getScmId());
}
- if ( config.getScmUsername() != null )
- {
- properties.setProperty( "scm.username", config.getScmUsername() );
+ if (config.getScmUsername() != null) {
+ properties.setProperty("scm.username", config.getScmUsername());
}
- if ( config.getScmPassword() != null )
- {
+ if (config.getScmPassword() != null) {
String password = config.getScmPassword();
- try
- {
- password = mavenCrypto.encryptAndDecorate( password );
- }
- catch ( MavenCryptoException e )
- {
- logger.debug( e.getMessage() );
+ try {
+ password = mavenCrypto.encryptAndDecorate(password);
+ } catch (MavenCryptoException e) {
+ logger.debug(e.getMessage());
}
- properties.setProperty( "scm.password", password );
+ properties.setProperty("scm.password", password);
}
- if ( config.getScmPrivateKey() != null )
- {
- properties.setProperty( "scm.privateKey", config.getScmPrivateKey() );
+ if (config.getScmPrivateKey() != null) {
+ properties.setProperty("scm.privateKey", config.getScmPrivateKey());
}
- if ( config.getScmPrivateKeyPassPhrase() != null )
- {
+ if (config.getScmPrivateKeyPassPhrase() != null) {
String passPhrase = config.getScmPrivateKeyPassPhrase();
- try
- {
- passPhrase = mavenCrypto.encryptAndDecorate( passPhrase );
- }
- catch ( MavenCryptoException e )
- {
- logger.debug( e.getMessage() );
+ try {
+ passPhrase = mavenCrypto.encryptAndDecorate(passPhrase);
+ } catch (MavenCryptoException e) {
+ logger.debug(e.getMessage());
}
- properties.setProperty( "scm.passphrase", passPhrase );
+ properties.setProperty("scm.passphrase", passPhrase);
}
- if ( config.getScmTagBase() != null )
- {
- properties.setProperty( "scm.tagBase", config.getScmTagBase() );
+ if (config.getScmTagBase() != null) {
+ properties.setProperty("scm.tagBase", config.getScmTagBase());
}
- if ( config.getScmBranchBase() != null )
- {
- properties.setProperty( "scm.branchBase", config.getScmBranchBase() );
+ if (config.getScmBranchBase() != null) {
+ properties.setProperty("scm.branchBase", config.getScmBranchBase());
}
- if ( config.getScmReleaseLabel() != null )
- {
- properties.setProperty( "scm.tag", config.getScmReleaseLabel() );
+ if (config.getScmReleaseLabel() != null) {
+ properties.setProperty("scm.tag", config.getScmReleaseLabel());
}
- if ( config.getScmTagNameFormat() != null )
- {
- properties.setProperty( "scm.tagNameFormat", config.getScmTagNameFormat() );
+ if (config.getScmTagNameFormat() != null) {
+ properties.setProperty("scm.tagNameFormat", config.getScmTagNameFormat());
}
- if ( config.getScmCommentPrefix() != null )
- {
- properties.setProperty( "scm.commentPrefix", config.getScmCommentPrefix() );
+ if (config.getScmCommentPrefix() != null) {
+ properties.setProperty("scm.commentPrefix", config.getScmCommentPrefix());
}
- if ( config.getScmDevelopmentCommitComment() != null )
- {
- properties.setProperty( "scm.developmentCommitComment", config.getScmDevelopmentCommitComment() );
+ if (config.getScmDevelopmentCommitComment() != null) {
+ properties.setProperty("scm.developmentCommitComment", config.getScmDevelopmentCommitComment());
}
- if ( config.getScmReleaseCommitComment() != null )
- {
- properties.setProperty( "scm.releaseCommitComment", config.getScmReleaseCommitComment() );
+ if (config.getScmReleaseCommitComment() != null) {
+ properties.setProperty("scm.releaseCommitComment", config.getScmReleaseCommitComment());
}
- if ( config.getScmBranchCommitComment() != null )
- {
- properties.setProperty( "scm.branchCommitComment", config.getScmBranchCommitComment() );
+ if (config.getScmBranchCommitComment() != null) {
+ properties.setProperty("scm.branchCommitComment", config.getScmBranchCommitComment());
}
- if ( config.getScmRollbackCommitComment() != null )
- {
- properties.setProperty( "scm.rollbackCommitComment", config.getScmRollbackCommitComment() );
+ if (config.getScmRollbackCommitComment() != null) {
+ properties.setProperty("scm.rollbackCommitComment", config.getScmRollbackCommitComment());
}
- if ( config.getAdditionalArguments() != null )
- {
- properties.setProperty( "exec.additionalArguments", config.getAdditionalArguments() );
+ if (config.getAdditionalArguments() != null) {
+ properties.setProperty("exec.additionalArguments", config.getAdditionalArguments());
}
- if ( config.getPomFileName() != null )
- {
- properties.setProperty( "exec.pomFileName", config.getPomFileName() );
+ if (config.getPomFileName() != null) {
+ properties.setProperty("exec.pomFileName", config.getPomFileName());
}
- if ( !config.getActivateProfiles().isEmpty() )
- {
- properties.setProperty( "exec.activateProfiles",
- StringUtils.join( config.getActivateProfiles().iterator(), "," ) );
+ if (!config.getActivateProfiles().isEmpty()) {
+ properties.setProperty(
+ "exec.activateProfiles",
+ StringUtils.join(config.getActivateProfiles().iterator(), ","));
}
- if ( config.getPreparationGoals() != null )
- {
- properties.setProperty( "preparationGoals", config.getPreparationGoals() );
+ if (config.getPreparationGoals() != null) {
+ properties.setProperty("preparationGoals", config.getPreparationGoals());
}
- if ( config.getCompletionGoals() != null )
- {
- properties.setProperty( "completionGoals", config.getCompletionGoals() );
+ if (config.getCompletionGoals() != null) {
+ properties.setProperty("completionGoals", config.getCompletionGoals());
}
- if ( config.getProjectVersionPolicyId() != null )
- {
- properties.setProperty( "projectVersionPolicyId", config.getProjectVersionPolicyId() );
+ if (config.getProjectVersionPolicyId() != null) {
+ properties.setProperty("projectVersionPolicyId", config.getProjectVersionPolicyId());
}
- if ( config.getProjectVersionPolicyConfig() != null )
- {
- properties.setProperty( "projectVersionPolicyConfig", config.getProjectVersionPolicyConfig().toString() );
+ if (config.getProjectVersionPolicyConfig() != null) {
+ properties.setProperty(
+ "projectVersionPolicyConfig",
+ config.getProjectVersionPolicyConfig().toString());
}
- if ( config.getProjectNamingPolicyId() != null )
- {
- properties.setProperty( "projectNamingPolicyId", config.getProjectNamingPolicyId() );
+ if (config.getProjectNamingPolicyId() != null) {
+ properties.setProperty("projectNamingPolicyId", config.getProjectNamingPolicyId());
}
- if ( config.getReleaseStrategyId() != null )
- {
- properties.setProperty( "releaseStrategyId", config.getReleaseStrategyId() );
+ if (config.getReleaseStrategyId() != null) {
+ properties.setProperty("releaseStrategyId", config.getReleaseStrategyId());
}
- properties.setProperty( "exec.snapshotReleasePluginAllowed",
- Boolean.toString( config.isSnapshotReleasePluginAllowed() ) );
+ properties.setProperty(
+ "exec.snapshotReleasePluginAllowed", Boolean.toString(config.isSnapshotReleasePluginAllowed()));
- properties.setProperty( "remoteTagging", Boolean.toString( config.isRemoteTagging() ) );
+ properties.setProperty("remoteTagging", Boolean.toString(config.isRemoteTagging()));
- properties.setProperty( "pinExternals", Boolean.toString( config.isPinExternals() ) );
+ properties.setProperty("pinExternals", Boolean.toString(config.isPinExternals()));
- properties.setProperty( "pushChanges", Boolean.toString( config.isPushChanges() ) );
+ properties.setProperty("pushChanges", Boolean.toString(config.isPushChanges()));
- if ( config.getWorkItem() != null )
- {
- properties.setProperty( "workItem", config.getWorkItem() );
+ if (config.getWorkItem() != null) {
+ properties.setProperty("workItem", config.getWorkItem());
}
- if ( config.getAutoResolveSnapshots() != null )
- {
- properties.setProperty( "autoResolveSnapshots", config.getAutoResolveSnapshots() );
+ if (config.getAutoResolveSnapshots() != null) {
+ properties.setProperty("autoResolveSnapshots", config.getAutoResolveSnapshots());
}
// others boolean properties are not written to the properties file because the value from the caller is always
// used
-
- for ( Map.Entry<String, ReleaseStageVersions> entry : config.getProjectVersions().entrySet() )
- {
- if ( entry.getValue().getRelease() != null )
- {
- properties.setProperty( "project.rel." + entry.getKey(), entry.getValue().getRelease() );
+ for (Map.Entry<String, ReleaseStageVersions> entry :
+ config.getProjectVersions().entrySet()) {
+ if (entry.getValue().getRelease() != null) {
+ properties.setProperty(
+ "project.rel." + entry.getKey(), entry.getValue().getRelease());
}
- if ( entry.getValue().getDevelopment() != null )
- {
- properties.setProperty( "project.dev." + entry.getKey(), entry.getValue().getDevelopment() );
+ if (entry.getValue().getDevelopment() != null) {
+ properties.setProperty(
+ "project.dev." + entry.getKey(), entry.getValue().getDevelopment());
}
}
- for ( Map.Entry<String, Scm> entry : config.getOriginalScmInfo().entrySet() )
- {
+ for (Map.Entry<String, Scm> entry : config.getOriginalScmInfo().entrySet()) {
Scm scm = entry.getValue();
String prefix = "project.scm." + entry.getKey();
- if ( scm != null )
- {
- if ( scm.getConnection() != null )
- {
- properties.setProperty( prefix + ".connection", scm.getConnection() );
+ if (scm != null) {
+ if (scm.getConnection() != null) {
+ properties.setProperty(prefix + ".connection", scm.getConnection());
}
- if ( scm.getDeveloperConnection() != null )
- {
- properties.setProperty( prefix + ".developerConnection", scm.getDeveloperConnection() );
+ if (scm.getDeveloperConnection() != null) {
+ properties.setProperty(prefix + ".developerConnection", scm.getDeveloperConnection());
}
- if ( scm.getUrl() != null )
- {
- properties.setProperty( prefix + ".url", scm.getUrl() );
+ if (scm.getUrl() != null) {
+ properties.setProperty(prefix + ".url", scm.getUrl());
}
- if ( scm.getTag() != null )
- {
- properties.setProperty( prefix + ".tag", scm.getTag() );
+ if (scm.getTag() != null) {
+ properties.setProperty(prefix + ".tag", scm.getTag());
}
- if ( scm instanceof IdentifiedScm )
- {
+ if (scm instanceof IdentifiedScm) {
IdentifiedScm identifiedScm = (IdentifiedScm) scm;
- if ( identifiedScm.getId() != null )
- {
- properties.setProperty( prefix + ".id", identifiedScm.getId() );
+ if (identifiedScm.getId() != null) {
+ properties.setProperty(prefix + ".id", identifiedScm.getId());
}
}
- }
- else
- {
- properties.setProperty( prefix + ".empty", "true" );
+ } else {
+ properties.setProperty(prefix + ".empty", "true");
}
}
- if ( ( config.getResolvedSnapshotDependencies() != null )
- && ( config.getResolvedSnapshotDependencies().size() > 0 ) )
- {
- processResolvedDependencies( properties, config.getResolvedSnapshotDependencies() );
+ if ((config.getResolvedSnapshotDependencies() != null)
+ && (config.getResolvedSnapshotDependencies().size() > 0)) {
+ processResolvedDependencies(properties, config.getResolvedSnapshotDependencies());
}
- try ( OutputStream outStream = new FileOutputStream( file ) )
- {
- properties.store( outStream, "release configuration" );
- }
- catch ( IOException e )
- {
+ try (OutputStream outStream = new FileOutputStream(file)) {
+ properties.store(outStream, "release configuration");
+ } catch (IOException e) {
throw new ReleaseDescriptorStoreException(
- "Error writing properties file '" + file.getName() + "': " + e.getMessage(), e );
+ "Error writing properties file '" + file.getName() + "': " + e.getMessage(), e);
}
}
- private void processResolvedDependencies( Properties prop, Map<String, ReleaseStageVersions> resolvedDependencies )
- {
- for ( Map.Entry<String, ReleaseStageVersions> currentEntry : resolvedDependencies.entrySet() )
- {
+ private void processResolvedDependencies(Properties prop, Map<String, ReleaseStageVersions> resolvedDependencies) {
+ for (Map.Entry<String, ReleaseStageVersions> currentEntry : resolvedDependencies.entrySet()) {
ReleaseStageVersions versionMap = currentEntry.getValue();
- prop.setProperty( "dependency." + currentEntry.getKey() + ".release",
- versionMap.getRelease() );
- prop.setProperty( "dependency." + currentEntry.getKey() + ".development",
- versionMap.getDevelopment() );
+ prop.setProperty("dependency." + currentEntry.getKey() + ".release", versionMap.getRelease());
+ prop.setProperty("dependency." + currentEntry.getKey() + ".development", versionMap.getDevelopment());
}
}
- private static File getDefaultReleasePropertiesFile( ReleaseDescriptor mergeDescriptor )
- {
- return new File( mergeDescriptor.getWorkingDirectory(), "release.properties" );
+ private static File getDefaultReleasePropertiesFile(ReleaseDescriptor mergeDescriptor) {
+ return new File(mergeDescriptor.getWorkingDirectory(), "release.properties");
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
index 5b81f703..a2afc729 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.config;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.config;
import java.util.List;
import java.util.regex.Matcher;
@@ -34,9 +33,8 @@ import org.slf4j.LoggerFactory;
* @author Robert Scholte
* @since 3.0.0-M5
*/
-public class ReleaseDescriptorBuilder
-{
- private static final Pattern PROPERTY_PATTERN = Pattern.compile( "\\$\\{[^}]+}" );
+public class ReleaseDescriptorBuilder {
+ private static final Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{[^}]+}");
private final Logger logger;
@@ -45,11 +43,8 @@ public class ReleaseDescriptorBuilder
*
* @author Robert Scholte
*/
- public static final class BuilderReleaseDescriptor extends ModelloReleaseDescriptor implements ReleaseDescriptor
- {
- private BuilderReleaseDescriptor()
- {
- }
+ public static final class BuilderReleaseDescriptor extends ModelloReleaseDescriptor implements ReleaseDescriptor {
+ private BuilderReleaseDescriptor() {}
}
private final BuilderReleaseDescriptor releaseDescriptor;
@@ -57,18 +52,16 @@ public class ReleaseDescriptorBuilder
/**
* <p>Constructor for ReleaseDescriptorBuilder.</p>
*/
- public ReleaseDescriptorBuilder()
- {
- this( LoggerFactory.getLogger( ReleaseDescriptorBuilder.class ) );
+ public ReleaseDescriptorBuilder() {
+ this(LoggerFactory.getLogger(ReleaseDescriptorBuilder.class));
}
/**
* Constructor for testing purpose.
*/
- ReleaseDescriptorBuilder( Logger logger )
- {
+ ReleaseDescriptorBuilder(Logger logger) {
this.releaseDescriptor = new BuilderReleaseDescriptor();
- this.releaseDescriptor.setLineSeparator( ReleaseUtil.LS );
+ this.releaseDescriptor.setLineSeparator(ReleaseUtil.LS);
this.logger = logger;
}
@@ -78,9 +71,8 @@ public class ReleaseDescriptorBuilder
* @param string a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addCheckModificationExclude( String string )
- {
- releaseDescriptor.addCheckModificationExclude( string );
+ public ReleaseDescriptorBuilder addCheckModificationExclude(String string) {
+ releaseDescriptor.addCheckModificationExclude(string);
return this;
}
@@ -90,9 +82,8 @@ public class ReleaseDescriptorBuilder
* @param profiles a {@link java.util.List} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setActivateProfiles( List<String> profiles )
- {
- releaseDescriptor.setActivateProfiles( profiles );
+ public ReleaseDescriptorBuilder setActivateProfiles(List<String> profiles) {
+ releaseDescriptor.setActivateProfiles(profiles);
return this;
}
@@ -102,9 +93,8 @@ public class ReleaseDescriptorBuilder
* @param addSchema a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setAddSchema( boolean addSchema )
- {
- releaseDescriptor.setAddSchema( addSchema );
+ public ReleaseDescriptorBuilder setAddSchema(boolean addSchema) {
+ releaseDescriptor.setAddSchema(addSchema);
return this;
}
@@ -114,25 +104,19 @@ public class ReleaseDescriptorBuilder
* @param additionalArguments a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setAdditionalArguments( String additionalArguments )
- {
- if ( additionalArguments != null )
- {
- Matcher matcher = PROPERTY_PATTERN.matcher( additionalArguments );
+ public ReleaseDescriptorBuilder setAdditionalArguments(String additionalArguments) {
+ if (additionalArguments != null) {
+ Matcher matcher = PROPERTY_PATTERN.matcher(additionalArguments);
StringBuffer buf = new StringBuffer();
- while ( matcher.find() )
- {
- matcher.appendReplacement( buf, "" );
- logger.warn( "arguments parameter contains unresolved property: '{}'",
- matcher.group() );
+ while (matcher.find()) {
+ matcher.appendReplacement(buf, "");
+ logger.warn("arguments parameter contains unresolved property: '{}'", matcher.group());
}
- matcher.appendTail( buf );
+ matcher.appendTail(buf);
- releaseDescriptor.setAdditionalArguments( buf.toString() );
- }
- else
- {
- releaseDescriptor.setAdditionalArguments( null );
+ releaseDescriptor.setAdditionalArguments(buf.toString());
+ } else {
+ releaseDescriptor.setAdditionalArguments(null);
}
return this;
}
@@ -143,9 +127,8 @@ public class ReleaseDescriptorBuilder
* @param allowTimestampedSnapshots a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setAllowTimestampedSnapshots( boolean allowTimestampedSnapshots )
- {
- releaseDescriptor.setAllowTimestampedSnapshots( allowTimestampedSnapshots );
+ public ReleaseDescriptorBuilder setAllowTimestampedSnapshots(boolean allowTimestampedSnapshots) {
+ releaseDescriptor.setAllowTimestampedSnapshots(allowTimestampedSnapshots);
return this;
}
@@ -155,9 +138,8 @@ public class ReleaseDescriptorBuilder
* @param autoVersionSubmodules a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setAutoVersionSubmodules( boolean autoVersionSubmodules )
- {
- releaseDescriptor.setAutoVersionSubmodules( autoVersionSubmodules );
+ public ReleaseDescriptorBuilder setAutoVersionSubmodules(boolean autoVersionSubmodules) {
+ releaseDescriptor.setAutoVersionSubmodules(autoVersionSubmodules);
return this;
}
@@ -167,9 +149,8 @@ public class ReleaseDescriptorBuilder
* @param branchCreation a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setBranchCreation( boolean branchCreation )
- {
- releaseDescriptor.setBranchCreation( branchCreation );
+ public ReleaseDescriptorBuilder setBranchCreation(boolean branchCreation) {
+ releaseDescriptor.setBranchCreation(branchCreation);
return this;
}
@@ -179,9 +160,8 @@ public class ReleaseDescriptorBuilder
* @param checkModificationExcludes a {@link java.util.List} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setCheckModificationExcludes( List<String> checkModificationExcludes )
- {
- releaseDescriptor.setCheckModificationExcludes( checkModificationExcludes );
+ public ReleaseDescriptorBuilder setCheckModificationExcludes(List<String> checkModificationExcludes) {
+ releaseDescriptor.setCheckModificationExcludes(checkModificationExcludes);
return this;
}
@@ -191,9 +171,8 @@ public class ReleaseDescriptorBuilder
* @param checkoutDirectory a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setCheckoutDirectory( String checkoutDirectory )
- {
- releaseDescriptor.setCheckoutDirectory( checkoutDirectory );
+ public ReleaseDescriptorBuilder setCheckoutDirectory(String checkoutDirectory) {
+ releaseDescriptor.setCheckoutDirectory(checkoutDirectory);
return this;
}
@@ -203,9 +182,8 @@ public class ReleaseDescriptorBuilder
* @param commitByProject a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setCommitByProject( boolean commitByProject )
- {
- releaseDescriptor.setCommitByProject( commitByProject );
+ public ReleaseDescriptorBuilder setCommitByProject(boolean commitByProject) {
+ releaseDescriptor.setCommitByProject(commitByProject);
return this;
}
@@ -215,9 +193,8 @@ public class ReleaseDescriptorBuilder
* @param completedPhase a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setCompletedPhase( String completedPhase )
- {
- releaseDescriptor.setCompletedPhase( completedPhase );
+ public ReleaseDescriptorBuilder setCompletedPhase(String completedPhase) {
+ releaseDescriptor.setCompletedPhase(completedPhase);
return this;
}
@@ -227,9 +204,8 @@ public class ReleaseDescriptorBuilder
* @param completionGoals a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setCompletionGoals( String completionGoals )
- {
- releaseDescriptor.setCompletionGoals( completionGoals );
+ public ReleaseDescriptorBuilder setCompletionGoals(String completionGoals) {
+ releaseDescriptor.setCompletionGoals(completionGoals);
return this;
}
@@ -239,9 +215,8 @@ public class ReleaseDescriptorBuilder
* @param defaultDevelopmentVersion a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setDefaultDevelopmentVersion( String defaultDevelopmentVersion )
- {
- releaseDescriptor.setDefaultDevelopmentVersion( defaultDevelopmentVersion );
+ public ReleaseDescriptorBuilder setDefaultDevelopmentVersion(String defaultDevelopmentVersion) {
+ releaseDescriptor.setDefaultDevelopmentVersion(defaultDevelopmentVersion);
return this;
}
@@ -251,9 +226,8 @@ public class ReleaseDescriptorBuilder
* @param defaultReleaseVersion a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setDefaultReleaseVersion( String defaultReleaseVersion )
- {
- releaseDescriptor.setDefaultReleaseVersion( defaultReleaseVersion );
+ public ReleaseDescriptorBuilder setDefaultReleaseVersion(String defaultReleaseVersion) {
+ releaseDescriptor.setDefaultReleaseVersion(defaultReleaseVersion);
return this;
}
@@ -263,9 +237,8 @@ public class ReleaseDescriptorBuilder
* @param description a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setDescription( String description )
- {
- releaseDescriptor.setDescription( description );
+ public ReleaseDescriptorBuilder setDescription(String description) {
+ releaseDescriptor.setDescription(description);
return this;
}
@@ -275,9 +248,8 @@ public class ReleaseDescriptorBuilder
* @param generateReleasePoms a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setGenerateReleasePoms( boolean generateReleasePoms )
- {
- releaseDescriptor.setGenerateReleasePoms( generateReleasePoms );
+ public ReleaseDescriptorBuilder setGenerateReleasePoms(boolean generateReleasePoms) {
+ releaseDescriptor.setGenerateReleasePoms(generateReleasePoms);
return this;
}
@@ -287,9 +259,8 @@ public class ReleaseDescriptorBuilder
* @param interactive a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setInteractive( boolean interactive )
- {
- releaseDescriptor.setInteractive( interactive );
+ public ReleaseDescriptorBuilder setInteractive(boolean interactive) {
+ releaseDescriptor.setInteractive(interactive);
return this;
}
@@ -299,9 +270,8 @@ public class ReleaseDescriptorBuilder
* @param ls a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setLineSeparator( String ls )
- {
- releaseDescriptor.setLineSeparator( ls );
+ public ReleaseDescriptorBuilder setLineSeparator(String ls) {
+ releaseDescriptor.setLineSeparator(ls);
return this;
}
@@ -311,9 +281,8 @@ public class ReleaseDescriptorBuilder
* @param localCheckout a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setLocalCheckout( boolean localCheckout )
- {
- releaseDescriptor.setLocalCheckout( localCheckout );
+ public ReleaseDescriptorBuilder setLocalCheckout(boolean localCheckout) {
+ releaseDescriptor.setLocalCheckout(localCheckout);
return this;
}
@@ -323,9 +292,8 @@ public class ReleaseDescriptorBuilder
* @param modelEncoding a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setModelEncoding( String modelEncoding )
- {
- releaseDescriptor.setModelEncoding( modelEncoding );
+ public ReleaseDescriptorBuilder setModelEncoding(String modelEncoding) {
+ releaseDescriptor.setModelEncoding(modelEncoding);
return this;
}
@@ -335,9 +303,8 @@ public class ReleaseDescriptorBuilder
* @param name a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setName( String name )
- {
- releaseDescriptor.setName( name );
+ public ReleaseDescriptorBuilder setName(String name) {
+ releaseDescriptor.setName(name);
return this;
}
@@ -347,9 +314,8 @@ public class ReleaseDescriptorBuilder
* @param performGoals a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setPerformGoals( String performGoals )
- {
- releaseDescriptor.setPerformGoals( performGoals );
+ public ReleaseDescriptorBuilder setPerformGoals(String performGoals) {
+ releaseDescriptor.setPerformGoals(performGoals);
return this;
}
@@ -359,9 +325,8 @@ public class ReleaseDescriptorBuilder
* @param pomFileName a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setPomFileName( String pomFileName )
- {
- releaseDescriptor.setPomFileName( pomFileName );
+ public ReleaseDescriptorBuilder setPomFileName(String pomFileName) {
+ releaseDescriptor.setPomFileName(pomFileName);
return this;
}
@@ -371,9 +336,8 @@ public class ReleaseDescriptorBuilder
* @param preparationGoals a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setPreparationGoals( String preparationGoals )
- {
- releaseDescriptor.setPreparationGoals( preparationGoals );
+ public ReleaseDescriptorBuilder setPreparationGoals(String preparationGoals) {
+ releaseDescriptor.setPreparationGoals(preparationGoals);
return this;
}
@@ -383,9 +347,8 @@ public class ReleaseDescriptorBuilder
* @param projectNamingPolicyId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setProjectNamingPolicyId( String projectNamingPolicyId )
- {
- releaseDescriptor.setProjectNamingPolicyId( projectNamingPolicyId );
+ public ReleaseDescriptorBuilder setProjectNamingPolicyId(String projectNamingPolicyId) {
+ releaseDescriptor.setProjectNamingPolicyId(projectNamingPolicyId);
return this;
}
@@ -395,9 +358,8 @@ public class ReleaseDescriptorBuilder
* @param projectVersionPolicyId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setProjectVersionPolicyId( String projectVersionPolicyId )
- {
- releaseDescriptor.setProjectVersionPolicyId( projectVersionPolicyId );
+ public ReleaseDescriptorBuilder setProjectVersionPolicyId(String projectVersionPolicyId) {
+ releaseDescriptor.setProjectVersionPolicyId(projectVersionPolicyId);
return this;
}
@@ -407,9 +369,8 @@ public class ReleaseDescriptorBuilder
* @param setProjectVersionPolicyConfig a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setProjectVersionPolicyConfig( String setProjectVersionPolicyConfig )
- {
- releaseDescriptor.setProjectVersionPolicyConfig( setProjectVersionPolicyConfig );
+ public ReleaseDescriptorBuilder setProjectVersionPolicyConfig(String setProjectVersionPolicyConfig) {
+ releaseDescriptor.setProjectVersionPolicyConfig(setProjectVersionPolicyConfig);
return this;
}
@@ -419,9 +380,8 @@ public class ReleaseDescriptorBuilder
* @param pushChanges a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setPushChanges( boolean pushChanges )
- {
- releaseDescriptor.setPushChanges( pushChanges );
+ public ReleaseDescriptorBuilder setPushChanges(boolean pushChanges) {
+ releaseDescriptor.setPushChanges(pushChanges);
return this;
}
@@ -431,9 +391,8 @@ public class ReleaseDescriptorBuilder
* @param workItem a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setWorkItem( String workItem )
- {
- releaseDescriptor.setWorkItem( workItem );
+ public ReleaseDescriptorBuilder setWorkItem(String workItem) {
+ releaseDescriptor.setWorkItem(workItem);
return this;
}
@@ -443,9 +402,8 @@ public class ReleaseDescriptorBuilder
* @param releaseStrategyId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setReleaseStrategyId( String releaseStrategyId )
- {
- releaseDescriptor.setReleaseStrategyId( releaseStrategyId );
+ public ReleaseDescriptorBuilder setReleaseStrategyId(String releaseStrategyId) {
+ releaseDescriptor.setReleaseStrategyId(releaseStrategyId);
return this;
}
@@ -455,9 +413,8 @@ public class ReleaseDescriptorBuilder
* @param remoteTagging a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setRemoteTagging( boolean remoteTagging )
- {
- releaseDescriptor.setRemoteTagging( remoteTagging );
+ public ReleaseDescriptorBuilder setRemoteTagging(boolean remoteTagging) {
+ releaseDescriptor.setRemoteTagging(remoteTagging);
return this;
}
@@ -467,9 +424,8 @@ public class ReleaseDescriptorBuilder
* @param scmBranchBase a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmBranchBase( String scmBranchBase )
- {
- releaseDescriptor.setScmBranchBase( scmBranchBase );
+ public ReleaseDescriptorBuilder setScmBranchBase(String scmBranchBase) {
+ releaseDescriptor.setScmBranchBase(scmBranchBase);
return this;
}
@@ -479,9 +435,8 @@ public class ReleaseDescriptorBuilder
* @param scmCommentPrefix a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmCommentPrefix( String scmCommentPrefix )
- {
- releaseDescriptor.setScmCommentPrefix( scmCommentPrefix );
+ public ReleaseDescriptorBuilder setScmCommentPrefix(String scmCommentPrefix) {
+ releaseDescriptor.setScmCommentPrefix(scmCommentPrefix);
return this;
}
@@ -492,9 +447,8 @@ public class ReleaseDescriptorBuilder
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @since 3.0.0-M6
*/
- public ReleaseDescriptorBuilder setScmShallowClone( boolean scmShallowClone )
- {
- releaseDescriptor.setScmShallowClone( scmShallowClone );
+ public ReleaseDescriptorBuilder setScmShallowClone(boolean scmShallowClone) {
+ releaseDescriptor.setScmShallowClone(scmShallowClone);
return this;
}
@@ -505,9 +459,8 @@ public class ReleaseDescriptorBuilder
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @since 3.0.0-M1
*/
- public ReleaseDescriptorBuilder setScmReleaseCommitComment( String scmReleaseCommitComment )
- {
- releaseDescriptor.setScmReleaseCommitComment( scmReleaseCommitComment );
+ public ReleaseDescriptorBuilder setScmReleaseCommitComment(String scmReleaseCommitComment) {
+ releaseDescriptor.setScmReleaseCommitComment(scmReleaseCommitComment);
return this;
}
@@ -518,9 +471,8 @@ public class ReleaseDescriptorBuilder
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @since 3.0.0-M1
*/
- public ReleaseDescriptorBuilder setScmDevelopmentCommitComment( String scmDevelopmentCommitComment )
- {
- releaseDescriptor.setScmDevelopmentCommitComment( scmDevelopmentCommitComment );
+ public ReleaseDescriptorBuilder setScmDevelopmentCommitComment(String scmDevelopmentCommitComment) {
+ releaseDescriptor.setScmDevelopmentCommitComment(scmDevelopmentCommitComment);
return this;
}
@@ -531,9 +483,8 @@ public class ReleaseDescriptorBuilder
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @since 3.0.0-M1
*/
- public ReleaseDescriptorBuilder setScmBranchCommitComment( String scmBranchCommitComment )
- {
- releaseDescriptor.setScmBranchCommitComment( scmBranchCommitComment );
+ public ReleaseDescriptorBuilder setScmBranchCommitComment(String scmBranchCommitComment) {
+ releaseDescriptor.setScmBranchCommitComment(scmBranchCommitComment);
return this;
}
@@ -544,9 +495,8 @@ public class ReleaseDescriptorBuilder
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @since 3.0.0-M1
*/
- public ReleaseDescriptorBuilder setScmRollbackCommitComment( String scmRollbackCommitComment )
- {
- releaseDescriptor.setScmRollbackCommitComment( scmRollbackCommitComment );
+ public ReleaseDescriptorBuilder setScmRollbackCommitComment(String scmRollbackCommitComment) {
+ releaseDescriptor.setScmRollbackCommitComment(scmRollbackCommitComment);
return this;
}
@@ -556,9 +506,8 @@ public class ReleaseDescriptorBuilder
* @param scmId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmId( String scmId )
- {
- releaseDescriptor.setScmId( scmId );
+ public ReleaseDescriptorBuilder setScmId(String scmId) {
+ releaseDescriptor.setScmId(scmId);
return this;
}
@@ -568,9 +517,8 @@ public class ReleaseDescriptorBuilder
* @param scmPassword a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmPassword( String scmPassword )
- {
- releaseDescriptor.setScmPassword( scmPassword );
+ public ReleaseDescriptorBuilder setScmPassword(String scmPassword) {
+ releaseDescriptor.setScmPassword(scmPassword);
return this;
}
@@ -580,9 +528,8 @@ public class ReleaseDescriptorBuilder
* @param scmPrivateKey a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmPrivateKey( String scmPrivateKey )
- {
- releaseDescriptor.setScmPrivateKey( scmPrivateKey );
+ public ReleaseDescriptorBuilder setScmPrivateKey(String scmPrivateKey) {
+ releaseDescriptor.setScmPrivateKey(scmPrivateKey);
return this;
}
@@ -592,9 +539,8 @@ public class ReleaseDescriptorBuilder
* @param scmPrivateKeyPassPhrase a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmPrivateKeyPassPhrase( String scmPrivateKeyPassPhrase )
- {
- releaseDescriptor.setScmPrivateKeyPassPhrase( scmPrivateKeyPassPhrase );
+ public ReleaseDescriptorBuilder setScmPrivateKeyPassPhrase(String scmPrivateKeyPassPhrase) {
+ releaseDescriptor.setScmPrivateKeyPassPhrase(scmPrivateKeyPassPhrase);
return this;
}
@@ -604,9 +550,8 @@ public class ReleaseDescriptorBuilder
* @param scmRelativePathProjectDirectory a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmRelativePathProjectDirectory( String scmRelativePathProjectDirectory )
- {
- releaseDescriptor.setScmRelativePathProjectDirectory( scmRelativePathProjectDirectory );
+ public ReleaseDescriptorBuilder setScmRelativePathProjectDirectory(String scmRelativePathProjectDirectory) {
+ releaseDescriptor.setScmRelativePathProjectDirectory(scmRelativePathProjectDirectory);
return this;
}
@@ -616,9 +561,8 @@ public class ReleaseDescriptorBuilder
* @param scmReleaseLabel a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmReleaseLabel( String scmReleaseLabel )
- {
- releaseDescriptor.setScmReleaseLabel( scmReleaseLabel );
+ public ReleaseDescriptorBuilder setScmReleaseLabel(String scmReleaseLabel) {
+ releaseDescriptor.setScmReleaseLabel(scmReleaseLabel);
return this;
}
@@ -628,9 +572,8 @@ public class ReleaseDescriptorBuilder
* @param scmReleasedPomRevision a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmReleasedPomRevision( String scmReleasedPomRevision )
- {
- releaseDescriptor.setScmReleasedPomRevision( scmReleasedPomRevision );
+ public ReleaseDescriptorBuilder setScmReleasedPomRevision(String scmReleasedPomRevision) {
+ releaseDescriptor.setScmReleasedPomRevision(scmReleasedPomRevision);
return this;
}
@@ -640,9 +583,8 @@ public class ReleaseDescriptorBuilder
* @param scmSourceUrl a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmSourceUrl( String scmSourceUrl )
- {
- releaseDescriptor.setScmSourceUrl( scmSourceUrl );
+ public ReleaseDescriptorBuilder setScmSourceUrl(String scmSourceUrl) {
+ releaseDescriptor.setScmSourceUrl(scmSourceUrl);
return this;
}
@@ -652,9 +594,8 @@ public class ReleaseDescriptorBuilder
* @param scmTagBase a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmTagBase( String scmTagBase )
- {
- releaseDescriptor.setScmTagBase( scmTagBase );
+ public ReleaseDescriptorBuilder setScmTagBase(String scmTagBase) {
+ releaseDescriptor.setScmTagBase(scmTagBase);
return this;
}
@@ -664,9 +605,8 @@ public class ReleaseDescriptorBuilder
* @param scmTagNameFormat a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmTagNameFormat( String scmTagNameFormat )
- {
- releaseDescriptor.setScmTagNameFormat( scmTagNameFormat );
+ public ReleaseDescriptorBuilder setScmTagNameFormat(String scmTagNameFormat) {
+ releaseDescriptor.setScmTagNameFormat(scmTagNameFormat);
return this;
}
@@ -676,9 +616,8 @@ public class ReleaseDescriptorBuilder
* @param signTags a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmSignTags( boolean signTags )
- {
- releaseDescriptor.setScmSignTags( signTags );
+ public ReleaseDescriptorBuilder setScmSignTags(boolean signTags) {
+ releaseDescriptor.setScmSignTags(signTags);
return this;
}
@@ -688,9 +627,8 @@ public class ReleaseDescriptorBuilder
* @param scmUseEditMode a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmUseEditMode( boolean scmUseEditMode )
- {
- releaseDescriptor.setScmUseEditMode( scmUseEditMode );
+ public ReleaseDescriptorBuilder setScmUseEditMode(boolean scmUseEditMode) {
+ releaseDescriptor.setScmUseEditMode(scmUseEditMode);
return this;
}
@@ -700,9 +638,8 @@ public class ReleaseDescriptorBuilder
* @param scmUsername a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setScmUsername( String scmUsername )
- {
- releaseDescriptor.setScmUsername( scmUsername );
+ public ReleaseDescriptorBuilder setScmUsername(String scmUsername) {
+ releaseDescriptor.setScmUsername(scmUsername);
return this;
}
@@ -712,9 +649,8 @@ public class ReleaseDescriptorBuilder
* @param snapshotReleasePluginAllowed a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setSnapshotReleasePluginAllowed( boolean snapshotReleasePluginAllowed )
- {
- releaseDescriptor.setSnapshotReleasePluginAllowed( snapshotReleasePluginAllowed );
+ public ReleaseDescriptorBuilder setSnapshotReleasePluginAllowed(boolean snapshotReleasePluginAllowed) {
+ releaseDescriptor.setSnapshotReleasePluginAllowed(snapshotReleasePluginAllowed);
return this;
}
@@ -724,9 +660,8 @@ public class ReleaseDescriptorBuilder
* @param suppressCommitBeforeTagOrBranch a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setSuppressCommitBeforeTagOrBranch( boolean suppressCommitBeforeTagOrBranch )
- {
- releaseDescriptor.setSuppressCommitBeforeTagOrBranch( suppressCommitBeforeTagOrBranch );
+ public ReleaseDescriptorBuilder setSuppressCommitBeforeTagOrBranch(boolean suppressCommitBeforeTagOrBranch) {
+ releaseDescriptor.setSuppressCommitBeforeTagOrBranch(suppressCommitBeforeTagOrBranch);
return this;
}
@@ -736,9 +671,8 @@ public class ReleaseDescriptorBuilder
* @param updateBranchVersions a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setUpdateBranchVersions( boolean updateBranchVersions )
- {
- releaseDescriptor.setUpdateBranchVersions( updateBranchVersions );
+ public ReleaseDescriptorBuilder setUpdateBranchVersions(boolean updateBranchVersions) {
+ releaseDescriptor.setUpdateBranchVersions(updateBranchVersions);
return this;
}
@@ -748,9 +682,8 @@ public class ReleaseDescriptorBuilder
* @param updateDependencies a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setUpdateDependencies( boolean updateDependencies )
- {
- releaseDescriptor.setUpdateDependencies( updateDependencies );
+ public ReleaseDescriptorBuilder setUpdateDependencies(boolean updateDependencies) {
+ releaseDescriptor.setUpdateDependencies(updateDependencies);
return this;
}
@@ -760,9 +693,8 @@ public class ReleaseDescriptorBuilder
* @param updateVersionsToSnapshot a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setUpdateVersionsToSnapshot( boolean updateVersionsToSnapshot )
- {
- releaseDescriptor.setUpdateVersionsToSnapshot( updateVersionsToSnapshot );
+ public ReleaseDescriptorBuilder setUpdateVersionsToSnapshot(boolean updateVersionsToSnapshot) {
+ releaseDescriptor.setUpdateVersionsToSnapshot(updateVersionsToSnapshot);
return this;
}
@@ -772,9 +704,8 @@ public class ReleaseDescriptorBuilder
* @param updateWorkingCopyVersions a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setUpdateWorkingCopyVersions( boolean updateWorkingCopyVersions )
- {
- releaseDescriptor.setUpdateWorkingCopyVersions( updateWorkingCopyVersions );
+ public ReleaseDescriptorBuilder setUpdateWorkingCopyVersions(boolean updateWorkingCopyVersions) {
+ releaseDescriptor.setUpdateWorkingCopyVersions(updateWorkingCopyVersions);
return this;
}
@@ -784,9 +715,8 @@ public class ReleaseDescriptorBuilder
* @param useReleaseProfile a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setUseReleaseProfile( boolean useReleaseProfile )
- {
- releaseDescriptor.setUseReleaseProfile( useReleaseProfile );
+ public ReleaseDescriptorBuilder setUseReleaseProfile(boolean useReleaseProfile) {
+ releaseDescriptor.setUseReleaseProfile(useReleaseProfile);
return this;
}
@@ -796,9 +726,8 @@ public class ReleaseDescriptorBuilder
* @param waitBeforeTagging a int
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setWaitBeforeTagging( int waitBeforeTagging )
- {
- releaseDescriptor.setWaitBeforeTagging( waitBeforeTagging );
+ public ReleaseDescriptorBuilder setWaitBeforeTagging(int waitBeforeTagging) {
+ releaseDescriptor.setWaitBeforeTagging(waitBeforeTagging);
return this;
}
@@ -808,9 +737,8 @@ public class ReleaseDescriptorBuilder
* @param workingDirectory a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setWorkingDirectory( String workingDirectory )
- {
- releaseDescriptor.setWorkingDirectory( workingDirectory );
+ public ReleaseDescriptorBuilder setWorkingDirectory(String workingDirectory) {
+ releaseDescriptor.setWorkingDirectory(workingDirectory);
return this;
}
@@ -821,9 +749,8 @@ public class ReleaseDescriptorBuilder
* @param value a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addReleaseVersion( String key, String value )
- {
- releaseDescriptor.addReleaseVersion( key, value );
+ public ReleaseDescriptorBuilder addReleaseVersion(String key, String value) {
+ releaseDescriptor.addReleaseVersion(key, value);
return this;
}
@@ -834,9 +761,8 @@ public class ReleaseDescriptorBuilder
* @param value a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addDevelopmentVersion( String key, String value )
- {
- releaseDescriptor.addDevelopmentVersion( key, value );
+ public ReleaseDescriptorBuilder addDevelopmentVersion(String key, String value) {
+ releaseDescriptor.addDevelopmentVersion(key, value);
return this;
}
@@ -847,9 +773,8 @@ public class ReleaseDescriptorBuilder
* @param value a {@link org.apache.maven.model.Scm} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addOriginalScmInfo( String key, Scm value )
- {
- releaseDescriptor.addOriginalScmInfo( key, value );
+ public ReleaseDescriptorBuilder addOriginalScmInfo(String key, Scm value) {
+ releaseDescriptor.addOriginalScmInfo(key, value);
return this;
}
@@ -859,9 +784,8 @@ public class ReleaseDescriptorBuilder
* @param projectKey a {@link java.lang.String} object
* @param version a {@link java.lang.String} object
*/
- public void putOriginalVersion( String projectKey, String version )
- {
- releaseDescriptor.addOriginalVersion( projectKey, version );
+ public void putOriginalVersion(String projectKey, String version) {
+ releaseDescriptor.addOriginalVersion(projectKey, version);
}
/**
@@ -871,11 +795,9 @@ public class ReleaseDescriptorBuilder
* @param version a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addDependencyOriginalVersion( String dependencyKey, String version )
- {
- releaseDescriptor.addDependencyOriginalVersion( dependencyKey, version );
+ public ReleaseDescriptorBuilder addDependencyOriginalVersion(String dependencyKey, String version) {
+ releaseDescriptor.addDependencyOriginalVersion(dependencyKey, version);
return this;
-
}
/**
@@ -885,9 +807,8 @@ public class ReleaseDescriptorBuilder
* @param version a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addDependencyReleaseVersion( String dependencyKey, String version )
- {
- releaseDescriptor.addDependencyReleaseVersion( dependencyKey, version );
+ public ReleaseDescriptorBuilder addDependencyReleaseVersion(String dependencyKey, String version) {
+ releaseDescriptor.addDependencyReleaseVersion(dependencyKey, version);
return this;
}
@@ -898,9 +819,8 @@ public class ReleaseDescriptorBuilder
* @param version a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder addDependencyDevelopmentVersion( String dependencyKey, String version )
- {
- releaseDescriptor.addDependencyDevelopmentVersion( dependencyKey, version );
+ public ReleaseDescriptorBuilder addDependencyDevelopmentVersion(String dependencyKey, String version) {
+ releaseDescriptor.addDependencyDevelopmentVersion(dependencyKey, version);
return this;
}
@@ -910,9 +830,8 @@ public class ReleaseDescriptorBuilder
* @param autoResolveSnapshots a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setAutoResolveSnapshots( String autoResolveSnapshots )
- {
- releaseDescriptor.setAutoResolveSnapshots( autoResolveSnapshots );
+ public ReleaseDescriptorBuilder setAutoResolveSnapshots(String autoResolveSnapshots) {
+ releaseDescriptor.setAutoResolveSnapshots(autoResolveSnapshots);
return this;
}
@@ -922,14 +841,12 @@ public class ReleaseDescriptorBuilder
* @param pinExternals a boolean
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public ReleaseDescriptorBuilder setPinExternals( boolean pinExternals )
- {
- releaseDescriptor.setPinExternals( pinExternals );
+ public ReleaseDescriptorBuilder setPinExternals(boolean pinExternals) {
+ releaseDescriptor.setPinExternals(pinExternals);
return this;
}
- public BuilderReleaseDescriptor build()
- {
+ public BuilderReleaseDescriptor build() {
return releaseDescriptor;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
index 86b1f5a8..d82eba3a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,14 +16,14 @@ package org.apache.maven.shared.release.config;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.config;
/**
* Storage for reading and writing release configuration.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface ReleaseDescriptorStore
-{
+public interface ReleaseDescriptorStore {
/**
* Read a configuration.
*
@@ -34,8 +32,7 @@ public interface ReleaseDescriptorStore
* @return the configuration
* @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
*/
- ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor )
- throws ReleaseDescriptorStoreException;
+ ReleaseDescriptorBuilder read(ReleaseDescriptorBuilder mergeDescriptor) throws ReleaseDescriptorStoreException;
/**
* Save a configuration.
@@ -43,13 +40,12 @@ public interface ReleaseDescriptorStore
* @param config the configuration
* @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
*/
- void write( ReleaseDescriptor config )
- throws ReleaseDescriptorStoreException;
+ void write(ReleaseDescriptor config) throws ReleaseDescriptorStoreException;
/**
* Remove a configuration.
*
* @param config the location of the configuration
*/
- void delete( ReleaseDescriptor config );
+ void delete(ReleaseDescriptor config);
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreException.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreException.java
index 75eccb44..fb7631aa 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreException.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,23 +16,21 @@ package org.apache.maven.shared.release.config;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.config;
/**
* Exception occurring within the configuration store.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ReleaseDescriptorStoreException
- extends Exception
-{
+public class ReleaseDescriptorStoreException extends Exception {
/**
* <p>Constructor for ReleaseDescriptorStoreException.</p>
*
* @param message a {@link java.lang.String} object
* @param t a {@link java.lang.Throwable} object
*/
- public ReleaseDescriptorStoreException( String message, Throwable t )
- {
- super( message, t );
+ public ReleaseDescriptorStoreException(String message, Throwable t) {
+ super(message, t);
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
index 2d24e35c..100fd02d 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.config;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.config;
import java.util.Arrays;
import java.util.Iterator;
@@ -33,14 +32,12 @@ import org.apache.maven.shared.release.scm.IdentifiedScm;
*
* @author <a href="mailto:jwhitlock@apache.org">Jeremy Whitlock</a>
*/
-public class ReleaseUtils
-{
+public class ReleaseUtils {
private static final String DEVELOPMENT_KEY = "dev";
private static final String RELEASE_KEY = "rel";
- private ReleaseUtils()
- {
+ private ReleaseUtils() {
// nothing to see here
}
@@ -50,8 +47,7 @@ public class ReleaseUtils
* @param builder a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
* @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderReleaseDescriptor} object
*/
- public static BuilderReleaseDescriptor buildReleaseDescriptor( ReleaseDescriptorBuilder builder )
- {
+ public static BuilderReleaseDescriptor buildReleaseDescriptor(ReleaseDescriptorBuilder builder) {
return builder.build();
}
@@ -61,194 +57,146 @@ public class ReleaseUtils
* @param properties a {@link java.util.Properties} object
* @param builder a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object
*/
- public static void copyPropertiesToReleaseDescriptor( Properties properties, ReleaseDescriptorBuilder builder )
- {
- if ( properties.containsKey( "completedPhase" ) )
- {
- builder.setCompletedPhase( properties.getProperty( "completedPhase" ) );
- }
- if ( properties.containsKey( "commitByProject" ) )
- {
- builder.setCommitByProject( Boolean.parseBoolean( properties.getProperty( "commitByProject" ) ) );
- }
- if ( properties.containsKey( "scm.id" ) )
- {
- builder.setScmId( properties.getProperty( "scm.id" ) );
- }
- if ( properties.containsKey( "scm.url" ) )
- {
- builder.setScmSourceUrl( properties.getProperty( "scm.url" ) );
- }
- if ( properties.containsKey( "scm.username" ) )
- {
- builder.setScmUsername( properties.getProperty( "scm.username" ) );
- }
- if ( properties.containsKey( "scm.password" ) )
- {
- builder.setScmPassword( properties.getProperty( "scm.password" ) );
- }
- if ( properties.containsKey( "scm.privateKey" ) )
- {
- builder.setScmPrivateKey( properties.getProperty( "scm.privateKey" ) );
- }
- if ( properties.containsKey( "scm.passphrase" ) )
- {
- builder.setScmPrivateKeyPassPhrase( properties.getProperty( "scm.passphrase" ) );
- }
- if ( properties.containsKey( "scm.tagBase" ) )
- {
- builder.setScmTagBase( properties.getProperty( "scm.tagBase" ) );
- }
- if ( properties.containsKey( "scm.tagNameFormat" ) )
- {
- builder.setScmTagNameFormat( properties.getProperty( "scm.tagNameFormat" ) );
- }
- if ( properties.containsKey( "scm.branchBase" ) )
- {
- builder.setScmBranchBase( properties.getProperty( "scm.branchBase" ) );
- }
- if ( properties.containsKey( "scm.tag" ) )
- {
- builder.setScmReleaseLabel( properties.getProperty( "scm.tag" ) );
- }
- if ( properties.containsKey( "scm.commentPrefix" ) )
- {
- builder.setScmCommentPrefix( properties.getProperty( "scm.commentPrefix" ) );
- }
- if ( properties.containsKey( "scm.developmentCommitComment" ) )
- {
- builder.setScmDevelopmentCommitComment( properties.getProperty( "scm.developmentCommitComment" ) );
- }
- if ( properties.containsKey( "scm.releaseCommitComment" ) )
- {
- builder.setScmReleaseCommitComment( properties.getProperty( "scm.releaseCommitComment" ) );
- }
- if ( properties.containsKey( "scm.branchCommitComment" ) )
- {
- builder.setScmBranchCommitComment( properties.getProperty( "scm.branchCommitComment" ) );
- }
- if ( properties.containsKey( "scm.rollbackCommitComment" ) )
- {
- builder.setScmRollbackCommitComment( properties.getProperty( "scm.rollbackCommitComment" ) );
- }
- if ( properties.containsKey( "exec.additionalArguments" ) )
- {
- builder.setAdditionalArguments( properties.getProperty( "exec.additionalArguments" ) );
- }
- if ( properties.containsKey( "exec.pomFileName" ) )
- {
- builder.setPomFileName( properties.getProperty( "exec.pomFileName" ) );
- }
- if ( properties.containsKey( "exec.activateProfiles" ) )
- {
- builder.setActivateProfiles(
- Arrays.asList( properties.getProperty( "exec.activateProfiles" ).split( "," ) ) );
- }
- if ( properties.containsKey( "preparationGoals" ) )
- {
- builder.setPreparationGoals( properties.getProperty( "preparationGoals" ) );
- }
- if ( properties.containsKey( "completionGoals" ) )
- {
- builder.setCompletionGoals( properties.getProperty( "completionGoals" ) );
- }
- if ( properties.containsKey( "projectVersionPolicyId" ) )
- {
- builder.setProjectVersionPolicyId( properties.getProperty( "projectVersionPolicyId" ) );
- }
- if ( properties.containsKey( "projectVersionPolicyConfig" ) )
- {
- builder.setProjectVersionPolicyConfig( properties.getProperty( "projectVersionPolicyConfig" ) );
- }
- if ( properties.containsKey( "projectNamingPolicyId" ) )
- {
- builder.setProjectNamingPolicyId( properties.getProperty( "projectNamingPolicyId" ) );
- }
- if ( properties.containsKey( "releaseStrategyId" ) )
- {
- builder.setReleaseStrategyId( properties.getProperty( "releaseStrategyId" ) );
- }
- if ( properties.containsKey( "exec.snapshotReleasePluginAllowed" ) )
- {
- String snapshotReleasePluginAllowedStr = properties.getProperty( "exec.snapshotReleasePluginAllowed" );
- builder.setSnapshotReleasePluginAllowed( Boolean.parseBoolean( snapshotReleasePluginAllowedStr ) );
- }
- if ( properties.containsKey( "remoteTagging" ) )
- {
- String remoteTaggingStr = properties.getProperty( "remoteTagging" );
- builder.setRemoteTagging( Boolean.parseBoolean( remoteTaggingStr ) );
- }
- if ( properties.containsKey( "pinExternals" ) )
- {
- String pinExternals = properties.getProperty( "pinExternals" );
- builder.setPinExternals( Boolean.parseBoolean( pinExternals ) );
+ public static void copyPropertiesToReleaseDescriptor(Properties properties, ReleaseDescriptorBuilder builder) {
+ if (properties.containsKey("completedPhase")) {
+ builder.setCompletedPhase(properties.getProperty("completedPhase"));
+ }
+ if (properties.containsKey("commitByProject")) {
+ builder.setCommitByProject(Boolean.parseBoolean(properties.getProperty("commitByProject")));
+ }
+ if (properties.containsKey("scm.id")) {
+ builder.setScmId(properties.getProperty("scm.id"));
+ }
+ if (properties.containsKey("scm.url")) {
+ builder.setScmSourceUrl(properties.getProperty("scm.url"));
+ }
+ if (properties.containsKey("scm.username")) {
+ builder.setScmUsername(properties.getProperty("scm.username"));
+ }
+ if (properties.containsKey("scm.password")) {
+ builder.setScmPassword(properties.getProperty("scm.password"));
+ }
+ if (properties.containsKey("scm.privateKey")) {
+ builder.setScmPrivateKey(properties.getProperty("scm.privateKey"));
+ }
+ if (properties.containsKey("scm.passphrase")) {
+ builder.setScmPrivateKeyPassPhrase(properties.getProperty("scm.passphrase"));
+ }
+ if (properties.containsKey("scm.tagBase")) {
+ builder.setScmTagBase(properties.getProperty("scm.tagBase"));
+ }
+ if (properties.containsKey("scm.tagNameFormat")) {
+ builder.setScmTagNameFormat(properties.getProperty("scm.tagNameFormat"));
+ }
+ if (properties.containsKey("scm.branchBase")) {
+ builder.setScmBranchBase(properties.getProperty("scm.branchBase"));
+ }
+ if (properties.containsKey("scm.tag")) {
+ builder.setScmReleaseLabel(properties.getProperty("scm.tag"));
+ }
+ if (properties.containsKey("scm.commentPrefix")) {
+ builder.setScmCommentPrefix(properties.getProperty("scm.commentPrefix"));
+ }
+ if (properties.containsKey("scm.developmentCommitComment")) {
+ builder.setScmDevelopmentCommitComment(properties.getProperty("scm.developmentCommitComment"));
+ }
+ if (properties.containsKey("scm.releaseCommitComment")) {
+ builder.setScmReleaseCommitComment(properties.getProperty("scm.releaseCommitComment"));
+ }
+ if (properties.containsKey("scm.branchCommitComment")) {
+ builder.setScmBranchCommitComment(properties.getProperty("scm.branchCommitComment"));
+ }
+ if (properties.containsKey("scm.rollbackCommitComment")) {
+ builder.setScmRollbackCommitComment(properties.getProperty("scm.rollbackCommitComment"));
+ }
+ if (properties.containsKey("exec.additionalArguments")) {
+ builder.setAdditionalArguments(properties.getProperty("exec.additionalArguments"));
+ }
+ if (properties.containsKey("exec.pomFileName")) {
+ builder.setPomFileName(properties.getProperty("exec.pomFileName"));
+ }
+ if (properties.containsKey("exec.activateProfiles")) {
+ builder.setActivateProfiles(Arrays.asList(
+ properties.getProperty("exec.activateProfiles").split(",")));
}
- if ( properties.containsKey( "pushChanges" ) )
- {
- String pushChanges = properties.getProperty( "pushChanges" );
- builder.setPushChanges( Boolean.parseBoolean( pushChanges ) );
- }
- if ( properties.containsKey( "workItem" ) )
- {
- builder.setWorkItem( properties.getProperty( "workItem" ) );
- }
- if ( properties.containsKey( "autoResolveSnapshots" ) )
- {
- String resolve = properties.getProperty( "autoResolveSnapshots" );
- builder.setAutoResolveSnapshots( resolve );
+ if (properties.containsKey("preparationGoals")) {
+ builder.setPreparationGoals(properties.getProperty("preparationGoals"));
+ }
+ if (properties.containsKey("completionGoals")) {
+ builder.setCompletionGoals(properties.getProperty("completionGoals"));
+ }
+ if (properties.containsKey("projectVersionPolicyId")) {
+ builder.setProjectVersionPolicyId(properties.getProperty("projectVersionPolicyId"));
+ }
+ if (properties.containsKey("projectVersionPolicyConfig")) {
+ builder.setProjectVersionPolicyConfig(properties.getProperty("projectVersionPolicyConfig"));
+ }
+ if (properties.containsKey("projectNamingPolicyId")) {
+ builder.setProjectNamingPolicyId(properties.getProperty("projectNamingPolicyId"));
+ }
+ if (properties.containsKey("releaseStrategyId")) {
+ builder.setReleaseStrategyId(properties.getProperty("releaseStrategyId"));
+ }
+ if (properties.containsKey("exec.snapshotReleasePluginAllowed")) {
+ String snapshotReleasePluginAllowedStr = properties.getProperty("exec.snapshotReleasePluginAllowed");
+ builder.setSnapshotReleasePluginAllowed(Boolean.parseBoolean(snapshotReleasePluginAllowedStr));
+ }
+ if (properties.containsKey("remoteTagging")) {
+ String remoteTaggingStr = properties.getProperty("remoteTagging");
+ builder.setRemoteTagging(Boolean.parseBoolean(remoteTaggingStr));
+ }
+ if (properties.containsKey("pinExternals")) {
+ String pinExternals = properties.getProperty("pinExternals");
+ builder.setPinExternals(Boolean.parseBoolean(pinExternals));
+ }
+ if (properties.containsKey("pushChanges")) {
+ String pushChanges = properties.getProperty("pushChanges");
+ builder.setPushChanges(Boolean.parseBoolean(pushChanges));
+ }
+ if (properties.containsKey("workItem")) {
+ builder.setWorkItem(properties.getProperty("workItem"));
+ }
+ if (properties.containsKey("autoResolveSnapshots")) {
+ String resolve = properties.getProperty("autoResolveSnapshots");
+ builder.setAutoResolveSnapshots(resolve);
}
- loadResolvedDependencies( properties, builder );
+ loadResolvedDependencies(properties, builder);
// boolean properties are not written to the properties file because the value from the caller is always used
- for ( Object o : properties.keySet() )
- {
+ for (Object o : properties.keySet()) {
String property = (String) o;
- if ( property.startsWith( "project.rel." ) )
- {
- builder.addReleaseVersion( property.substring( "project.rel.".length() ),
- properties.getProperty( property ) );
- }
- else if ( property.startsWith( "project.dev." ) )
- {
- builder.addDevelopmentVersion( property.substring( "project.dev.".length() ),
- properties.getProperty( property ) );
- }
- else if ( property.startsWith( "dependency.rel." ) )
- {
- builder.addDependencyReleaseVersion( property.substring( "dependency.rel.".length() ),
- properties.getProperty( property ) );
- }
- else if ( property.startsWith( "dependency.dev." ) )
- {
- builder.addDependencyDevelopmentVersion( property.substring( "dependency.dev.".length() ),
- properties.getProperty( property ) );
- }
- else if ( property.startsWith( "project.scm." ) )
- {
- int index = property.lastIndexOf( '.' );
- if ( index > "project.scm.".length() )
- {
- String key = property.substring( "project.scm.".length(), index );
-
- if ( builder.build().getOriginalScmInfo( key ) == null )
- {
- if ( properties.getProperty( "project.scm." + key + ".empty" ) != null )
- {
- builder.addOriginalScmInfo( key, null );
- }
- else
- {
+ if (property.startsWith("project.rel.")) {
+ builder.addReleaseVersion(
+ property.substring("project.rel.".length()), properties.getProperty(property));
+ } else if (property.startsWith("project.dev.")) {
+ builder.addDevelopmentVersion(
+ property.substring("project.dev.".length()), properties.getProperty(property));
+ } else if (property.startsWith("dependency.rel.")) {
+ builder.addDependencyReleaseVersion(
+ property.substring("dependency.rel.".length()), properties.getProperty(property));
+ } else if (property.startsWith("dependency.dev.")) {
+ builder.addDependencyDevelopmentVersion(
+ property.substring("dependency.dev.".length()), properties.getProperty(property));
+ } else if (property.startsWith("project.scm.")) {
+ int index = property.lastIndexOf('.');
+ if (index > "project.scm.".length()) {
+ String key = property.substring("project.scm.".length(), index);
+
+ if (builder.build().getOriginalScmInfo(key) == null) {
+ if (properties.getProperty("project.scm." + key + ".empty") != null) {
+ builder.addOriginalScmInfo(key, null);
+ } else {
IdentifiedScm scm = new IdentifiedScm();
- scm.setConnection( properties.getProperty( "project.scm." + key + ".connection" ) );
+ scm.setConnection(properties.getProperty("project.scm." + key + ".connection"));
scm.setDeveloperConnection(
- properties.getProperty( "project.scm." + key + ".developerConnection" ) );
- scm.setUrl( properties.getProperty( "project.scm." + key + ".url" ) );
- scm.setTag( properties.getProperty( "project.scm." + key + ".tag" ) );
- scm.setId( properties.getProperty( "project.scm." + key + ".id" ) );
+ properties.getProperty("project.scm." + key + ".developerConnection"));
+ scm.setUrl(properties.getProperty("project.scm." + key + ".url"));
+ scm.setTag(properties.getProperty("project.scm." + key + ".tag"));
+ scm.setId(properties.getProperty("project.scm." + key + ".id"));
- builder.addOriginalScmInfo( key, scm );
+ builder.addOriginalScmInfo(key, scm);
}
}
}
@@ -256,53 +204,41 @@ public class ReleaseUtils
}
}
- private static void loadResolvedDependencies( Properties prop, ReleaseDescriptorBuilder builder )
- {
+ private static void loadResolvedDependencies(Properties prop, ReleaseDescriptorBuilder builder) {
Set entries = prop.entrySet();
Iterator<Entry<String, String>> iterator = entries.iterator();
String propertyName;
Entry<String, String> currentEntry;
- while ( iterator.hasNext() )
- {
+ while (iterator.hasNext()) {
currentEntry = iterator.next();
propertyName = currentEntry.getKey();
- if ( propertyName.startsWith( "dependency." ) )
- {
+ if (propertyName.startsWith("dependency.")) {
String artifactVersionlessKey;
int startIndex = "dependency.".length();
int endIndex;
String versionType;
- if ( propertyName.contains( ".development" ) )
- {
- endIndex = propertyName.lastIndexOf( ".development" );
+ if (propertyName.contains(".development")) {
+ endIndex = propertyName.lastIndexOf(".development");
versionType = DEVELOPMENT_KEY;
- }
- else if ( propertyName.contains( ".release" ) )
- {
- endIndex = propertyName.lastIndexOf( ".release" );
+ } else if (propertyName.contains(".release")) {
+ endIndex = propertyName.lastIndexOf(".release");
versionType = RELEASE_KEY;
- }
- else
- {
+ } else {
// MRELEASE-834, probably a maven-dependency-plugin property
continue;
}
- artifactVersionlessKey = propertyName.substring( startIndex, endIndex );
+ artifactVersionlessKey = propertyName.substring(startIndex, endIndex);
- if ( RELEASE_KEY.equals( versionType ) )
- {
- builder.addDependencyReleaseVersion( artifactVersionlessKey, currentEntry.getValue() );
- }
- else if ( DEVELOPMENT_KEY.equals( versionType ) )
- {
- builder.addDependencyDevelopmentVersion( artifactVersionlessKey, currentEntry.getValue() );
+ if (RELEASE_KEY.equals(versionType)) {
+ builder.addDependencyReleaseVersion(artifactVersionlessKey, currentEntry.getValue());
+ } else if (DEVELOPMENT_KEY.equals(versionType)) {
+ builder.addDependencyDevelopmentVersion(artifactVersionlessKey, currentEntry.getValue());
}
}
}
}
-
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
index b9a393f3..787e1abb 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.env;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.env;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.env;
import java.io.File;
@@ -26,9 +25,7 @@ import org.apache.maven.settings.Settings;
/**
* <p>DefaultReleaseEnvironment class.</p>
*/
-public class DefaultReleaseEnvironment
- implements ReleaseEnvironment
-{
+public class DefaultReleaseEnvironment implements ReleaseEnvironment {
private File mavenHome;
private File javaHome;
@@ -40,14 +37,12 @@ public class DefaultReleaseEnvironment
private String mavenExecutorId = DEFAULT_MAVEN_EXECUTOR_ID;
@Override
- public File getMavenHome()
- {
+ public File getMavenHome() {
return mavenHome;
}
@Override
- public Settings getSettings()
- {
+ public Settings getSettings() {
return settings;
}
@@ -57,8 +52,7 @@ public class DefaultReleaseEnvironment
* @param mavenHome a {@link java.io.File} object
* @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
*/
- public DefaultReleaseEnvironment setMavenHome( File mavenHome )
- {
+ public DefaultReleaseEnvironment setMavenHome(File mavenHome) {
this.mavenHome = mavenHome;
return this;
}
@@ -69,15 +63,13 @@ public class DefaultReleaseEnvironment
* @param settings a {@link org.apache.maven.settings.Settings} object
* @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
*/
- public DefaultReleaseEnvironment setSettings( Settings settings )
- {
+ public DefaultReleaseEnvironment setSettings(Settings settings) {
this.settings = settings;
return this;
}
@Override
- public String getMavenExecutorId()
- {
+ public String getMavenExecutorId() {
return mavenExecutorId;
}
@@ -87,15 +79,13 @@ public class DefaultReleaseEnvironment
* @param mavenExecutorId a {@link java.lang.String} object
* @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
*/
- public DefaultReleaseEnvironment setMavenExecutorId( String mavenExecutorId )
- {
+ public DefaultReleaseEnvironment setMavenExecutorId(String mavenExecutorId) {
this.mavenExecutorId = mavenExecutorId;
return this;
}
@Override
- public File getJavaHome()
- {
+ public File getJavaHome() {
return javaHome;
}
@@ -105,20 +95,17 @@ public class DefaultReleaseEnvironment
* @param javaHome a {@link java.io.File} object
* @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
*/
- public DefaultReleaseEnvironment setJavaHome( File javaHome )
- {
+ public DefaultReleaseEnvironment setJavaHome(File javaHome) {
this.javaHome = javaHome;
return this;
}
@Override
- public File getLocalRepositoryDirectory()
- {
+ public File getLocalRepositoryDirectory() {
File localRepo = localRepositoryDirectory;
- if ( localRepo == null && settings != null && settings.getLocalRepository() != null )
- {
- localRepo = new File( settings.getLocalRepository() ).getAbsoluteFile();
+ if (localRepo == null && settings != null && settings.getLocalRepository() != null) {
+ localRepo = new File(settings.getLocalRepository()).getAbsoluteFile();
}
return localRepo;
@@ -130,8 +117,7 @@ public class DefaultReleaseEnvironment
* @param localRepositoryDirectory a {@link java.io.File} object
* @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
*/
- public DefaultReleaseEnvironment setLocalRepositoryDirectory( File localRepositoryDirectory )
- {
+ public DefaultReleaseEnvironment setLocalRepositoryDirectory(File localRepositoryDirectory) {
this.localRepositoryDirectory = localRepositoryDirectory;
return this;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index f63d2bf6..980929a1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import java.io.File;
import java.util.ArrayList;
@@ -42,39 +41,44 @@ import static java.util.Objects.requireNonNull;
/**
* <p>Abstract AbstractMavenExecutor class.</p>
*/
-public abstract class AbstractMavenExecutor
- implements MavenExecutor
-{
- private final Logger logger = LoggerFactory.getLogger( getClass() );
+public abstract class AbstractMavenExecutor implements MavenExecutor {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private final MavenCrypto mavenCrypto;
- protected AbstractMavenExecutor( MavenCrypto mavenCrypto )
- {
- this.mavenCrypto = requireNonNull( mavenCrypto );
+ protected AbstractMavenExecutor(MavenCrypto mavenCrypto) {
+ this.mavenCrypto = requireNonNull(mavenCrypto);
}
@Override
- public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, String pomFileName,
- ReleaseResult result )
- throws MavenExecutorException
- {
+ public void executeGoals(
+ File workingDirectory,
+ String goals,
+ ReleaseEnvironment releaseEnvironment,
+ boolean interactive,
+ String additionalArguments,
+ String pomFileName,
+ ReleaseResult result)
+ throws MavenExecutorException {
List<String> goalsList = new ArrayList<>();
- if ( goals != null )
- {
+ if (goals != null) {
// 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.
- Collections.addAll( goalsList, StringUtils.split( goals, ", \n\r\t" ) );
+ Collections.addAll(goalsList, StringUtils.split(goals, ", \n\r\t"));
}
- 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;
/**
@@ -82,8 +86,7 @@ public abstract class AbstractMavenExecutor
*
* @return a {@link Logger} object
*/
- protected final Logger getLogger()
- {
+ protected final Logger getLogger() {
return logger;
}
@@ -93,50 +96,35 @@ public abstract class AbstractMavenExecutor
* @param settings a {@link org.apache.maven.settings.Settings} object
* @return a {@link org.apache.maven.settings.Settings} object
*/
- protected Settings encryptSettings( Settings settings )
- {
- Settings encryptedSettings = SettingsUtils.copySettings( settings );
+ protected Settings encryptSettings(Settings settings) {
+ Settings encryptedSettings = SettingsUtils.copySettings(settings);
- for ( Server server : encryptedSettings.getServers() )
- {
+ for (Server server : encryptedSettings.getServers()) {
String password = server.getPassword();
- if ( password != null && !mavenCrypto.isEncryptedString( password ) )
- {
- try
- {
- server.setPassword( mavenCrypto.encryptAndDecorate( password ) );
- }
- catch ( MavenCryptoException e )
- {
+ if (password != null && !mavenCrypto.isEncryptedString(password)) {
+ try {
+ server.setPassword(mavenCrypto.encryptAndDecorate(password));
+ } catch (MavenCryptoException e) {
// ignore
}
}
String passphrase = server.getPassphrase();
- if ( passphrase != null && !mavenCrypto.isEncryptedString( passphrase ) )
- {
- try
- {
- server.setPassphrase( mavenCrypto.encryptAndDecorate( passphrase ) );
- }
- catch ( MavenCryptoException e )
- {
+ if (passphrase != null && !mavenCrypto.isEncryptedString(passphrase)) {
+ try {
+ server.setPassphrase(mavenCrypto.encryptAndDecorate(passphrase));
+ } catch (MavenCryptoException e) {
// ignore
}
}
}
- for ( Proxy proxy : encryptedSettings.getProxies() )
- {
+ for (Proxy proxy : encryptedSettings.getProxies()) {
String password = proxy.getPassword();
- if ( password != null && !mavenCrypto.isEncryptedString( password ) )
- {
- try
- {
- proxy.setPassword( mavenCrypto.encryptAndDecorate( password ) );
- }
- catch ( MavenCryptoException e )
- {
+ if (password != null && !mavenCrypto.isEncryptedString(password)) {
+ try {
+ proxy.setPassword(mavenCrypto.encryptAndDecorate(password));
+ } catch (MavenCryptoException e) {
// ignore
}
}
@@ -150,8 +138,7 @@ public abstract class AbstractMavenExecutor
*
* @return a {@link org.apache.maven.settings.io.xpp3.SettingsXpp3Writer} object
*/
- protected SettingsXpp3Writer getSettingsWriter()
- {
+ protected SettingsXpp3Writer getSettingsWriter() {
return new SettingsXpp3Writer();
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
index 50e7a12e..90c6b598 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import org.codehaus.plexus.util.cli.Commandline;
@@ -26,8 +25,7 @@ import org.codehaus.plexus.util.cli.Commandline;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface CommandLineFactory
-{
+public interface CommandLineFactory {
/**
* Create a command line object with default environment for the given executable.
*
@@ -36,6 +34,5 @@ public interface CommandLineFactory
* @throws org.apache.maven.shared.release.exec.MavenExecutorException if there was a problem creating
* the command line
*/
- Commandline createCommandLine( String executable )
- throws MavenExecutorException;
+ Commandline createCommandLine(String executable) throws MavenExecutorException;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
index cdf8a191..7b857cd1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -31,23 +30,16 @@ import org.codehaus.plexus.util.cli.Commandline;
*/
@Singleton
@Named
-public class DefaultCommandLineFactory
- implements CommandLineFactory
-{
+public class DefaultCommandLineFactory implements CommandLineFactory {
@Override
- public Commandline createCommandLine( String executable )
- throws MavenExecutorException
- {
+ public Commandline createCommandLine(String executable) throws MavenExecutorException {
Commandline commandline = new Commandline();
- commandline.setExecutable( executable );
+ commandline.setExecutable(executable);
- try
- {
+ try {
commandline.addSystemEnvironment();
- }
- catch ( Exception e )
- {
- throw new MavenExecutorException( e.getMessage(), e );
+ } catch (Exception e) {
+ throw new MavenExecutorException(e.getMessage(), e);
}
return commandline;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
index 1c5c3620..947424b0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import javax.inject.Inject;
import javax.inject.Named;
@@ -46,131 +45,108 @@ import static java.util.Objects.requireNonNull;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@Singleton
-@Named( "forked-path" )
-public class ForkedMavenExecutor
- extends AbstractMavenExecutor
-{
+@Named("forked-path")
+public class ForkedMavenExecutor extends AbstractMavenExecutor {
/**
* Command line factory.
*/
private final CommandLineFactory commandLineFactory;
@Inject
- public ForkedMavenExecutor( MavenCrypto mavenCrypto,
- CommandLineFactory commandLineFactory )
- {
- super( mavenCrypto );
- this.commandLineFactory = requireNonNull( commandLineFactory );
+ public ForkedMavenExecutor(MavenCrypto mavenCrypto, CommandLineFactory commandLineFactory) {
+ super(mavenCrypto);
+ this.commandLineFactory = requireNonNull(commandLineFactory);
}
/*
* @noinspection UseOfSystemOutOrSystemErr
*/
@Override
- public void executeGoals( File workingDirectory, List<String> goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, String pomFileName,
- ReleaseResult relResult )
- throws MavenExecutorException
- {
+ public void executeGoals(
+ File workingDirectory,
+ List<String> goals,
+ ReleaseEnvironment releaseEnvironment,
+ boolean interactive,
+ String additionalArguments,
+ String pomFileName,
+ ReleaseResult relResult)
+ throws MavenExecutorException {
String mavenPath;
// if null we use the current one
- if ( releaseEnvironment.getMavenHome() != null )
- {
+ if (releaseEnvironment.getMavenHome() != null) {
mavenPath = releaseEnvironment.getMavenHome().getAbsolutePath();
- }
- else
- {
- mavenPath = System.getProperty( "maven.home" );
+ } else {
+ mavenPath = System.getProperty("maven.home");
}
File settingsFile = null;
- if ( releaseEnvironment.getSettings() != null )
- {
+ if (releaseEnvironment.getSettings() != null) {
// Have to serialize to a file as if Maven is embedded, there may not actually be a settings.xml on disk
- try
- {
- settingsFile = File.createTempFile( "release-settings", ".xml" );
+ try {
+ settingsFile = File.createTempFile("release-settings", ".xml");
SettingsXpp3Writer writer = getSettingsWriter();
- try ( FileWriter fileWriter = new FileWriter( settingsFile ) )
- {
- writer.write( fileWriter, encryptSettings( releaseEnvironment.getSettings() ) );
+ try (FileWriter fileWriter = new FileWriter(settingsFile)) {
+ writer.write(fileWriter, encryptSettings(releaseEnvironment.getSettings()));
}
- }
- catch ( IOException e )
- {
- throw new MavenExecutorException( "Could not create temporary file for release settings.xml", e );
+ } catch (IOException e) {
+ throw new MavenExecutorException("Could not create temporary file for release settings.xml", e);
}
}
- try
- {
+ try {
Commandline cl =
- commandLineFactory.createCommandLine( mavenPath + File.separator + "bin" + File.separator + "mvn" );
+ commandLineFactory.createCommandLine(mavenPath + File.separator + "bin" + File.separator + "mvn");
- cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ cl.setWorkingDirectory(workingDirectory.getAbsolutePath());
// FIX for MRELEASE-1105
- //cl.addEnvironment( "MAVEN_DEBUG_OPTS", "" );
+ // cl.addEnvironment( "MAVEN_DEBUG_OPTS", "" );
- cl.addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
+ cl.addEnvironment("MAVEN_TERMINATE_CMD", "on");
- if ( settingsFile != null )
- {
- cl.createArg().setValue( "-s" );
- cl.createArg().setFile( settingsFile );
+ if (settingsFile != null) {
+ cl.createArg().setValue("-s");
+ cl.createArg().setFile(settingsFile);
}
- if ( pomFileName != null )
- {
- cl.createArg().setValue( "-f" );
- cl.createArg().setValue( pomFileName );
+ if (pomFileName != null) {
+ cl.createArg().setValue("-f");
+ cl.createArg().setValue(pomFileName);
}
- for ( String goal : goals )
- {
- cl.createArg().setValue( goal );
+ for (String goal : goals) {
+ cl.createArg().setValue(goal);
}
- if ( !interactive )
- {
- cl.createArg().setValue( "--batch-mode" );
+ if (!interactive) {
+ cl.createArg().setValue("--batch-mode");
}
- if ( !StringUtils.isEmpty( additionalArguments ) )
- {
- cl.createArg().setLine( additionalArguments );
+ if (!StringUtils.isEmpty(additionalArguments)) {
+ cl.createArg().setLine(additionalArguments);
}
- TeeOutputStream stdOut = new TeeOutputStream( System.out );
+ TeeOutputStream stdOut = new TeeOutputStream(System.out);
- TeeOutputStream stdErr = new TeeOutputStream( System.err );
+ TeeOutputStream stdErr = new TeeOutputStream(System.err);
- try
- {
- relResult.appendInfo( "Executing: " + cl );
- getLogger().info( "Executing: " + cl );
+ try {
+ relResult.appendInfo("Executing: " + cl);
+ getLogger().info("Executing: " + cl);
- int result = executeCommandLine( cl, System.in, stdOut, stdErr );
+ int result = executeCommandLine(cl, System.in, stdOut, stdErr);
- if ( result != 0 )
- {
- throw new MavenExecutorException( "Maven execution failed, exit code: '" + result + "'", result );
+ if (result != 0) {
+ throw new MavenExecutorException("Maven execution failed, exit code: '" + result + "'", result);
}
+ } catch (CommandLineException e) {
+ throw new MavenExecutorException("Can't run goal " + goals, e);
+ } finally {
+ relResult.appendOutput(stdOut.toString());
}
- catch ( CommandLineException e )
- {
- throw new MavenExecutorException( "Can't run goal " + goals, e );
- }
- finally
- {
- relResult.appendOutput( stdOut.toString() );
- }
- }
- finally
- {
- if ( settingsFile != null && settingsFile.exists() && !settingsFile.delete() )
- {
+ } finally {
+ if (settingsFile != null && settingsFile.exists() && !settingsFile.delete()) {
settingsFile.deleteOnExit();
}
}
@@ -186,31 +162,27 @@ public class ForkedMavenExecutor
* @return a int
* @throws org.codehaus.plexus.util.cli.CommandLineException if any.
*/
- public static int executeCommandLine( Commandline cl, InputStream systemIn, OutputStream systemOut,
- OutputStream systemErr )
- throws CommandLineException
- {
- if ( cl == null )
- {
- throw new IllegalArgumentException( "cl cannot be null." );
+ public static int executeCommandLine(
+ Commandline cl, InputStream systemIn, OutputStream systemOut, OutputStream systemErr)
+ throws CommandLineException {
+ if (cl == null) {
+ throw new IllegalArgumentException("cl cannot be null.");
}
Process p = cl.execute();
- //processes.put( new Long( cl.getPid() ), p );
+ // processes.put( new Long( cl.getPid() ), p );
RawStreamPumper inputFeeder = null;
- if ( systemIn != null )
- {
- inputFeeder = new RawStreamPumper( systemIn, p.getOutputStream(), true );
+ if (systemIn != null) {
+ inputFeeder = new RawStreamPumper(systemIn, p.getOutputStream(), true);
}
- RawStreamPumper outputPumper = new RawStreamPumper( p.getInputStream(), systemOut );
- RawStreamPumper errorPumper = new RawStreamPumper( p.getErrorStream(), systemErr );
+ RawStreamPumper outputPumper = new RawStreamPumper(p.getInputStream(), systemOut);
+ RawStreamPumper errorPumper = new RawStreamPumper(p.getErrorStream(), systemErr);
- if ( inputFeeder != null )
- {
+ if (inputFeeder != null) {
inputFeeder.start();
}
@@ -218,57 +190,39 @@ public class ForkedMavenExecutor
errorPumper.start();
- try
- {
+ try {
int returnValue = p.waitFor();
- if ( inputFeeder != null )
- {
+ if (inputFeeder != null) {
inputFeeder.setDone();
}
outputPumper.setDone();
errorPumper.setDone();
- //processes.remove( new Long( cl.getPid() ) );
+ // processes.remove( new Long( cl.getPid() ) );
return returnValue;
- }
- catch ( InterruptedException ex )
- {
- //killProcess( cl.getPid() );
- throw new CommandLineException( "Error while executing external command, process killed.", ex );
- }
- finally
- {
- try
- {
+ } catch (InterruptedException ex) {
+ // killProcess( cl.getPid() );
+ throw new CommandLineException("Error while executing external command, process killed.", ex);
+ } finally {
+ try {
errorPumper.closeInput();
+ } catch (IOException e) {
+ // ignore
}
- catch ( IOException e )
- {
- //ignore
- }
- try
- {
+ try {
outputPumper.closeInput();
+ } catch (IOException e) {
+ // ignore
}
- catch ( IOException e )
- {
- //ignore
- }
- if ( inputFeeder != null )
- {
- try
- {
+ if (inputFeeder != null) {
+ try {
inputFeeder.closeOutput();
- }
- catch ( IOException e )
- {
- //ignore
+ } catch (IOException e) {
+ // ignore
}
}
}
}
-
-
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
index 972cbc67..cc393244 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import javax.inject.Inject;
import javax.inject.Named;
@@ -46,102 +45,87 @@ import org.slf4j.Logger;
* Fork Maven using the maven-invoker shared library.
*/
@Singleton
-@Named( "invoker" )
-public class InvokerMavenExecutor
- extends AbstractMavenExecutor
-{
+@Named("invoker")
+public class InvokerMavenExecutor extends AbstractMavenExecutor {
@Inject
- public InvokerMavenExecutor( MavenCrypto mavenCrypto )
- {
- super( mavenCrypto );
+ public InvokerMavenExecutor(MavenCrypto mavenCrypto) {
+ super(mavenCrypto);
}
@Override
- public void executeGoals( File workingDirectory, List<String> goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, String pomFileName,
- ReleaseResult result )
- throws MavenExecutorException
- {
+ public void executeGoals(
+ File workingDirectory,
+ List<String> goals,
+ ReleaseEnvironment releaseEnvironment,
+ boolean interactive,
+ String additionalArguments,
+ String pomFileName,
+ ReleaseResult result)
+ throws MavenExecutorException {
InvokerLogger bridge = getInvokerLogger();
Invoker invoker = new DefaultInvoker()
- .setMavenHome( releaseEnvironment.getMavenHome() )
- .setLocalRepositoryDirectory( releaseEnvironment.getLocalRepositoryDirectory() )
- .setLogger( bridge );
+ .setMavenHome(releaseEnvironment.getMavenHome())
+ .setLocalRepositoryDirectory(releaseEnvironment.getLocalRepositoryDirectory())
+ .setLogger(bridge);
InvocationRequest req = new DefaultInvocationRequest()
- .setDebug( getLogger().isDebugEnabled() )
- .setBaseDirectory( workingDirectory )
+ .setDebug(getLogger().isDebugEnabled())
+ .setBaseDirectory(workingDirectory)
// fix for MRELEASE-1105
- //.addShellEnvironment( "MAVEN_DEBUG_OPTS", "" )
- .setBatchMode( true )
- .setOutputHandler( getLogger()::info )
- .setErrorHandler( getLogger()::error );
-
- if ( pomFileName != null )
- {
- req.setPomFileName( pomFileName );
+ // .addShellEnvironment( "MAVEN_DEBUG_OPTS", "" )
+ .setBatchMode(true)
+ .setOutputHandler(getLogger()::info)
+ .setErrorHandler(getLogger()::error);
+
+ if (pomFileName != null) {
+ req.setPomFileName(pomFileName);
}
File settingsFile = null;
- if ( releaseEnvironment.getSettings() != null )
- {
+ if (releaseEnvironment.getSettings() != null) {
// Have to serialize to a file as if Maven is embedded, there may not actually be a settings.xml on disk
- try
- {
- settingsFile = File.createTempFile( "release-settings", ".xml" );
+ try {
+ settingsFile = File.createTempFile("release-settings", ".xml");
SettingsXpp3Writer writer = getSettingsWriter();
- try ( FileWriter fileWriter = new FileWriter( settingsFile ) )
- {
- writer.write( fileWriter, encryptSettings( releaseEnvironment.getSettings() ) );
+ try (FileWriter fileWriter = new FileWriter(settingsFile)) {
+ writer.write(fileWriter, encryptSettings(releaseEnvironment.getSettings()));
}
- req.setUserSettingsFile( settingsFile );
- }
- catch ( IOException e )
- {
- throw new MavenExecutorException( "Could not create temporary file for release settings.xml", e );
+ req.setUserSettingsFile(settingsFile);
+ } catch (IOException e) {
+ throw new MavenExecutorException("Could not create temporary file for release settings.xml", e);
}
}
- try
- {
- List<String> targetGoals = new ArrayList<>( goals );
+ try {
+ List<String> targetGoals = new ArrayList<>(goals);
- if ( additionalArguments != null && !additionalArguments.isEmpty() )
- {
+ if (additionalArguments != null && !additionalArguments.isEmpty()) {
// additionalArguments will be parsed be MavenInvoker
- targetGoals.add( additionalArguments );
+ targetGoals.add(additionalArguments);
}
- req.setGoals( targetGoals );
+ req.setGoals(targetGoals);
- try
- {
- InvocationResult invocationResult = invoker.execute( req );
+ try {
+ InvocationResult invocationResult = invoker.execute(req);
- if ( invocationResult.getExecutionException() != null )
- {
- throw new MavenExecutorException( "Error executing Maven.",
- invocationResult.getExecutionException() );
+ if (invocationResult.getExecutionException() != null) {
+ throw new MavenExecutorException(
+ "Error executing Maven.", invocationResult.getExecutionException());
}
- if ( invocationResult.getExitCode() != 0 )
- {
+ if (invocationResult.getExitCode() != 0) {
throw new MavenExecutorException(
- "Maven execution failed, exit code: " + invocationResult.getExitCode(),
- invocationResult.getExitCode() );
+ "Maven execution failed, exit code: " + invocationResult.getExitCode(),
+ invocationResult.getExitCode());
}
+ } catch (MavenInvocationException e) {
+ throw new MavenExecutorException("Failed to invoke Maven build.", e);
}
- catch ( MavenInvocationException e )
- {
- throw new MavenExecutorException( "Failed to invoke Maven build.", e );
- }
- }
- finally
- {
- if ( settingsFile != null && settingsFile.exists() && !settingsFile.delete() )
- {
+ } finally {
+ if (settingsFile != null && settingsFile.exists() && !settingsFile.delete()) {
settingsFile.deleteOnExit();
}
}
@@ -152,125 +136,103 @@ public class InvokerMavenExecutor
*
* @return a {@link org.apache.maven.shared.invoker.InvokerLogger} object
*/
- protected InvokerLogger getInvokerLogger()
- {
- return new LoggerBridge( getLogger() );
+ protected InvokerLogger getInvokerLogger() {
+ return new LoggerBridge(getLogger());
}
- private static final class LoggerBridge
- implements InvokerLogger
- {
+ private static final class LoggerBridge implements InvokerLogger {
private final Logger logger;
- LoggerBridge( Logger logger )
- {
+ LoggerBridge(Logger logger) {
this.logger = logger;
}
@Override
- public void debug( String message, Throwable error )
- {
- logger.debug( message, error );
+ public void debug(String message, Throwable error) {
+ logger.debug(message, error);
}
@Override
- public void debug( String message )
- {
- logger.debug( message );
+ public void debug(String message) {
+ logger.debug(message);
}
@Override
- public void error( String message, Throwable error )
- {
- logger.error( message, error );
+ public void error(String message, Throwable error) {
+ logger.error(message, error);
}
@Override
- public void error( String message )
- {
- logger.error( message );
+ public void error(String message) {
+ logger.error(message);
}
@Override
- public void fatalError( String message, Throwable error )
- {
- logger.error( message, error );
+ public void fatalError(String message, Throwable error) {
+ logger.error(message, error);
}
@Override
- public void fatalError( String message )
- {
- logger.error( message );
+ public void fatalError(String message) {
+ logger.error(message);
}
@Override
- public int getThreshold()
- {
+ public int getThreshold() {
return InvokerLogger.DEBUG;
}
@Override
- public void info( String message, Throwable error )
- {
- logger.info( message, error );
+ public void info(String message, Throwable error) {
+ logger.info(message, error);
}
@Override
- public void info( String message )
- {
- logger.info( message );
+ public void info(String message) {
+ logger.info(message);
}
@Override
- public boolean isDebugEnabled()
- {
+ public boolean isDebugEnabled() {
return logger.isDebugEnabled();
}
@Override
- public boolean isErrorEnabled()
- {
+ public boolean isErrorEnabled() {
return logger.isErrorEnabled();
}
@Override
- public boolean isFatalErrorEnabled()
- {
+ public boolean isFatalErrorEnabled() {
return logger.isErrorEnabled();
}
@Override
- public boolean isInfoEnabled()
- {
+ public boolean isInfoEnabled() {
return logger.isInfoEnabled();
}
@Override
- public boolean isWarnEnabled()
- {
+ public boolean isWarnEnabled() {
return logger.isWarnEnabled();
}
@Override
- public void setThreshold( int level )
- {
+ public void setThreshold(int level) {
// NOTE:
// logger.setThreshold( level )
// is not supported in plexus-container-default:1.0-alpha-9 as used in Maven 2.x
}
@Override
- public void warn( String message, Throwable error )
- {
- logger.warn( message, error );
+ public void warn(String message, Throwable error) {
+ logger.warn(message, error);
}
@Override
- public void warn( String message )
- {
- logger.warn( message );
+ public void warn(String message) {
+ logger.warn(message);
}
}
-
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index 53475a7e..c37532cc 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import java.io.File;
@@ -29,8 +28,7 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface MavenExecutor
-{
+public interface MavenExecutor {
/**
* Execute goals using Maven.
*
@@ -43,7 +41,13 @@ public interface MavenExecutor
* @param result holds all results of the execution
* @throws org.apache.maven.shared.release.exec.MavenExecutorException if an error occurred executing Maven
*/
- void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, String pomFileName, ReleaseResult result )
+ void executeGoals(
+ File workingDirectory,
+ String goals,
+ ReleaseEnvironment releaseEnvironment,
+ boolean interactive,
+ String additionalArguments,
+ String pomFileName,
+ ReleaseResult result)
throws MavenExecutorException;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutorException.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutorException.java
index 7a689493..3ce00325 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutorException.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutorException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,14 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
/**
* Exception executing Maven.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class MavenExecutorException
- extends Exception
-{
+public class MavenExecutorException extends Exception {
private int exitCode;
/**
@@ -35,9 +32,8 @@ public class MavenExecutorException
* @param message a {@link java.lang.String} object
* @param exitCode a int
*/
- public MavenExecutorException( String message, int exitCode )
- {
- super( message );
+ public MavenExecutorException(String message, int exitCode) {
+ super(message);
this.exitCode = exitCode;
}
@@ -48,9 +44,8 @@ public class MavenExecutorException
* @param message a {@link java.lang.String} object
* @param cause a {@link java.lang.Throwable} object
*/
- public MavenExecutorException( String message, Throwable cause )
- {
- super( message, cause );
+ public MavenExecutorException(String message, Throwable cause) {
+ super(message, cause);
}
/**
@@ -58,8 +53,7 @@ public class MavenExecutorException
*
* @return a int
*/
- public int getExitCode()
- {
+ public int getExitCode() {
return exitCode;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
index 34da6970..2988b0b4 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import java.io.IOException;
import java.io.InputStream;
@@ -26,9 +25,7 @@ import java.io.OutputStream;
/**
* <p>RawStreamPumper class.</p>
*/
-public class RawStreamPumper
- extends Thread
-{
+public class RawStreamPumper extends Thread {
private final InputStream in;
private final OutputStream out;
@@ -46,8 +43,7 @@ public class RawStreamPumper
* @param out a {@link java.io.OutputStream} object
* @param poll a boolean
*/
- public RawStreamPumper( InputStream in, OutputStream out, boolean poll )
- {
+ public RawStreamPumper(InputStream in, OutputStream out, boolean poll) {
this.in = in;
this.out = out;
this.poll = poll;
@@ -59,8 +55,7 @@ public class RawStreamPumper
* @param in a {@link java.io.InputStream} object
* @param out a {@link java.io.OutputStream} object
*/
- public RawStreamPumper( InputStream in, OutputStream out )
- {
+ public RawStreamPumper(InputStream in, OutputStream out) {
this.in = in;
this.out = out;
this.poll = false;
@@ -69,8 +64,7 @@ public class RawStreamPumper
/**
* <p>Setter for the field <code>done</code>.</p>
*/
- public void setDone()
- {
+ public void setDone() {
done = true;
}
@@ -79,9 +73,7 @@ public class RawStreamPumper
*
* @throws java.io.IOException if any.
*/
- public void closeInput()
- throws IOException
- {
+ public void closeInput() throws IOException {
in.close();
}
@@ -90,64 +82,42 @@ public class RawStreamPumper
*
* @throws java.io.IOException if any.
*/
- public void closeOutput()
- throws IOException
- {
+ public void closeOutput() throws IOException {
out.close();
}
@Override
- public void run()
- {
- try
- {
- if ( poll )
- {
- while ( !done )
- {
- if ( in.available() > 0 )
- {
- int i = in.read( buffer );
- if ( i != -1 )
- {
- out.write( buffer, 0, i );
+ public void run() {
+ try {
+ if (poll) {
+ while (!done) {
+ if (in.available() > 0) {
+ int i = in.read(buffer);
+ if (i != -1) {
+ out.write(buffer, 0, i);
out.flush();
- }
- else
- {
+ } else {
done = true;
}
- }
- else
- {
- Thread.sleep( 1 );
+ } else {
+ Thread.sleep(1);
}
}
- }
- else
- {
- int i = in.read( buffer );
- while ( i != -1 && !done )
- {
- if ( i != -1 )
- {
- out.write( buffer, 0, i );
+ } else {
+ int i = in.read(buffer);
+ while (i != -1 && !done) {
+ if (i != -1) {
+ out.write(buffer, 0, i);
out.flush();
- }
- else
- {
+ } else {
done = true;
}
- i = in.read( buffer );
+ i = in.read(buffer);
}
}
- }
- catch ( Throwable e )
- {
+ } catch (Throwable e) {
// Caught everything
- }
- finally
- {
+ } finally {
done = true;
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java
index c30d588a..b6f29b7e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import java.io.PrintStream;
@@ -28,9 +27,7 @@ import org.codehaus.plexus.util.cli.StreamConsumer;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class TeeConsumer
- implements StreamConsumer
-{
+public class TeeConsumer implements StreamConsumer {
private final PrintStream stream;
/**
@@ -38,7 +35,7 @@ public class TeeConsumer
*/
private final StringBuffer content = new StringBuffer();
- private static final String LS = System.getProperty( "line.separator" );
+ private static final String LS = System.getProperty("line.separator");
private final String indent;
@@ -47,9 +44,8 @@ public class TeeConsumer
*
* @param stream a {@link java.io.PrintStream} object
*/
- public TeeConsumer( PrintStream stream )
- {
- this( stream, " " );
+ public TeeConsumer(PrintStream stream) {
+ this(stream, " ");
}
/**
@@ -58,19 +54,17 @@ public class TeeConsumer
* @param stream a {@link java.io.PrintStream} object
* @param indent a {@link java.lang.String} object
*/
- public TeeConsumer( PrintStream stream, String indent )
- {
+ public TeeConsumer(PrintStream stream, String indent) {
this.stream = stream;
this.indent = indent;
}
@Override
- public void consumeLine( String line )
- {
- stream.println( indent + line );
+ public void consumeLine(String line) {
+ stream.println(indent + line);
- content.append( line );
- content.append( LS );
+ content.append(line);
+ content.append(LS);
}
/**
@@ -78,14 +72,12 @@ public class TeeConsumer
*
* @return a {@link java.lang.String} object
*/
- public String getContent()
- {
+ public String getContent() {
return content.toString();
}
@Override
- public String toString()
- {
+ public String toString() {
return getContent();
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
index 363e76ad..f5737a5f 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.exec;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.exec;
import java.io.ByteArrayOutputStream;
import java.io.FilterOutputStream;
@@ -27,10 +26,8 @@ import java.io.OutputStream;
/**
* <p>TeeOutputStream class.</p>
*/
-public class TeeOutputStream
- extends FilterOutputStream
-{
- private final ByteArrayOutputStream bout = new ByteArrayOutputStream( 1024 * 8 );
+public class TeeOutputStream extends FilterOutputStream {
+ private final ByteArrayOutputStream bout = new ByteArrayOutputStream(1024 * 8);
private final byte[] indent;
private int last = '\n';
@@ -39,9 +36,8 @@ public class TeeOutputStream
*
* @param out a {@link java.io.OutputStream} object
*/
- public TeeOutputStream( OutputStream out )
- {
- this( out, " " );
+ public TeeOutputStream(OutputStream out) {
+ this(out, " ");
}
/**
@@ -50,50 +46,41 @@ public class TeeOutputStream
* @param out a {@link java.io.OutputStream} object
* @param i a {@link java.lang.String} object
*/
- public TeeOutputStream( OutputStream out, String i )
- {
- super( out );
+ public TeeOutputStream(OutputStream out, String i) {
+ super(out);
indent = i.getBytes();
}
@Override
- public void write( byte[] b, int off, int len )
- throws IOException
- {
- for ( int x = 0; x < len; x++ )
- {
+ public void write(byte[] b, int off, int len) throws IOException {
+ for (int x = 0; x < len; x++) {
int c = b[off + x];
- if ( last == '\n' || ( last == '\r' && c != '\n' ) )
- {
- out.write( b, off, x );
- bout.write( b, off, x );
- out.write( indent );
+ if (last == '\n' || (last == '\r' && c != '\n')) {
+ out.write(b, off, x);
+ bout.write(b, off, x);
+ out.write(indent);
off += x;
len -= x;
x = 0;
}
last = c;
}
- out.write( b, off, len );
- bout.write( b, off, len );
+ out.write(b, off, len);
+ bout.write(b, off, len);
}
@Override
- public void write( int b )
- throws IOException
- {
- if ( last == '\n' || ( last == '\r' && b != '\n' ) )
- {
- out.write( indent );
+ public void write(int b) throws IOException {
+ if (last == '\n' || (last == '\r' && b != '\n')) {
+ out.write(indent);
}
- out.write( b );
- bout.write( b );
+ out.write(b);
+ bout.write(b);
last = b;
}
@Override
- public String toString()
- {
+ public String toString() {
return bout.toString();
}
@@ -102,9 +89,7 @@ public class TeeOutputStream
*
* @return a {@link java.lang.String} object
*/
- public String getContent()
- {
+ public String getContent() {
return bout.toString();
}
-
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
index c0fe0d18..ab5cc566 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.io.File;
@@ -29,9 +28,7 @@ import org.apache.maven.shared.release.util.ReleaseUtil;
*
* @author Edwin Punzalan
*/
-public abstract class AbstractBackupPomsPhase
- extends AbstractReleasePhase
-{
+public abstract class AbstractBackupPomsPhase extends AbstractReleasePhase {
protected static final String BACKUP_SUFFIX = ".releaseBackup";
/**
@@ -40,16 +37,12 @@ public abstract class AbstractBackupPomsPhase
* @param project a {@link org.apache.maven.project.MavenProject} object
* @return a {@link java.io.File} object
*/
- protected File getPomBackup( MavenProject project )
- {
- File pomFile = ReleaseUtil.getStandardPom( project );
+ protected File getPomBackup(MavenProject project) {
+ File pomFile = ReleaseUtil.getStandardPom(project);
- if ( pomFile != null )
- {
- return new File( pomFile.getAbsolutePath() + BACKUP_SUFFIX );
- }
- else
- {
+ if (pomFile != null) {
+ return new File(pomFile.getAbsolutePath() + BACKUP_SUFFIX);
+ } else {
return null;
}
}
@@ -59,12 +52,10 @@ public abstract class AbstractBackupPomsPhase
*
* @param project a {@link org.apache.maven.project.MavenProject} object
*/
- protected void deletePomBackup( MavenProject project )
- {
- File pomBackup = getPomBackup( project );
+ protected void deletePomBackup(MavenProject project) {
+ File pomBackup = getPomBackup(project);
- if ( pomBackup != null && pomBackup.exists() )
- {
+ if (pomBackup != null && pomBackup.exists()) {
pomBackup.delete();
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java
index 37c5e4c6..fed38504 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.util.List;
@@ -41,9 +40,7 @@ import static java.util.Objects.requireNonNull;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public abstract class AbstractCheckPomPhase
- extends AbstractReleasePhase
-{
+public abstract class AbstractCheckPomPhase extends AbstractReleasePhase {
private final ScmRepositoryConfigurator scmRepositoryConfigurator;
@@ -57,74 +54,64 @@ public abstract class AbstractCheckPomPhase
*/
private final boolean snapshotsRequired;
- public AbstractCheckPomPhase( ScmRepositoryConfigurator scmRepositoryConfigurator, boolean scmRequired,
- boolean snapshotsRequired )
- {
- this.scmRepositoryConfigurator = requireNonNull( scmRepositoryConfigurator );
+ public AbstractCheckPomPhase(
+ ScmRepositoryConfigurator scmRepositoryConfigurator, boolean scmRequired, boolean snapshotsRequired) {
+ this.scmRepositoryConfigurator = requireNonNull(scmRepositoryConfigurator);
this.scmRequired = scmRequired;
this.snapshotsRequired = snapshotsRequired;
}
@Override
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException, ReleaseFailureException {
ReleaseResult result = new ReleaseResult();
// Currently, we don't deal with multiple SCM locations in a multiproject
- if ( scmRequired )
- {
- if ( StringUtils.isEmpty( releaseDescriptor.getScmSourceUrl() ) )
- {
+ if (scmRequired) {
+ if (StringUtils.isEmpty(releaseDescriptor.getScmSourceUrl())) {
throw new ReleaseFailureException(
- "Missing required setting: scm connection or developerConnection must be specified." );
+ "Missing required setting: scm connection or developerConnection must be specified.");
}
- try
- {
- scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
- releaseEnvironment.getSettings() );
- }
- catch ( ScmRepositoryException e )
- {
- throw new ReleaseScmRepositoryException( e.getMessage(), e.getValidationMessages() );
- }
- catch ( NoSuchScmProviderException e )
- {
+ try {
+ scmRepositoryConfigurator.getConfiguredRepository(releaseDescriptor, releaseEnvironment.getSettings());
+ } catch (ScmRepositoryException e) {
+ throw new ReleaseScmRepositoryException(e.getMessage(), e.getValidationMessages());
+ } catch (NoSuchScmProviderException e) {
throw new ReleaseFailureException(
- "The provider given in the SCM URL could not be found: " + e.getMessage() );
+ "The provider given in the SCM URL could not be found: " + e.getMessage());
}
}
boolean containsSnapshotProjects = false;
- for ( MavenProject project : reactorProjects )
- {
- if ( ArtifactUtils.isSnapshot( project.getVersion() ) )
- {
+ for (MavenProject project : reactorProjects) {
+ if (ArtifactUtils.isSnapshot(project.getVersion())) {
containsSnapshotProjects = true;
break;
}
}
- if ( snapshotsRequired && !containsSnapshotProjects && !releaseDescriptor.isBranchCreation() )
- {
- throw new ReleaseFailureException( "You don't have a SNAPSHOT project in the reactor projects list." );
+ if (snapshotsRequired && !containsSnapshotProjects && !releaseDescriptor.isBranchCreation()) {
+ throw new ReleaseFailureException("You don't have a SNAPSHOT project in the reactor projects list.");
}
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
@Override
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public ReleaseResult simulate(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException, ReleaseFailureException {
// It makes no modifications, so simulate is the same as execute
- return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
+ return execute(releaseDescriptor, releaseEnvironment, reactorProjects);
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
index 7a00671c..c9772850 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.util.Arrays;
import java.util.List;
@@ -59,9 +58,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public abstract class AbstractInputVariablesPhase
- extends AbstractReleasePhase
-{
+public abstract class AbstractInputVariablesPhase extends AbstractReleasePhase {
/**
* Component used to prompt for input.
*/
@@ -87,13 +84,15 @@ public abstract class AbstractInputVariablesPhase
*/
private final String defaultNamingPolicy;
- protected AbstractInputVariablesPhase( Prompter prompter, ScmRepositoryConfigurator scmRepositoryConfigurator,
- Map<String, NamingPolicy> namingPolicies, boolean branchOperation,
- String defaultNamingPolicy )
- {
- this.prompter = new AtomicReference<>( requireNonNull( prompter ) );
- this.scmRepositoryConfigurator = requireNonNull( scmRepositoryConfigurator );
- this.namingPolicies = requireNonNull( namingPolicies );
+ protected AbstractInputVariablesPhase(
+ Prompter prompter,
+ ScmRepositoryConfigurator scmRepositoryConfigurator,
+ Map<String, NamingPolicy> namingPolicies,
+ boolean branchOperation,
+ String defaultNamingPolicy) {
+ this.prompter = new AtomicReference<>(requireNonNull(prompter));
+ this.scmRepositoryConfigurator = requireNonNull(scmRepositoryConfigurator);
+ this.namingPolicies = requireNonNull(namingPolicies);
this.branchOperation = branchOperation;
this.defaultNamingPolicy = defaultNamingPolicy;
}
@@ -101,13 +100,11 @@ public abstract class AbstractInputVariablesPhase
/**
* For easier testing only!
*/
- public void setPrompter( Prompter prompter )
- {
- this.prompter.set( prompter );
+ public void setPrompter(Prompter prompter) {
+ this.prompter.set(prompter);
}
- boolean isBranchOperation()
- {
+ boolean isBranchOperation() {
return branchOperation;
}
@@ -120,194 +117,151 @@ public abstract class AbstractInputVariablesPhase
* @throws ReleaseScmRepositoryException if any.
* @throws ReleaseExecutionException if any.
*/
- protected ScmProvider getScmProvider( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment )
- throws ReleaseScmRepositoryException, ReleaseExecutionException
- {
- try
- {
- ScmRepository repository =
- scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
- releaseEnvironment.getSettings() );
+ protected ScmProvider getScmProvider(ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment)
+ throws ReleaseScmRepositoryException, ReleaseExecutionException {
+ try {
+ ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository(
+ releaseDescriptor, releaseEnvironment.getSettings());
- return scmRepositoryConfigurator.getRepositoryProvider( repository );
- }
- catch ( ScmRepositoryException e )
- {
+ return scmRepositoryConfigurator.getRepositoryProvider(repository);
+ } catch (ScmRepositoryException e) {
throw new ReleaseScmRepositoryException(
- e.getMessage() + " for URL: " + releaseDescriptor.getScmSourceUrl(), e.getValidationMessages() );
- }
- catch ( NoSuchScmProviderException e )
- {
- throw new ReleaseExecutionException( "Unable to configure SCM repository: " + e.getMessage(), e );
+ e.getMessage() + " for URL: " + releaseDescriptor.getScmSourceUrl(), e.getValidationMessages());
+ } catch (NoSuchScmProviderException e) {
+ throw new ReleaseExecutionException("Unable to configure SCM repository: " + e.getMessage(), e);
}
}
@Override
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException
- {
+ public ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException {
ReleaseResult result = new ReleaseResult();
// get the root project
- MavenProject project = ReleaseUtil.getRootProject( reactorProjects );
+ MavenProject project = ReleaseUtil.getRootProject(reactorProjects);
String tag = releaseDescriptor.getScmReleaseLabel();
- if ( tag == null )
- {
+ if (tag == null) {
// Must get default version from mapped versions, as the project will be the incorrect snapshot
- String key = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
- String releaseVersion = releaseDescriptor.getProjectReleaseVersion( key );
- if ( releaseVersion == null )
- {
- throw new ReleaseExecutionException( "Project tag cannot be selected if version is not yet mapped" );
+ String key = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
+ String releaseVersion = releaseDescriptor.getProjectReleaseVersion(key);
+ if (releaseVersion == null) {
+ throw new ReleaseExecutionException("Project tag cannot be selected if version is not yet mapped");
}
String suggestedName;
String scmTagNameFormat = releaseDescriptor.getScmTagNameFormat();
- if ( releaseDescriptor.getProjectNamingPolicyId() != null )
- {
- try
- {
+ if (releaseDescriptor.getProjectNamingPolicyId() != null) {
+ try {
suggestedName =
- resolveSuggestedName( releaseDescriptor.getProjectNamingPolicyId(), releaseVersion,
- project );
+ resolveSuggestedName(releaseDescriptor.getProjectNamingPolicyId(), releaseVersion, project);
+ } catch (PolicyException e) {
+ throw new ReleaseExecutionException(e.getMessage(), e);
}
- catch ( PolicyException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
- }
- }
- else if ( scmTagNameFormat != null )
- {
- Interpolator interpolator = new StringSearchInterpolator( "@{", "}" );
- List<String> possiblePrefixes = Arrays.asList( "project", "pom" );
+ } else if (scmTagNameFormat != null) {
+ Interpolator interpolator = new StringSearchInterpolator("@{", "}");
+ List<String> possiblePrefixes = Arrays.asList("project", "pom");
Properties values = new Properties();
- values.setProperty( "artifactId", project.getArtifactId() );
- values.setProperty( "groupId", project.getGroupId() );
- values.setProperty( "version", releaseVersion );
- interpolator.addValueSource( new PrefixedPropertiesValueSource( possiblePrefixes, values, true ) );
- RecursionInterceptor recursionInterceptor = new PrefixAwareRecursionInterceptor( possiblePrefixes );
- try
- {
- suggestedName = interpolator.interpolate( scmTagNameFormat, recursionInterceptor );
- }
- catch ( InterpolationException e )
- {
+ values.setProperty("artifactId", project.getArtifactId());
+ values.setProperty("groupId", project.getGroupId());
+ values.setProperty("version", releaseVersion);
+ interpolator.addValueSource(new PrefixedPropertiesValueSource(possiblePrefixes, values, true));
+ RecursionInterceptor recursionInterceptor = new PrefixAwareRecursionInterceptor(possiblePrefixes);
+ try {
+ suggestedName = interpolator.interpolate(scmTagNameFormat, recursionInterceptor);
+ } catch (InterpolationException e) {
throw new ReleaseExecutionException(
- "Could not interpolate specified tag name format: " + scmTagNameFormat, e );
+ "Could not interpolate specified tag name format: " + scmTagNameFormat, e);
}
- }
- else
- {
- try
- {
- suggestedName = resolveSuggestedName( defaultNamingPolicy, releaseVersion, project );
- }
- catch ( PolicyException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
+ } else {
+ try {
+ suggestedName = resolveSuggestedName(defaultNamingPolicy, releaseVersion, project);
+ } catch (PolicyException e) {
+ throw new ReleaseExecutionException(e.getMessage(), e);
}
}
ScmProvider provider;
- try
- {
- provider = getScmProvider( releaseDescriptor, releaseEnvironment );
- }
- catch ( ReleaseScmRepositoryException e )
- {
+ try {
+ provider = getScmProvider(releaseDescriptor, releaseEnvironment);
+ } catch (ReleaseScmRepositoryException e) {
throw new ReleaseExecutionException(
- "No scm provider can be found for url: " + releaseDescriptor.getScmSourceUrl(), e );
+ "No scm provider can be found for url: " + releaseDescriptor.getScmSourceUrl(), e);
}
- suggestedName = provider.sanitizeTagName( suggestedName );
+ suggestedName = provider.sanitizeTagName(suggestedName);
- if ( releaseDescriptor.isInteractive() )
- {
- try
- {
- if ( branchOperation )
- {
- tag = prompter.get().prompt( "What is the branch name for \"" + project.getName() + "\"? ("
- + buffer().project( project.getArtifactId() ) + ")" );
- if ( StringUtils.isEmpty( tag ) )
- {
- throw new ReleaseExecutionException( "No branch name was given." );
+ if (releaseDescriptor.isInteractive()) {
+ try {
+ if (branchOperation) {
+ tag = prompter.get()
+ .prompt("What is the branch name for \"" + project.getName() + "\"? ("
+ + buffer().project(project.getArtifactId()) + ")");
+ if (StringUtils.isEmpty(tag)) {
+ throw new ReleaseExecutionException("No branch name was given.");
}
+ } else {
+ tag = prompter.get()
+ .prompt(
+ "What is the SCM release tag or label for \"" + project.getName() + "\"? ("
+ + buffer().project(project.getArtifactId()) + ")",
+ suggestedName);
}
- else
- {
- tag = prompter.get().prompt(
- "What is the SCM release tag or label for \"" + project.getName()
- + "\"? (" + buffer().project( project.getArtifactId() ) + ")",
- suggestedName );
- }
- }
- catch ( PrompterException e )
- {
- throw new ReleaseExecutionException( "Error reading version from input handler: " + e.getMessage(),
- e );
- }
- }
- else if ( suggestedName == null )
- {
- if ( isBranchOperation() )
- {
- throw new ReleaseExecutionException( "No branch name was given." );
+ } catch (PrompterException e) {
+ throw new ReleaseExecutionException(
+ "Error reading version from input handler: " + e.getMessage(), e);
}
- else
- {
- throw new ReleaseExecutionException( "No tag name was given." );
+ } else if (suggestedName == null) {
+ if (isBranchOperation()) {
+ throw new ReleaseExecutionException("No branch name was given.");
+ } else {
+ throw new ReleaseExecutionException("No tag name was given.");
}
- }
- else
- {
+ } else {
tag = suggestedName;
}
- releaseDescriptor.setScmReleaseLabel( tag );
+ releaseDescriptor.setScmReleaseLabel(tag);
}
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
@Override
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException
- {
+ public ReleaseResult simulate(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException {
ReleaseResult result = new ReleaseResult();
// It makes no modifications, so simulate is the same as execute
- execute( releaseDescriptor, releaseEnvironment, reactorProjects );
+ execute(releaseDescriptor, releaseEnvironment, reactorProjects);
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
- private String resolveSuggestedName( String policyId, String version, MavenProject project )
- throws PolicyException
- {
- if ( policyId == null )
- {
+ private String resolveSuggestedName(String policyId, String version, MavenProject project) throws PolicyException {
+ if (policyId == null) {
return null;
}
- NamingPolicy policy = namingPolicies.get( policyId );
- if ( policy == null )
- {
- throw new PolicyException( "Policy '" + policyId + "' is unknown, available: "
- + namingPolicies.keySet() );
+ NamingPolicy policy = namingPolicies.get(policyId);
+ if (policy == null) {
+ throw new PolicyException("Policy '" + policyId + "' is unknown, available: " + namingPolicies.keySet());
}
NamingPolicyRequest request = new NamingPolicyRequest()
- .setGroupId( project.getGroupId() )
- .setArtifactId( project.getArtifactId() )
- .setVersion( version );
- return policy.getName( request ).getName();
+ .setGroupId(project.getGroupId())
+ .setArtifactId(project.getArtifactId())
+ .setVersion(version);
+ return policy.getName(request).getName();
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
index 53e20efa..c2b0a6fe 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.util.List;
import java.util.Map;
@@ -73,9 +72,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author Robert Scholte
*/
-public abstract class AbstractMapVersionsPhase
- extends AbstractReleasePhase
-{
+public abstract class AbstractMapVersionsPhase extends AbstractReleasePhase {
/**
* Tool that gets a configured SCM repository from release configuration.
*/
@@ -101,348 +98,263 @@ public abstract class AbstractMapVersionsPhase
*/
private final boolean convertToBranch;
- public AbstractMapVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
- Prompter prompter, Map<String, VersionPolicy> versionPolicies,
- boolean convertToSnapshot, boolean convertToBranch )
- {
- this.scmRepositoryConfigurator = requireNonNull( scmRepositoryConfigurator );
- this.prompter = requireNonNull( prompter );
- this.versionPolicies = requireNonNull( versionPolicies );
+ public AbstractMapVersionsPhase(
+ ScmRepositoryConfigurator scmRepositoryConfigurator,
+ Prompter prompter,
+ Map<String, VersionPolicy> versionPolicies,
+ boolean convertToSnapshot,
+ boolean convertToBranch) {
+ this.scmRepositoryConfigurator = requireNonNull(scmRepositoryConfigurator);
+ this.prompter = requireNonNull(prompter);
+ this.versionPolicies = requireNonNull(versionPolicies);
this.convertToSnapshot = convertToSnapshot;
this.convertToBranch = convertToBranch;
-
}
@Override
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException
- {
+ public ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException {
ReleaseResult result = new ReleaseResult();
- MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
+ MavenProject rootProject = ReleaseUtil.getRootProject(reactorProjects);
- if ( releaseDescriptor.isAutoVersionSubmodules() && ArtifactUtils.isSnapshot( rootProject.getVersion() ) )
- {
+ if (releaseDescriptor.isAutoVersionSubmodules() && ArtifactUtils.isSnapshot(rootProject.getVersion())) {
// get the root project
MavenProject project = rootProject;
- String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ String projectId = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
- String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor, releaseEnvironment );
+ String nextVersion = resolveNextVersion(project, projectId, releaseDescriptor, releaseEnvironment);
- if ( !convertToSnapshot )
- {
- releaseDescriptor.addReleaseVersion( projectId, nextVersion );
- }
- else if ( releaseDescriptor.isBranchCreation() && convertToBranch )
- {
- releaseDescriptor.addReleaseVersion( projectId, nextVersion );
- }
- else
- {
- releaseDescriptor.addDevelopmentVersion( projectId, nextVersion );
+ if (!convertToSnapshot) {
+ releaseDescriptor.addReleaseVersion(projectId, nextVersion);
+ } else if (releaseDescriptor.isBranchCreation() && convertToBranch) {
+ releaseDescriptor.addReleaseVersion(projectId, nextVersion);
+ } else {
+ releaseDescriptor.addDevelopmentVersion(projectId, nextVersion);
}
- for ( MavenProject subProject : reactorProjects )
- {
- String subProjectId =
- ArtifactUtils.versionlessKey( subProject.getGroupId(), subProject.getArtifactId() );
+ for (MavenProject subProject : reactorProjects) {
+ String subProjectId = ArtifactUtils.versionlessKey(subProject.getGroupId(), subProject.getArtifactId());
- if ( convertToSnapshot )
- {
- String subProjectNextVersion = releaseDescriptor.getProjectDevelopmentVersion( subProjectId );
+ if (convertToSnapshot) {
+ String subProjectNextVersion = releaseDescriptor.getProjectDevelopmentVersion(subProjectId);
String v;
- if ( subProjectNextVersion != null )
- {
+ if (subProjectNextVersion != null) {
v = subProjectNextVersion;
- }
- else if ( ArtifactUtils.isSnapshot( subProject.getVersion() ) )
- {
+ } else if (ArtifactUtils.isSnapshot(subProject.getVersion())) {
v = nextVersion;
- }
- else
- {
+ } else {
v = subProject.getVersion();
}
- if ( releaseDescriptor.isBranchCreation() && convertToBranch )
- {
- releaseDescriptor.addReleaseVersion( subProjectId, v );
- }
- else
- {
- releaseDescriptor.addDevelopmentVersion( subProjectId, v );
- }
- }
- else
- {
- String subProjectNextVersion = releaseDescriptor.getProjectReleaseVersion( subProjectId );
- if ( subProjectNextVersion != null )
- {
- releaseDescriptor.addReleaseVersion( subProjectId, subProjectNextVersion );
+ if (releaseDescriptor.isBranchCreation() && convertToBranch) {
+ releaseDescriptor.addReleaseVersion(subProjectId, v);
+ } else {
+ releaseDescriptor.addDevelopmentVersion(subProjectId, v);
}
- else
- {
- releaseDescriptor.addReleaseVersion( subProjectId, nextVersion );
+ } else {
+ String subProjectNextVersion = releaseDescriptor.getProjectReleaseVersion(subProjectId);
+ if (subProjectNextVersion != null) {
+ releaseDescriptor.addReleaseVersion(subProjectId, subProjectNextVersion);
+ } else {
+ releaseDescriptor.addReleaseVersion(subProjectId, nextVersion);
}
}
}
- }
- else
- {
- for ( MavenProject project : reactorProjects )
- {
- String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
-
- String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor, releaseEnvironment );
-
- if ( !convertToSnapshot )
- {
- releaseDescriptor.addReleaseVersion( projectId, nextVersion );
- }
- else if ( releaseDescriptor.isBranchCreation() && convertToBranch )
- {
- releaseDescriptor.addReleaseVersion( projectId, nextVersion );
- }
- else
- {
- releaseDescriptor.addDevelopmentVersion( projectId, nextVersion );
+ } else {
+ for (MavenProject project : reactorProjects) {
+ String projectId = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
+
+ String nextVersion = resolveNextVersion(project, projectId, releaseDescriptor, releaseEnvironment);
+
+ if (!convertToSnapshot) {
+ releaseDescriptor.addReleaseVersion(projectId, nextVersion);
+ } else if (releaseDescriptor.isBranchCreation() && convertToBranch) {
+ releaseDescriptor.addReleaseVersion(projectId, nextVersion);
+ } else {
+ releaseDescriptor.addDevelopmentVersion(projectId, nextVersion);
}
}
}
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
- private String resolveNextVersion( MavenProject project,
- String projectId,
- ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment )
- throws ReleaseExecutionException
- {
+ private String resolveNextVersion(
+ MavenProject project,
+ String projectId,
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment)
+ throws ReleaseExecutionException {
String defaultVersion;
- if ( convertToBranch )
- {
+ if (convertToBranch) {
// no branch modification
- if ( !( releaseDescriptor.isUpdateBranchVersions()
- && ( ArtifactUtils.isSnapshot( project.getVersion() )
- || releaseDescriptor.isUpdateVersionsToSnapshot() ) ) )
- {
+ if (!(releaseDescriptor.isUpdateBranchVersions()
+ && (ArtifactUtils.isSnapshot(project.getVersion())
+ || releaseDescriptor.isUpdateVersionsToSnapshot()))) {
return project.getVersion();
}
- defaultVersion = getReleaseVersion( projectId, releaseDescriptor );
- }
- else if ( !convertToSnapshot ) // map-release-version
- {
- defaultVersion = getReleaseVersion( projectId, releaseDescriptor );
- }
- else if ( releaseDescriptor.isBranchCreation() )
+ defaultVersion = getReleaseVersion(projectId, releaseDescriptor);
+ } else if (!convertToSnapshot) // map-release-version
{
+ defaultVersion = getReleaseVersion(projectId, releaseDescriptor);
+ } else if (releaseDescriptor.isBranchCreation()) {
// no working copy modification
- if ( !( ArtifactUtils.isSnapshot( project.getVersion() )
- && releaseDescriptor.isUpdateWorkingCopyVersions() ) )
- {
+ if (!(ArtifactUtils.isSnapshot(project.getVersion()) && releaseDescriptor.isUpdateWorkingCopyVersions())) {
return project.getVersion();
}
- defaultVersion = getDevelopmentVersion( projectId, releaseDescriptor );
- }
- else
- {
+ defaultVersion = getDevelopmentVersion(projectId, releaseDescriptor);
+ } else {
// no working copy modification
- if ( !( releaseDescriptor.isUpdateWorkingCopyVersions() ) )
- {
+ if (!(releaseDescriptor.isUpdateWorkingCopyVersions())) {
return project.getVersion();
}
- defaultVersion = getDevelopmentVersion( projectId, releaseDescriptor );
+ defaultVersion = getDevelopmentVersion(projectId, releaseDescriptor);
}
- //@todo validate default version, maybe with DefaultArtifactVersion
+ // @todo validate default version, maybe with DefaultArtifactVersion
String suggestedVersion = null;
String nextVersion = defaultVersion;
String messageFormat = null;
- try
- {
- while ( nextVersion == null || ArtifactUtils.isSnapshot( nextVersion ) != convertToSnapshot )
- {
- if ( suggestedVersion == null )
- {
+ try {
+ while (nextVersion == null || ArtifactUtils.isSnapshot(nextVersion) != convertToSnapshot) {
+ if (suggestedVersion == null) {
String baseVersion = null;
- if ( convertToSnapshot )
- {
- baseVersion = getReleaseVersion( projectId, releaseDescriptor );
+ if (convertToSnapshot) {
+ baseVersion = getReleaseVersion(projectId, releaseDescriptor);
}
// unspecified and unmapped version, so use project version
- if ( baseVersion == null )
- {
+ if (baseVersion == null) {
baseVersion = project.getVersion();
}
- try
- {
- try
- {
+ try {
+ try {
suggestedVersion =
- resolveSuggestedVersion( baseVersion,
- releaseDescriptor,
- releaseEnvironment );
- }
- catch ( VersionParseException e )
- {
- if ( releaseDescriptor.isInteractive() )
- {
+ resolveSuggestedVersion(baseVersion, releaseDescriptor, releaseEnvironment);
+ } catch (VersionParseException e) {
+ if (releaseDescriptor.isInteractive()) {
suggestedVersion =
- resolveSuggestedVersion( "1.0", releaseDescriptor, releaseEnvironment );
- }
- else
- {
- throw new ReleaseExecutionException( "Error parsing version, cannot determine next "
- + "version: " + e.getMessage(), e );
+ resolveSuggestedVersion("1.0", releaseDescriptor, releaseEnvironment);
+ } else {
+ throw new ReleaseExecutionException(
+ "Error parsing version, cannot determine next " + "version: " + e.getMessage(),
+ e);
}
}
- }
- catch ( PolicyException | VersionParseException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
+ } catch (PolicyException | VersionParseException e) {
+ throw new ReleaseExecutionException(e.getMessage(), e);
}
}
- if ( releaseDescriptor.isInteractive() )
- {
- if ( messageFormat == null )
- {
- messageFormat = "What is the " + getContextString( releaseDescriptor )
- + " version for \"%s\"? (" + buffer().project( "%s" ) + ")";
+ if (releaseDescriptor.isInteractive()) {
+ if (messageFormat == null) {
+ messageFormat = "What is the " + getContextString(releaseDescriptor) + " version for \"%s\"? ("
+ + buffer().project("%s") + ")";
}
- String message = String.format( messageFormat, project.getName(), project.getArtifactId() );
- nextVersion = prompter.prompt( message, suggestedVersion );
+ String message = String.format(messageFormat, project.getName(), project.getArtifactId());
+ nextVersion = prompter.prompt(message, suggestedVersion);
- //@todo validate next version, maybe with DefaultArtifactVersion
- }
- else if ( defaultVersion == null )
- {
+ // @todo validate next version, maybe with DefaultArtifactVersion
+ } else if (defaultVersion == null) {
nextVersion = suggestedVersion;
- }
- else if ( convertToSnapshot )
- {
- throw new ReleaseExecutionException( defaultVersion + " is invalid, expected a snapshot" );
- }
- else
- {
- throw new ReleaseExecutionException( defaultVersion + " is invalid, expected a non-snapshot" );
+ } else if (convertToSnapshot) {
+ throw new ReleaseExecutionException(defaultVersion + " is invalid, expected a snapshot");
+ } else {
+ throw new ReleaseExecutionException(defaultVersion + " is invalid, expected a non-snapshot");
}
}
- }
- catch ( PrompterException e )
- {
- throw new ReleaseExecutionException( "Error reading version from input handler: " + e.getMessage(), e );
+ } catch (PrompterException e) {
+ throw new ReleaseExecutionException("Error reading version from input handler: " + e.getMessage(), e);
}
return nextVersion;
}
- private String getContextString( ReleaseDescriptor releaseDescriptor )
- {
- if ( convertToBranch )
- {
+ private String getContextString(ReleaseDescriptor releaseDescriptor) {
+ if (convertToBranch) {
return "branch";
}
- if ( !convertToSnapshot )
- {
+ if (!convertToSnapshot) {
return "release";
}
- if ( releaseDescriptor.isBranchCreation() )
- {
+ if (releaseDescriptor.isBranchCreation()) {
return "new working copy";
}
return "new development";
}
- private String resolveSuggestedVersion( String baseVersion,
- ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment )
- throws PolicyException, VersionParseException
- {
+ private String resolveSuggestedVersion(
+ String baseVersion, ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment)
+ throws PolicyException, VersionParseException {
String policyId = releaseDescriptor.getProjectVersionPolicyId();
- VersionPolicy policy = versionPolicies.get( policyId );
- if ( policy == null )
- {
- throw new PolicyException( "Policy '" + policyId + "' is unknown, available: " + versionPolicies.keySet() );
+ VersionPolicy policy = versionPolicies.get(policyId);
+ if (policy == null) {
+ throw new PolicyException("Policy '" + policyId + "' is unknown, available: " + versionPolicies.keySet());
}
- VersionPolicyRequest request = new VersionPolicyRequest().setVersion( baseVersion );
+ VersionPolicyRequest request = new VersionPolicyRequest().setVersion(baseVersion);
- if ( releaseDescriptor.getProjectVersionPolicyConfig() != null )
- {
- request.setConfig( releaseDescriptor.getProjectVersionPolicyConfig().toString() );
+ if (releaseDescriptor.getProjectVersionPolicyConfig() != null) {
+ request.setConfig(releaseDescriptor.getProjectVersionPolicyConfig().toString());
}
- request.setWorkingDirectory( releaseDescriptor.getWorkingDirectory() );
+ request.setWorkingDirectory(releaseDescriptor.getWorkingDirectory());
- if ( scmRepositoryConfigurator != null && releaseDescriptor.getScmSourceUrl() != null )
- {
- try
- {
- ScmRepository repository = scmRepositoryConfigurator
- .getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
+ if (scmRepositoryConfigurator != null && releaseDescriptor.getScmSourceUrl() != null) {
+ try {
+ ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository(
+ releaseDescriptor, releaseEnvironment.getSettings());
- ScmProvider provider = scmRepositoryConfigurator
- .getRepositoryProvider( repository );
+ ScmProvider provider = scmRepositoryConfigurator.getRepositoryProvider(repository);
- request.setScmRepository( repository );
- request.setScmProvider( provider );
- }
- catch ( ScmRepositoryException | NoSuchScmProviderException e )
- {
+ request.setScmRepository(repository);
+ request.setScmProvider(provider);
+ } catch (ScmRepositoryException | NoSuchScmProviderException e) {
Logger logger = getLogger();
- if ( logger.isWarnEnabled() )
- {
- logger.warn( "Next Version will NOT be based on the version control: {}", e.getMessage() );
- }
- else
- {
- if ( logger.isDebugEnabled() )
- {
- logger.warn( "Next Version will NOT be based on the version control", e );
+ if (logger.isWarnEnabled()) {
+ logger.warn("Next Version will NOT be based on the version control: {}", e.getMessage());
+ } else {
+ if (logger.isDebugEnabled()) {
+ logger.warn("Next Version will NOT be based on the version control", e);
}
}
}
}
- return convertToSnapshot ? policy.getDevelopmentVersion( request ).getVersion()
- : policy.getReleaseVersion( request ).getVersion();
+ return convertToSnapshot
+ ? policy.getDevelopmentVersion(request).getVersion()
+ : policy.getReleaseVersion(request).getVersion();
}
- private String getDevelopmentVersion( String projectId, ReleaseDescriptor releaseDescriptor )
- {
- String projectVersion = releaseDescriptor.getProjectDevelopmentVersion( projectId );
+ private String getDevelopmentVersion(String projectId, ReleaseDescriptor releaseDescriptor) {
+ String projectVersion = releaseDescriptor.getProjectDevelopmentVersion(projectId);
- if ( StringUtils.isEmpty( projectVersion ) )
- {
+ if (StringUtils.isEmpty(projectVersion)) {
projectVersion = releaseDescriptor.getDefaultDevelopmentVersion();
}
- if ( StringUtils.isEmpty( projectVersion ) )
- {
+ if (StringUtils.isEmpty(projectVersion)) {
return null;
}
return projectVersion;
}
- private String getReleaseVersion( String projectId, ReleaseDescriptor releaseDescriptor )
- {
- String projectVersion = releaseDescriptor.getProjectReleaseVersion( projectId );
+ private String getReleaseVersion(String projectId, ReleaseDescriptor releaseDescriptor) {
+ String projectVersion = releaseDescriptor.getProjectReleaseVersion(projectId);
- if ( StringUtils.isEmpty( projectVersion ) )
- {
+ if (StringUtils.isEmpty(projectVersion)) {
projectVersion = releaseDescriptor.getDefaultReleaseVersion();
}
- if ( StringUtils.isEmpty( projectVersion ) )
- {
+ if (StringUtils.isEmpty(projectVersion)) {
return null;
}
@@ -450,16 +362,17 @@ public abstract class AbstractMapVersionsPhase
}
@Override
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException
- {
+ public ReleaseResult simulate(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException {
ReleaseResult result = new ReleaseResult();
// It makes no modifications, so simulate is the same as execute
- execute( releaseDescriptor, releaseEnvironment, reactorProjects );
+ execute(releaseDescriptor, releaseEnvironment, reactorProjects);
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
index 5794501b..3199d840 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.provider.ScmProvider;
@@ -35,49 +34,35 @@ import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
*/
-public abstract class AbstractReleasePomsPhase extends AbstractReleasePhase
-{
+public abstract class AbstractReleasePomsPhase extends AbstractReleasePhase {
/**
* Tool that gets a configured SCM repository from release configuration.
*/
private final ScmRepositoryConfigurator scmRepositoryConfigurator;
- protected AbstractReleasePomsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator )
- {
+ protected AbstractReleasePomsPhase(ScmRepositoryConfigurator scmRepositoryConfigurator) {
this.scmRepositoryConfigurator = scmRepositoryConfigurator;
}
- protected ScmRepository getScmRepository( ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment )
- throws ReleaseFailureException, ReleaseExecutionException
- {
- try
- {
- return scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
- releaseEnvironment.getSettings() );
- }
- catch ( ScmRepositoryException exception )
- {
- throw new ReleaseScmRepositoryException( exception.getMessage(), exception.getValidationMessages() );
- }
- catch ( NoSuchScmProviderException exception )
- {
- throw new ReleaseExecutionException( "Unable to configure SCM repository: " + exception.getMessage(),
- exception );
+ protected ScmRepository getScmRepository(ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment)
+ throws ReleaseFailureException, ReleaseExecutionException {
+ try {
+ return scmRepositoryConfigurator.getConfiguredRepository(
+ releaseDescriptor, releaseEnvironment.getSettings());
+ } catch (ScmRepositoryException exception) {
+ throw new ReleaseScmRepositoryException(exception.getMessage(), exception.getValidationMessages());
+ } catch (NoSuchScmProviderException exception) {
+ throw new ReleaseExecutionException(
+ "Unable to configure SCM repository: " + exception.getMessage(), exception);
}
}
- protected ScmProvider getScmProvider( ScmRepository scmRepository )
- throws ReleaseExecutionException
- {
- try
- {
- return scmRepositoryConfigurator.getRepositoryProvider( scmRepository );
- }
- catch ( NoSuchScmProviderException exception )
- {
- throw new ReleaseExecutionException( "Unable to configure SCM repository: " + exception.getMessage(),
- exception );
+ protected ScmProvider getScmProvider(ScmRepository scmRepository) throws ReleaseExecutionException {
+ try {
+ return scmRepositoryConfigurator.getRepositoryProvider(scmRepository);
+ } catch (NoSuchScmProviderException exception) {
+ throw new ReleaseExecutionException(
+ "Unable to configure SCM repository: " + exception.getMessage(), exception);
}
}
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 9fc6b056..17f0c578 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.io.File;
import java.net.URI;
@@ -72,9 +71,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public abstract class AbstractRewritePomsPhase
- extends AbstractReleasePhase implements ResourceGenerator
-{
+public abstract class AbstractRewritePomsPhase extends AbstractReleasePhase implements ResourceGenerator {
/**
* Tool that gets a configured SCM repository from release configuration.
*/
@@ -94,13 +91,13 @@ public abstract class AbstractRewritePomsPhase
private long startTime = -1 * 1000;
- protected AbstractRewritePomsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
- Map<String, ModelETLFactory> modelETLFactories,
- Map<String, ScmTranslator> scmTranslators )
- {
- this.scmRepositoryConfigurator = requireNonNull( scmRepositoryConfigurator );
- this.modelETLFactories = requireNonNull( modelETLFactories );
- this.scmTranslators = requireNonNull( scmTranslators );
+ protected AbstractRewritePomsPhase(
+ ScmRepositoryConfigurator scmRepositoryConfigurator,
+ Map<String, ModelETLFactory> modelETLFactories,
+ Map<String, ScmTranslator> scmTranslators) {
+ this.scmRepositoryConfigurator = requireNonNull(scmRepositoryConfigurator);
+ this.modelETLFactories = requireNonNull(modelETLFactories);
+ this.scmTranslators = requireNonNull(scmTranslators);
}
/**
@@ -108,8 +105,7 @@ public abstract class AbstractRewritePomsPhase
*
* @return a {@link java.util.Map} object
*/
- protected final Map<String, ScmTranslator> getScmTranslators()
- {
+ protected final Map<String, ScmTranslator> getScmTranslators() {
return scmTranslators;
}
@@ -118,8 +114,7 @@ public abstract class AbstractRewritePomsPhase
*
* @param modelETL a {@link java.lang.String} object
*/
- public void setModelETL( String modelETL )
- {
+ public void setModelETL(String modelETL) {
this.modelETL = modelETL;
}
@@ -128,8 +123,7 @@ public abstract class AbstractRewritePomsPhase
*
* @param startTime a long
*/
- public void setStartTime( long startTime )
- {
+ public void setStartTime(long startTime) {
this.startTime = startTime;
}
@@ -141,485 +135,475 @@ public abstract class AbstractRewritePomsPhase
protected abstract String getPomSuffix();
@Override
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException, ReleaseFailureException {
ReleaseResult result = new ReleaseResult();
- transform( releaseDescriptor, releaseEnvironment, reactorProjects, false, result );
+ transform(releaseDescriptor, releaseEnvironment, reactorProjects, false, result);
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
@Override
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ public ReleaseResult simulate(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects)
+ throws ReleaseExecutionException, ReleaseFailureException {
ReleaseResult result = new ReleaseResult();
- transform( releaseDescriptor, releaseEnvironment, reactorProjects, true, result );
+ transform(releaseDescriptor, releaseEnvironment, reactorProjects, true, result);
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
@Override
- public ReleaseResult clean( List<MavenProject> reactorProjects )
- {
+ public ReleaseResult clean(List<MavenProject> reactorProjects) {
ReleaseResult result = new ReleaseResult();
- if ( reactorProjects != null )
- {
- for ( MavenProject project : reactorProjects )
- {
- File pomFile = ReleaseUtil.getStandardPom( project );
+ if (reactorProjects != null) {
+ for (MavenProject project : reactorProjects) {
+ File pomFile = ReleaseUtil.getStandardPom(project);
// MRELEASE-273 : if no pom
- if ( pomFile != null )
- {
- File file = new File( pomFile.getParentFile(), pomFile.getName() + "." + getPomSuffix() );
- if ( file.exists() )
- {
+ if (pomFile != null) {
+ File file = new File(pomFile.getParentFile(), pomFile.getName() + "." + getPomSuffix());
+ if (file.exists()) {
file.delete();
}
}
}
}
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
- private void transform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- result.setStartTime( ( startTime >= 0 ) ? startTime : System.currentTimeMillis() );
+ private void transform(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects,
+ boolean simulate,
+ ReleaseResult result)
+ throws ReleaseExecutionException, ReleaseFailureException {
+ result.setStartTime((startTime >= 0) ? startTime : System.currentTimeMillis());
- URI root = ReleaseUtil.getRootProject( reactorProjects ).getBasedir().toURI();
+ URI root = ReleaseUtil.getRootProject(reactorProjects).getBasedir().toURI();
- for ( MavenProject project : reactorProjects )
- {
+ for (MavenProject project : reactorProjects) {
URI pom = project.getFile().toURI();
- logInfo( result,
- "Transforming " + root.relativize( pom ).getPath() + ' '
- + buffer().project( project.getArtifactId() ) + " '" + project.getName() + "'"
- + ( simulate ? " with ." + getPomSuffix() + " suffix" : "" ) + "..." );
+ logInfo(
+ result,
+ "Transforming " + root.relativize(pom).getPath() + ' '
+ + buffer().project(project.getArtifactId()) + " '" + project.getName() + "'"
+ + (simulate ? " with ." + getPomSuffix() + " suffix" : "") + "...");
- transformProject( project, releaseDescriptor, releaseEnvironment, simulate, result );
+ transformProject(project, releaseDescriptor, releaseEnvironment, simulate, result);
}
}
- private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment, boolean simulate,
- ReleaseResult result )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- File pomFile = ReleaseUtil.getStandardPom( project );
+ private void transformProject(
+ MavenProject project,
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ boolean simulate,
+ ReleaseResult result)
+ throws ReleaseExecutionException, ReleaseFailureException {
+ File pomFile = ReleaseUtil.getStandardPom(project);
ModelETLRequest request = new ModelETLRequest();
- request.setProject( project );
- request.setReleaseDescriptor( releaseDescriptor );
+ request.setProject(project);
+ request.setReleaseDescriptor(releaseDescriptor);
- ModelETL etl = modelETLFactories.get( modelETL ).newInstance( request );
+ ModelETL etl = modelETLFactories.get(modelETL).newInstance(request);
- etl.extract( pomFile );
+ etl.extract(pomFile);
ScmRepository scmRepository = null;
ScmProvider provider = null;
- if ( isUpdateScm() )
- {
- try
- {
- scmRepository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
- releaseEnvironment.getSettings() );
+ if (isUpdateScm()) {
+ try {
+ scmRepository = scmRepositoryConfigurator.getConfiguredRepository(
+ releaseDescriptor, releaseEnvironment.getSettings());
- provider = scmRepositoryConfigurator.getRepositoryProvider( scmRepository );
- }
- catch ( ScmRepositoryException e )
- {
- throw new ReleaseScmRepositoryException( e.getMessage(), e.getValidationMessages() );
- }
- catch ( NoSuchScmProviderException e )
- {
- throw new ReleaseExecutionException( "Unable to configure SCM repository: " + e.getMessage(), e );
+ provider = scmRepositoryConfigurator.getRepositoryProvider(scmRepository);
+ } catch (ScmRepositoryException e) {
+ throw new ReleaseScmRepositoryException(e.getMessage(), e.getValidationMessages());
+ } catch (NoSuchScmProviderException e) {
+ throw new ReleaseExecutionException("Unable to configure SCM repository: " + e.getMessage(), e);
}
}
- transformDocument( project, etl.getModel(), releaseDescriptor, scmRepository, result,
- simulate );
+ transformDocument(project, etl.getModel(), releaseDescriptor, scmRepository, result, simulate);
File outputFile;
- if ( simulate )
- {
- outputFile = new File( pomFile.getParentFile(), pomFile.getName() + "." + getPomSuffix() );
- }
- else
- {
+ if (simulate) {
+ outputFile = new File(pomFile.getParentFile(), pomFile.getName() + "." + getPomSuffix());
+ } else {
outputFile = pomFile;
- prepareScm( pomFile, releaseDescriptor, scmRepository, provider );
+ prepareScm(pomFile, releaseDescriptor, scmRepository, provider);
}
- etl.load( outputFile );
-
+ etl.load(outputFile);
}
- private void transformDocument( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- ScmRepository scmRepository, ReleaseResult result,
- boolean simulate )
- throws ReleaseExecutionException, ReleaseFailureException
- {
+ private void transformDocument(
+ MavenProject project,
+ Model modelTarget,
+ ReleaseDescriptor releaseDescriptor,
+ ScmRepository scmRepository,
+ ReleaseResult result,
+ boolean simulate)
+ throws ReleaseExecutionException, ReleaseFailureException {
Model model = project.getModel();
Properties properties = modelTarget.getProperties();
- String parentVersion = rewriteParent( project, modelTarget, releaseDescriptor, simulate );
+ String parentVersion = rewriteParent(project, modelTarget, releaseDescriptor, simulate);
- String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ String projectId = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
- rewriteVersion( modelTarget, releaseDescriptor, projectId, project );
+ rewriteVersion(modelTarget, releaseDescriptor, projectId, project);
Build buildTarget = modelTarget.getBuild();
- if ( buildTarget != null )
- {
+ if (buildTarget != null) {
// profile.build.extensions doesn't exist, so only rewrite project.build.extensions
- rewriteArtifactVersions( toMavenCoordinates( buildTarget.getExtensions() ),
- model, properties, result, releaseDescriptor, simulate );
-
- rewriteArtifactVersions( toMavenCoordinates( buildTarget.getPlugins() ),
- model, properties, result, releaseDescriptor, simulate );
-
- for ( Plugin plugin : buildTarget.getPlugins() )
- {
- rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ),
- model, properties,
- result, releaseDescriptor, simulate );
+ rewriteArtifactVersions(
+ toMavenCoordinates(buildTarget.getExtensions()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
+
+ rewriteArtifactVersions(
+ toMavenCoordinates(buildTarget.getPlugins()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
+
+ for (Plugin plugin : buildTarget.getPlugins()) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(plugin.getDependencies()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
}
- if ( buildTarget.getPluginManagement() != null )
- {
- rewriteArtifactVersions( toMavenCoordinates( buildTarget.getPluginManagement().getPlugins() ), model,
- properties, result, releaseDescriptor, simulate );
-
- for ( Plugin plugin : buildTarget.getPluginManagement().getPlugins() )
- {
- rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ), model, properties, result,
- releaseDescriptor, simulate );
+ if (buildTarget.getPluginManagement() != null) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(buildTarget.getPluginManagement().getPlugins()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
+
+ for (Plugin plugin : buildTarget.getPluginManagement().getPlugins()) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(plugin.getDependencies()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
}
}
}
- for ( Profile profile : modelTarget.getProfiles() )
- {
+ for (Profile profile : modelTarget.getProfiles()) {
BuildBase profileBuild = profile.getBuild();
- if ( profileBuild != null )
- {
- rewriteArtifactVersions( toMavenCoordinates( profileBuild.getPlugins() ), model, properties, result,
- releaseDescriptor, simulate );
-
- for ( Plugin plugin : profileBuild.getPlugins() )
- {
- rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ), model, properties, result,
- releaseDescriptor, simulate );
+ if (profileBuild != null) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(profileBuild.getPlugins()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
+
+ for (Plugin plugin : profileBuild.getPlugins()) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(plugin.getDependencies()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
}
- if ( profileBuild.getPluginManagement() != null )
- {
- rewriteArtifactVersions( toMavenCoordinates( profileBuild.getPluginManagement().getPlugins() ),
- model, properties, result, releaseDescriptor, simulate );
-
- for ( Plugin plugin : profileBuild.getPluginManagement().getPlugins() )
- {
- rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ), model, properties,
- result, releaseDescriptor, simulate );
+ if (profileBuild.getPluginManagement() != null) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(
+ profileBuild.getPluginManagement().getPlugins()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
+
+ for (Plugin plugin : profileBuild.getPluginManagement().getPlugins()) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(plugin.getDependencies()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
}
}
}
}
List<ModelBase> modelBases = new ArrayList<>();
- modelBases.add( modelTarget );
- modelBases.addAll( modelTarget.getProfiles() );
-
- for ( ModelBase modelBase : modelBases )
- {
- rewriteArtifactVersions( toMavenCoordinates( modelBase.getDependencies() ), model, properties, result,
- releaseDescriptor, simulate );
-
- if ( modelBase.getDependencyManagement() != null )
- {
- rewriteArtifactVersions( toMavenCoordinates( modelBase.getDependencyManagement().getDependencies() ),
- model, properties, result, releaseDescriptor, simulate );
+ modelBases.add(modelTarget);
+ modelBases.addAll(modelTarget.getProfiles());
+
+ for (ModelBase modelBase : modelBases) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(modelBase.getDependencies()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
+
+ if (modelBase.getDependencyManagement() != null) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(modelBase.getDependencyManagement().getDependencies()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
}
- if ( modelBase.getReporting() != null )
- {
- rewriteArtifactVersions( toMavenCoordinates( modelBase.getReporting().getPlugins() ), model, properties,
- result, releaseDescriptor, simulate );
+ if (modelBase.getReporting() != null) {
+ rewriteArtifactVersions(
+ toMavenCoordinates(modelBase.getReporting().getPlugins()),
+ model,
+ properties,
+ result,
+ releaseDescriptor,
+ simulate);
}
}
- transformScm( project, modelTarget, releaseDescriptor, projectId, scmRepository, result );
+ transformScm(project, modelTarget, releaseDescriptor, projectId, scmRepository, result);
- if ( properties != null )
- {
- rewriteBuildOutputTimestampProperty( properties, result );
+ if (properties != null) {
+ rewriteBuildOutputTimestampProperty(properties, result);
}
}
- private void rewriteBuildOutputTimestampProperty( Properties properties, ReleaseResult result )
- {
- String buildOutputTimestamp = properties.getProperty( "project.build.outputTimestamp" );
- if ( buildOutputTimestamp == null || StringUtils.isEmpty( buildOutputTimestamp ) )
- {
+ private void rewriteBuildOutputTimestampProperty(Properties properties, ReleaseResult result) {
+ String buildOutputTimestamp = properties.getProperty("project.build.outputTimestamp");
+ if (buildOutputTimestamp == null || StringUtils.isEmpty(buildOutputTimestamp)) {
// no Reproducible Builds output timestamp defined
return;
}
- if ( StringUtils.isNumeric( buildOutputTimestamp ) )
- {
+ if (StringUtils.isNumeric(buildOutputTimestamp)) {
// int representing seconds since the epoch, like SOURCE_DATE_EPOCH
- buildOutputTimestamp = String.valueOf( result.getStartTime() / 1000 );
- }
- else if ( buildOutputTimestamp.length() <= 1 )
- {
+ buildOutputTimestamp = String.valueOf(result.getStartTime() / 1000);
+ } else if (buildOutputTimestamp.length() <= 1) {
// value length == 1 means disable Reproducible Builds
return;
- }
- else
- {
+ } else {
// ISO-8601
- DateFormat df = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss'Z'" );
- df.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
- buildOutputTimestamp = df.format( new Date( result.getStartTime() ) );
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ df.setTimeZone(TimeZone.getTimeZone("UTC"));
+ buildOutputTimestamp = df.format(new Date(result.getStartTime()));
}
- properties.setProperty( "project.build.outputTimestamp", buildOutputTimestamp );
+ properties.setProperty("project.build.outputTimestamp", buildOutputTimestamp);
}
- private void rewriteVersion( Model modelTarget, ReleaseDescriptor releaseDescriptor, String projectId,
- MavenProject project )
- throws ReleaseFailureException
- {
- String version = getNextVersion( releaseDescriptor, projectId );
- if ( version == null )
- {
- throw new ReleaseFailureException( "Version for '" + project.getName() + "' was not mapped" );
+ private void rewriteVersion(
+ Model modelTarget, ReleaseDescriptor releaseDescriptor, String projectId, MavenProject project)
+ throws ReleaseFailureException {
+ String version = getNextVersion(releaseDescriptor, projectId);
+ if (version == null) {
+ throw new ReleaseFailureException("Version for '" + project.getName() + "' was not mapped");
}
- modelTarget.setVersion( version );
+ modelTarget.setVersion(version);
}
- private String rewriteParent( MavenProject project, Model targetModel,
- ReleaseDescriptor releaseDescriptor, boolean simulate )
- throws ReleaseFailureException
- {
+ private String rewriteParent(
+ MavenProject project, Model targetModel, ReleaseDescriptor releaseDescriptor, boolean simulate)
+ throws ReleaseFailureException {
String parentVersion = null;
- if ( project.hasParent() )
- {
+ if (project.hasParent()) {
MavenProject parent = project.getParent();
- String key = ArtifactUtils.versionlessKey( parent.getGroupId(), parent.getArtifactId() );
- parentVersion = getNextVersion( releaseDescriptor, key );
- if ( parentVersion == null )
- {
- //MRELEASE-317
- parentVersion = getResolvedSnapshotVersion( key, releaseDescriptor );
+ String key = ArtifactUtils.versionlessKey(parent.getGroupId(), parent.getArtifactId());
+ parentVersion = getNextVersion(releaseDescriptor, key);
+ if (parentVersion == null) {
+ // MRELEASE-317
+ parentVersion = getResolvedSnapshotVersion(key, releaseDescriptor);
}
- if ( parentVersion == null )
- {
- String original = getOriginalVersion( releaseDescriptor, key, simulate );
- if ( parent.getVersion().equals( original ) )
- {
- throw new ReleaseFailureException( "Version for parent '" + parent.getName() + "' was not mapped" );
+ if (parentVersion == null) {
+ String original = getOriginalVersion(releaseDescriptor, key, simulate);
+ if (parent.getVersion().equals(original)) {
+ throw new ReleaseFailureException("Version for parent '" + parent.getName() + "' was not mapped");
}
- }
- else
- {
- targetModel.getParent().setVersion( parentVersion );
+ } else {
+ targetModel.getParent().setVersion(parentVersion);
}
}
return parentVersion;
}
- private void rewriteArtifactVersions( Collection<MavenCoordinate> elements, Model projectModel,
- Properties properties, ReleaseResult result,
- ReleaseDescriptor releaseDescriptor, boolean simulate )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- if ( elements == null )
- {
+ private void rewriteArtifactVersions(
+ Collection<MavenCoordinate> elements,
+ Model projectModel,
+ Properties properties,
+ ReleaseResult result,
+ ReleaseDescriptor releaseDescriptor,
+ boolean simulate)
+ throws ReleaseExecutionException, ReleaseFailureException {
+ if (elements == null) {
return;
}
- String projectId = ArtifactUtils.versionlessKey( projectModel.getGroupId(), projectModel.getArtifactId() );
- for ( MavenCoordinate coordinate : elements )
- {
+ String projectId = ArtifactUtils.versionlessKey(projectModel.getGroupId(), projectModel.getArtifactId());
+ for (MavenCoordinate coordinate : elements) {
String rawVersion = coordinate.getVersion();
- if ( rawVersion == null )
- {
+ if (rawVersion == null) {
// managed dependency or unversioned plugin
continue;
}
String rawGroupId = coordinate.getGroupId();
- if ( rawGroupId == null )
- {
- if ( "plugin".equals( coordinate.getName() ) )
- {
+ if (rawGroupId == null) {
+ if ("plugin".equals(coordinate.getName())) {
rawGroupId = "org.apache.maven.plugins";
- }
- else
- {
+ } else {
// incomplete dependency
continue;
}
}
- String groupId = ReleaseUtil.interpolate( rawGroupId, projectModel );
+ String groupId = ReleaseUtil.interpolate(rawGroupId, projectModel);
String rawArtifactId = coordinate.getArtifactId();
- if ( rawArtifactId == null )
- {
+ if (rawArtifactId == null) {
// incomplete element
continue;
}
- String artifactId = ReleaseUtil.interpolate( rawArtifactId, projectModel );
-
- String key = ArtifactUtils.versionlessKey( groupId, artifactId );
- String resolvedSnapshotVersion = getResolvedSnapshotVersion( key, releaseDescriptor );
- String mappedVersion = getNextVersion( releaseDescriptor, key );
- String originalVersion = getOriginalVersion( releaseDescriptor, key, simulate );
- if ( originalVersion == null )
- {
- originalVersion = getOriginalResolvedSnapshotVersion( key, releaseDescriptor );
+ String artifactId = ReleaseUtil.interpolate(rawArtifactId, projectModel);
+
+ String key = ArtifactUtils.versionlessKey(groupId, artifactId);
+ String resolvedSnapshotVersion = getResolvedSnapshotVersion(key, releaseDescriptor);
+ String mappedVersion = getNextVersion(releaseDescriptor, key);
+ String originalVersion = getOriginalVersion(releaseDescriptor, key, simulate);
+ if (originalVersion == null) {
+ originalVersion = getOriginalResolvedSnapshotVersion(key, releaseDescriptor);
}
// MRELEASE-220
- if ( mappedVersion != null && mappedVersion.endsWith( Artifact.SNAPSHOT_VERSION )
- && !rawVersion.endsWith( Artifact.SNAPSHOT_VERSION ) && !releaseDescriptor.isUpdateDependencies() )
- {
+ if (mappedVersion != null
+ && mappedVersion.endsWith(Artifact.SNAPSHOT_VERSION)
+ && !rawVersion.endsWith(Artifact.SNAPSHOT_VERSION)
+ && !releaseDescriptor.isUpdateDependencies()) {
continue;
}
- if ( mappedVersion != null )
- {
- if ( rawVersion.equals( originalVersion ) )
- {
- logInfo( result, " Updating " + artifactId + " to " + mappedVersion );
- coordinate.setVersion( mappedVersion );
- }
- else if ( rawVersion.matches( "\\$\\{.+\\}" ) )
- {
- String expression = rawVersion.substring( 2, rawVersion.length() - 1 );
-
- if ( expression.startsWith( "project." ) || expression.startsWith( "pom." )
- || "version".equals( expression ) )
- {
- if ( !mappedVersion.equals( getNextVersion( releaseDescriptor, projectId ) ) )
- {
- logInfo( result, " Updating " + artifactId + " to " + mappedVersion );
- coordinate.setVersion( mappedVersion );
+ if (mappedVersion != null) {
+ if (rawVersion.equals(originalVersion)) {
+ logInfo(result, " Updating " + artifactId + " to " + mappedVersion);
+ coordinate.setVersion(mappedVersion);
+ } else if (rawVersion.matches("\\$\\{.+\\}")) {
+ String expression = rawVersion.substring(2, rawVersion.length() - 1);
+
+ if (expression.startsWith("project.")
+ || expression.startsWith("pom.")
+ || "version".equals(expression)) {
+ if (!mappedVersion.equals(getNextVersion(releaseDescriptor, projectId))) {
+ logInfo(result, " Updating " + artifactId + " to " + mappedVersion);
+ coordinate.setVersion(mappedVersion);
+ } else {
+ logInfo(result, " Ignoring artifact version update for expression " + rawVersion);
}
- else
- {
- logInfo( result, " Ignoring artifact version update for expression " + rawVersion );
- }
- }
- else if ( properties != null )
- {
+ } else if (properties != null) {
// version is an expression, check for properties to update instead
- String propertyValue = properties.getProperty( expression );
+ String propertyValue = properties.getProperty(expression);
- if ( propertyValue != null )
- {
- if ( propertyValue.equals( originalVersion ) )
- {
- logInfo( result, " Updating " + rawVersion + " to " + mappedVersion );
+ if (propertyValue != null) {
+ if (propertyValue.equals(originalVersion)) {
+ logInfo(result, " Updating " + rawVersion + " to " + mappedVersion);
// change the property only if the property is the same as what's in the reactor
- properties.setProperty( expression, mappedVersion );
- }
- else if ( mappedVersion.equals( propertyValue ) )
- {
+ properties.setProperty(expression, mappedVersion);
+ } else if (mappedVersion.equals(propertyValue)) {
// this property may have been updated during processing a sibling.
- logInfo( result, " Ignoring artifact version update for expression " + rawVersion
- + " because it is already updated" );
- }
- else if ( !mappedVersion.equals( rawVersion ) )
- {
+ logInfo(
+ result,
+ " Ignoring artifact version update for expression " + rawVersion
+ + " because it is already updated");
+ } else if (!mappedVersion.equals(rawVersion)) {
// WARNING: ${pom.*} prefix support and ${version} is about to be dropped in mvn4!
// https://issues.apache.org/jira/browse/MNG-7404
// https://issues.apache.org/jira/browse/MNG-7244
- if ( mappedVersion.matches( "\\$\\{project.+\\}" )
- || mappedVersion.matches( "\\$\\{pom.+\\}" )
- || "${version}".equals( mappedVersion ) )
- {
- logInfo( result, " Ignoring artifact version update for expression "
- + mappedVersion );
+ if (mappedVersion.matches("\\$\\{project.+\\}")
+ || mappedVersion.matches("\\$\\{pom.+\\}")
+ || "${version}".equals(mappedVersion)) {
+ logInfo(
+ result,
+ " Ignoring artifact version update for expression " + mappedVersion);
// ignore... we cannot update this expression
- }
- else
- {
+ } else {
// the value of the expression conflicts with what the user wanted to release
- throw new ReleaseFailureException( "The artifact (" + key + ") requires a "
+ throw new ReleaseFailureException("The artifact (" + key + ") requires a "
+ "different version (" + mappedVersion + ") than what is found ("
+ propertyValue + ") for the expression (" + expression + ") in the "
- + "project (" + projectId + ")." );
+ + "project (" + projectId + ").");
}
}
- }
- else
- {
+ } else {
// the expression used to define the version of this artifact may be inherited
// TODO needs a better error message, what pom? what dependency?
- throw new ReleaseFailureException( "The version could not be updated: " + rawVersion );
+ throw new ReleaseFailureException("The version could not be updated: " + rawVersion);
}
}
- }
- else
- {
+ } else {
// different/previous version not related to current release
}
- }
- else if ( resolvedSnapshotVersion != null )
- {
- logInfo( result, " Updating " + artifactId + " to " + resolvedSnapshotVersion );
+ } else if (resolvedSnapshotVersion != null) {
+ logInfo(result, " Updating " + artifactId + " to " + resolvedSnapshotVersion);
- coordinate.setVersion( resolvedSnapshotVersion );
- }
- else
- {
+ coordinate.setVersion(resolvedSnapshotVersion);
+ } else {
// artifact not related to current release
}
}
}
- private void prepareScm( File pomFile, ReleaseDescriptor releaseDescriptor, ScmRepository repository,
- ScmProvider provider )
- throws ReleaseExecutionException, ReleaseScmCommandException
- {
- try
- {
- if ( isUpdateScm() && ( releaseDescriptor.isScmUseEditMode() || provider.requiresEditMode() ) )
- {
- EditScmResult result = provider.edit( repository, new ScmFileSet(
- new File( releaseDescriptor.getWorkingDirectory() ), pomFile ) );
-
- if ( !result.isSuccess() )
- {
- throw new ReleaseScmCommandException( "Unable to enable editing on the POM", result );
+ private void prepareScm(
+ File pomFile, ReleaseDescriptor releaseDescriptor, ScmRepository repository, ScmProvider provider)
+ throws ReleaseExecutionException, ReleaseScmCommandException {
+ try {
+ if (isUpdateScm() && (releaseDescriptor.isScmUseEditMode() || provider.requiresEditMode())) {
+ EditScmResult result = provider.edit(
+ repository, new ScmFileSet(new File(releaseDescriptor.getWorkingDirectory()), pomFile));
+
+ if (!result.isSuccess()) {
+ throw new ReleaseScmCommandException("Unable to enable editing on the POM", result);
}
}
- }
- catch ( ScmException e )
- {
- throw new ReleaseExecutionException( "An error occurred enabling edit mode: " + e.getMessage(), e );
+ } catch (ScmException e) {
+ throw new ReleaseExecutionException("An error occurred enabling edit mode: " + e.getMessage(), e);
}
}
-
/**
* <p>getResolvedSnapshotVersion.</p>
*
@@ -627,8 +611,8 @@ public abstract class AbstractRewritePomsPhase
* @param releaseDscriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object
* @return a {@link java.lang.String} object
*/
- protected abstract String getResolvedSnapshotVersion( String artifactVersionlessKey,
- ReleaseDescriptor releaseDscriptor );
+ protected abstract String getResolvedSnapshotVersion(
+ String artifactVersionlessKey, ReleaseDescriptor releaseDscriptor);
/**
* <p>getOriginalVersion.</p>
@@ -638,8 +622,8 @@ public abstract class AbstractRewritePomsPhase
* @param simulate a boolean
* @return a {@link java.lang.String} object
*/
- protected abstract String getOriginalVersion( ReleaseDescriptor releaseDescriptor, String projectKey,
- boolean simulate );
+ protected abstract String getOriginalVersion(
+ ReleaseDescriptor releaseDescriptor, String projectKey, boolean simulate);
/**
* <p>getNextVersion.</p>
@@ -648,7 +632,7 @@ public abstract class AbstractRewritePomsPhase
* @param key a {@link java.lang.String} object
* @return a {@link java.lang.String} object
*/
- protected abstract String getNextVersion( ReleaseDescriptor releaseDescriptor, String key );
+ protected abstract String getNextVersion(ReleaseDescriptor releaseDescriptor, String key);
/**
* <p>transformScm.</p>
@@ -661,9 +645,13 @@ public abstract class AbstractRewritePomsPhase
* @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
* @throws org.apache.maven.shared.release.ReleaseExecutionException if any.
*/
- protected abstract void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- String projectId, ScmRepository scmRepository,
- ReleaseResult result )
+ protected abstract void transformScm(
+ MavenProject project,
+ Model modelTarget,
+ ReleaseDescriptor releaseDescriptor,
+ String projectId,
+ ScmRepository scmRepository,
+ ReleaseResult result)
throws ReleaseExecutionException;
/**
@@ -672,8 +660,7 @@ public abstract class AbstractRewritePomsPhase
* @return {@code true} if the SCM-section should be updated, otherwise {@code false}
* @since 2.4
*/
- protected boolean isUpdateScm()
- {
+ protected boolean isUpdateScm() {
return true;
}
@@ -684,10 +671,9 @@ public abstract class AbstractRewritePomsPhase
* @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object
* @return a {@link java.lang.String} object
*/
- protected String getOriginalResolvedSnapshotVersion( String artifactVersionlessKey,
- ReleaseDescriptor releaseDescriptor )
- {
- return releaseDescriptor.getDependencyOriginalVersion( artifactVersionlessKey );
+ protected String getOriginalResolvedSnapshotVersion(
+ String artifactVersionlessKey, ReleaseDescriptor releaseDescriptor) {
+ return releaseDescriptor.getDependencyOriginalVersion(artifactVersionlessKey);
}
/**
@@ -699,55 +685,41 @@ public abstract class AbstractRewritePomsPhase
* @param urlPath - scm.url or scm.connection
* @return The url path for the tag.
*/
- protected static String translateUrlPath( String trunkPath, String tagPath, String urlPath )
- {
+ protected static String translateUrlPath(String trunkPath, String tagPath, String urlPath) {
trunkPath = trunkPath.trim();
tagPath = tagPath.trim();
- //Strip the slash at the end if one is present
- if ( trunkPath.endsWith( "/" ) )
- {
- trunkPath = trunkPath.substring( 0, trunkPath.length() - 1 );
+ // Strip the slash at the end if one is present
+ if (trunkPath.endsWith("/")) {
+ trunkPath = trunkPath.substring(0, trunkPath.length() - 1);
}
- if ( tagPath.endsWith( "/" ) )
- {
- tagPath = tagPath.substring( 0, tagPath.length() - 1 );
+ if (tagPath.endsWith("/")) {
+ tagPath = tagPath.substring(0, tagPath.length() - 1);
}
char[] tagPathChars = trunkPath.toCharArray();
char[] trunkPathChars = tagPath.toCharArray();
// Find the common path between trunk and tags
int i = 0;
- while ( ( i < tagPathChars.length ) && ( i < trunkPathChars.length ) && tagPathChars[i] == trunkPathChars[i] )
- {
+ while ((i < tagPathChars.length) && (i < trunkPathChars.length) && tagPathChars[i] == trunkPathChars[i]) {
++i;
}
// If there is nothing common between trunk and tags, or the relative
// path does not exist in the url, then just return the tag.
- if ( i == 0 || urlPath.indexOf( trunkPath.substring( i ) ) < 0 )
- {
+ if (i == 0 || urlPath.indexOf(trunkPath.substring(i)) < 0) {
return tagPath;
- }
- else
- {
- return StringUtils.replace( urlPath, trunkPath.substring( i ), tagPath.substring( i ) );
+ } else {
+ return StringUtils.replace(urlPath, trunkPath.substring(i), tagPath.substring(i));
}
}
- private Collection<MavenCoordinate> toMavenCoordinates( List<?> objects )
- {
- Collection<MavenCoordinate> coordinates = new ArrayList<>( objects.size() );
- for ( Object object : objects )
- {
- if ( object instanceof MavenCoordinate )
- {
- coordinates.add( (MavenCoordinate) object );
- }
- else
- {
+ private Collection<MavenCoordinate> toMavenCoordinates(List<?> objects) {
+ Collection<MavenCoordinate> coordinates = new ArrayList<>(objects.size());
+ for (Object object : objects) {
+ if (object instanceof MavenCoordinate) {
+ coordinates.add((MavenCoordinate) object);
+ } else {
throw new UnsupportedOperationException();
}
}
return coordinates;
}
-
-
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
index 9b8bdcac..ff30e4d1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.io.File;
import java.util.List;
@@ -40,98 +39,100 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public abstract class AbstractRunGoalsPhase
- extends AbstractReleasePhase
-{
+public abstract class AbstractRunGoalsPhase extends AbstractReleasePhase {
/**
* Component to assist in executing Maven.
*/
private final Map<String, MavenExecutor> mavenExecutors;
- protected AbstractRunGoalsPhase( Map<String, MavenExecutor> mavenExecutors )
- {
- this.mavenExecutors = requireNonNull( mavenExecutors );
+ protected AbstractRunGoalsPhase(Map<String, MavenExecutor> mavenExecutors) {
+ this.mavenExecutors = requireNonNull(mavenExecutors);
}
- protected ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects, boolean logArguments )
- throws ReleaseExecutionException
- {
- return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory() ),
- getAdditionalArguments( releaseDescriptor ), logArguments );
+ protected ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects,
+ boolean logArguments)
+ throws ReleaseExecutionException {
+ return execute(
+ releaseDescriptor,
+ releaseEnvironment,
+ new File(releaseDescriptor.getWorkingDirectory()),
+ getAdditionalArguments(releaseDescriptor),
+ logArguments);
}
- protected ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- File workingDirectory, String additionalArguments, boolean logArguments )
- throws ReleaseExecutionException
- {
+ protected ReleaseResult execute(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ File workingDirectory,
+ String additionalArguments,
+ boolean logArguments)
+ throws ReleaseExecutionException {
ReleaseResult result = new ReleaseResult();
- try
- {
- String goals = getGoals( releaseDescriptor );
- if ( !StringUtils.isEmpty( goals ) )
- {
- logInfo( result, "Executing goals '" + buffer().strong( goals ) + "'..." );
- if ( logArguments )
- {
+ try {
+ String goals = getGoals(releaseDescriptor);
+ if (!StringUtils.isEmpty(goals)) {
+ logInfo(result, "Executing goals '" + buffer().strong(goals) + "'...");
+ if (logArguments) {
// logging arguments may log secrets: should be activated only on dryRun
- logInfo( result, " with additional arguments: "
- + ( additionalArguments == null ? "(none)" : additionalArguments ) );
+ logInfo(
+ result,
+ " with additional arguments: "
+ + (additionalArguments == null ? "(none)" : additionalArguments));
}
- MavenExecutor mavenExecutor = mavenExecutors.get( releaseEnvironment.getMavenExecutorId() );
+ MavenExecutor mavenExecutor = mavenExecutors.get(releaseEnvironment.getMavenExecutorId());
- if ( mavenExecutor == null )
- {
+ if (mavenExecutor == null) {
throw new ReleaseExecutionException(
- "Cannot find Maven executor with id: " + releaseEnvironment.getMavenExecutorId() );
+ "Cannot find Maven executor with id: " + releaseEnvironment.getMavenExecutorId());
}
File executionRoot;
String pomFileName;
- if ( releaseDescriptor.getPomFileName() != null )
- {
- File rootPom = new File( workingDirectory, releaseDescriptor.getPomFileName() );
+ if (releaseDescriptor.getPomFileName() != null) {
+ File rootPom = new File(workingDirectory, releaseDescriptor.getPomFileName());
executionRoot = rootPom.getParentFile();
pomFileName = rootPom.getName();
- }
- else
- {
+ } else {
executionRoot = workingDirectory;
pomFileName = null;
}
- mavenExecutor.executeGoals( executionRoot, goals, releaseEnvironment,
- releaseDescriptor.isInteractive(), additionalArguments,
- pomFileName, result );
+ mavenExecutor.executeGoals(
+ executionRoot,
+ goals,
+ releaseEnvironment,
+ releaseDescriptor.isInteractive(),
+ additionalArguments,
+ pomFileName,
+ result);
}
- }
- catch ( MavenExecutorException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
+ } catch (MavenExecutorException e) {
+ throw new ReleaseExecutionException(e.getMessage(), e);
}
- result.setResultCode( ReleaseResult.SUCCESS );
+ result.setResultCode(ReleaseResult.SUCCESS);
return result;
}
- protected abstract String getGoals( ReleaseDescriptor releaseDescriptor );
+ protected abstract String getGoals(ReleaseDescriptor releaseDescriptor);
- protected String getAdditionalArguments( ReleaseDescriptor releaseDescriptor )
- {
+ protected String getAdditionalArguments(ReleaseDescriptor releaseDescriptor) {
StringBuilder builder = new StringBuilder();
- if ( releaseDescriptor.getAdditionalArguments() != null )
- {
- builder.append( releaseDescriptor.getAdditionalArguments() );
+ if (releaseDescriptor.getAdditionalArguments() != null) {
+ builder.append(releaseDescriptor.getAdditionalArguments());
}
- if ( !releaseDescriptor.getActivateProfiles().isEmpty() )
- {
- builder.append( " -P " )
- .append( StringUtils.join( releaseDescriptor.getActivateProfiles().iterator(), "," ) );
+ if (!releaseDescriptor.getActivateProfiles().isEmpty()) {
+ builder.append(" -P ")
+ .append(StringUtils.join(
+ releaseDescriptor.getActivateProfiles().iterator(), ","));
}
return builder.length() > 0 ? builder.toString().trim() : null;
@@ -147,13 +148,11 @@ public abstract class AbstractRunGoalsPhase
* directory or ""
* @return The working directory
*/
- protected File determineWorkingDirectory( File checkoutDirectory, String relativePathProjectDirectory )
- {
+ protected File determineWorkingDirectory(File checkoutDirectory, String relativePathProjectDirectory) {
File workingDirectory = checkoutDirectory;
- if ( StringUtils.isNotEmpty( relativePathProjectDirectory ) )
- {
- workingDirectory = new File( checkoutDirectory, relativePathProjectDirectory );
+ if (StringUtils.isNotEmpty(relativePathProjectDirectory)) {
+ workingDirectory = new File(checkoutDirectory, relativePathProjectDirectory);
}
return workingDirectory;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitDevelopmentPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitDevelopmentPhase.java
index 15ea9391..4badb570 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitDevelopmentPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitDevelopmentPhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.shared.release.phase;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.release.phase;
import java.io.File;
import java.text.MessageFormat;
@@ -38,9 +37,7 @@ import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public abstract class AbstractScmCommitDevelopmentPhase
- extends AbstractScmCommitPhase
-{
+public abstract class AbstractScmCommitDevelopmentPhase extends AbstractScmCommitPhase {
/**
* The format for the
*/
@@ -48,64 +45,54 @@ public abstract class AbstractScmCommitDevelopmentPhase
protected AbstractScmCommitDevelopmentPhase(
ScmRepositoryConfigurator scmRepositoryConfigurator,
- String descriptorCommentGetter, String rollbackMessageFormat )
- {
- super( scmRepositoryConfigurator, descriptorCommentGetter );
+ String descriptorCommentGetter,
+ String rollbackMessageFormat) {
+ super(scmRepositoryConfigurator, descriptorCommentGetter);
this.rollbackMessageFormat = rollbackMessageFormat;
}
@Override
- protected void runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects, ReleaseResult result, boolean simulating )
- throws ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException
- {
+ protected void runLogic(
+ ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects,
+ ReleaseResult result,
+ boolean simulating)
+ throws ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException {
// no rollback required
if (
- // was there no commit that has to be rolled back by a new one
- releaseDescriptor.isSuppressCommitBeforeTagOrBranch()
- // and working copy should not be touched
- && !releaseDescriptor.isUpdateWorkingCopyVersions() )
- {
- if ( simulating )
- {
- logInfo( result, "Full run would not commit changes, because updateWorkingCopyVersions is false." );
- }
- else
- {
- logInfo( result, "Modified POMs are not committed because updateWorkingCopyVersions is set to false." );
+ // was there no commit that has to be rolled back by a new one
+ releaseDescriptor.isSuppressCommitBeforeTagOrBranch()
+ // and working copy should not be touched
+ && !releaseDescriptor.isUpdateWorkingCopyVersions()) {
+ if (simulating) {
+ logInfo(result, "Full run would not commit changes, because updateWorkingCopyVersions is false.");
+ } else {
+ logInfo(result, "Modified POMs are not committed because updateWorkingCopyVersions is set to false.");
}
}
// rollback or commit development versions required
- else
- {
... 40925 lines suppressed ...