You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/02/10 16:03:08 UTC
[maven-release] 20/21: Improve usage BuilderReleaseDescriptor
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-998
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 268c1381ce98ef4b0bba5e9df15080a2e342204d
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Feb 10 16:28:09 2018 +0100
Improve usage BuilderReleaseDescriptor
---
.../org/apache/maven/shared/release/DefaultReleaseManager.java | 7 ++++---
.../maven/shared/release/config/ReleaseDescriptorBuilder.java | 5 ++++-
.../java/org/apache/maven/shared/release/config/ReleaseUtils.java | 3 ++-
3 files changed, 10 insertions(+), 5 deletions(-)
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 9ae5bc9..1cbcb89 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
@@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
+import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorStore;
import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
import org.apache.maven.shared.release.config.ReleaseUtils;
@@ -123,7 +124,7 @@ public class DefaultReleaseManager
};
} );
- ReleaseDescriptor config;
+ BuilderReleaseDescriptor config;
if ( BooleanUtils.isNotFalse( prepareRequest.getResume() ) )
{
config = loadReleaseDescriptor( builder, prepareRequest.getReleaseManagerListener() );
@@ -487,14 +488,14 @@ public class DefaultReleaseManager
}
}
- private ReleaseDescriptor loadReleaseDescriptor( ReleaseDescriptorBuilder builder,
+ private BuilderReleaseDescriptor loadReleaseDescriptor( ReleaseDescriptorBuilder builder,
ReleaseManagerListener listener )
throws ReleaseExecutionException
{
try
{
updateListener( listener, "verify-release-configuration", PHASE_START );
- ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( configStore.read( builder ) );
+ BuilderReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( configStore.read( builder ) );
updateListener( listener, "verify-release-configuration", PHASE_END );
return descriptor;
}
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 b7ec376..c9866b3 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
@@ -36,8 +36,11 @@ public class ReleaseDescriptorBuilder
* @author Robert Scholte
*
*/
- static final class BuilderReleaseDescriptor extends ReleaseDescriptor implements ReleaseDescriptorNew
+ public static final class BuilderReleaseDescriptor extends ReleaseDescriptor implements ReleaseDescriptorNew
{
+ private BuilderReleaseDescriptor()
+ {
+ }
}
private final BuilderReleaseDescriptor releaseDescriptor;
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 e49539c..36504c2 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
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderReleaseDescriptor;
import org.apache.maven.shared.release.scm.IdentifiedScm;
/**
@@ -42,7 +43,7 @@ public class ReleaseUtils
// nothing to see here
}
- public static ReleaseDescriptor buildReleaseDescriptor( ReleaseDescriptorBuilder builder )
+ public static BuilderReleaseDescriptor buildReleaseDescriptor( ReleaseDescriptorBuilder builder )
{
return builder.build();
}
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.