logInfo.
* diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml index 81501fb17..717b5b2e3 100644 --- a/maven-release-manager/pom.xml +++ b/maven-release-manager/pom.xml @@ -37,6 +37,7 @@read.
* * @param mergeDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object - * @param file a {@link java.io.File} object + * @param file a {@link java.io.File} object * @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 + throws ReleaseDescriptorStoreException { Properties properties = new Properties(); @@ -101,21 +103,21 @@ public ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor, } catch ( FileNotFoundException e ) { - getLogger().debug( file.getName() + " not found - using empty properties" ); + 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 { - decryptProperties( properties ); + mavenCrypto.decryptProperties( properties ); } - catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e ) + catch ( MavenCryptoException e ) { - getLogger().debug( e.getMessage() ); + logger.debug( e.getMessage() ); } ReleaseDescriptorBuilder builder; @@ -125,9 +127,9 @@ public ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor, } else { - builder = new ReleaseDescriptorBuilder(); + builder = new ReleaseDescriptorBuilder(); } - + ReleaseUtils.copyPropertiesToReleaseDescriptor( properties, builder ); return builder; @@ -135,7 +137,7 @@ public ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor, @Override public void write( ReleaseDescriptor config ) - throws ReleaseDescriptorStoreException + throws ReleaseDescriptorStoreException { write( (BuilderReleaseDescriptor) config, getDefaultReleasePropertiesFile( config ) ); } @@ -155,11 +157,11 @@ public void delete( ReleaseDescriptor config ) * * @param config a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderReleaseDescriptor} * object - * @param file a {@link java.io.File} object + * @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 + throws ReleaseDescriptorStoreException { Properties properties = new Properties(); properties.setProperty( "completedPhase", config.getCompletedPhase() ); @@ -181,11 +183,11 @@ public void write( BuilderReleaseDescriptor config, File file ) String password = config.getScmPassword(); try { - password = encryptAndDecorate( password ); + password = mavenCrypto.encryptAndDecorate( password ); } - catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e ) + catch ( MavenCryptoException e ) { - getLogger().debug( e.getMessage() ); + logger.debug( e.getMessage() ); } properties.setProperty( "scm.password", password ); } @@ -198,13 +200,13 @@ public void write( BuilderReleaseDescriptor config, File file ) String passPhrase = config.getScmPrivateKeyPassPhrase(); try { - passPhrase = encryptAndDecorate( passPhrase ); + passPhrase = mavenCrypto.encryptAndDecorate( passPhrase ); } - catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e ) + catch ( MavenCryptoException e ) { - getLogger().debug( e.getMessage() ); + logger.debug( e.getMessage() ); } - properties.setProperty( "scm.passphrase", passPhrase ); + properties.setProperty( "scm.passphrase", passPhrase ); } if ( config.getScmTagBase() != null ) { @@ -253,7 +255,7 @@ public void write( BuilderReleaseDescriptor config, File file ) if ( !config.getActivateProfiles().isEmpty() ) { properties.setProperty( "exec.activateProfiles", - StringUtils.join( config.getActivateProfiles().iterator(), "," ) ); + StringUtils.join( config.getActivateProfiles().iterator(), "," ) ); } if ( config.getPreparationGoals() != null ) { @@ -277,7 +279,7 @@ public void write( BuilderReleaseDescriptor config, File file ) } properties.setProperty( "exec.snapshotReleasePluginAllowed", - Boolean.toString( config.isSnapshotReleasePluginAllowed() ) ); + Boolean.toString( config.isSnapshotReleasePluginAllowed() ) ); properties.setProperty( "remoteTagging", Boolean.toString( config.isRemoteTagging() ) ); @@ -298,7 +300,7 @@ public void write( BuilderReleaseDescriptor config, File file ) // others boolean properties are not written to the properties file because the value from the caller is always // used - + for ( Map.EntryConstructor for ReleaseDescriptorBuilder.
*/ @@ -443,9 +442,9 @@ public ReleaseDescriptorBuilder setScmCommentPrefix( String scmCommentPrefix ) /** *setScmReleaseCommitComment.
* - * @since 3.0.0-M1 * @param scmReleaseCommitComment a {@link java.lang.String} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object + * @since 3.0.0-M1 */ public ReleaseDescriptorBuilder setScmReleaseCommitComment( String scmReleaseCommitComment ) { @@ -456,9 +455,9 @@ public ReleaseDescriptorBuilder setScmReleaseCommitComment( String scmReleaseCom /** *setScmDevelopmentCommitComment.
* - * @since 3.0.0-M1 * @param scmDevelopmentCommitComment a {@link java.lang.String} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object + * @since 3.0.0-M1 */ public ReleaseDescriptorBuilder setScmDevelopmentCommitComment( String scmDevelopmentCommitComment ) { @@ -469,9 +468,9 @@ public ReleaseDescriptorBuilder setScmDevelopmentCommitComment( String scmDevelo /** *setScmBranchCommitComment.
* - * @since 3.0.0-M1 * @param scmBranchCommitComment a {@link java.lang.String} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object + * @since 3.0.0-M1 */ public ReleaseDescriptorBuilder setScmBranchCommitComment( String scmBranchCommitComment ) { @@ -482,9 +481,9 @@ public ReleaseDescriptorBuilder setScmBranchCommitComment( String scmBranchCommi /** *setScmRollbackCommitComment.
* - * @since 3.0.0-M1 * @param scmRollbackCommitComment a {@link java.lang.String} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object + * @since 3.0.0-M1 */ public ReleaseDescriptorBuilder setScmRollbackCommitComment( String scmRollbackCommitComment ) { @@ -759,7 +758,7 @@ public ReleaseDescriptorBuilder setWorkingDirectory( String workingDirectory ) /** *addReleaseVersion.
* - * @param key a {@link java.lang.String} object + * @param key a {@link java.lang.String} object * @param value a {@link java.lang.String} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object */ @@ -772,7 +771,7 @@ public ReleaseDescriptorBuilder addReleaseVersion( String key, String value ) /** *addDevelopmentVersion.
* - * @param key a {@link java.lang.String} object + * @param key a {@link java.lang.String} object * @param value a {@link java.lang.String} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object */ @@ -785,7 +784,7 @@ public ReleaseDescriptorBuilder addDevelopmentVersion( String key, String value /** *addOriginalScmInfo.
* - * @param key a {@link java.lang.String} object + * @param key a {@link java.lang.String} object * @param value a {@link org.apache.maven.model.Scm} object * @return a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object */ @@ -799,32 +798,32 @@ public ReleaseDescriptorBuilder addOriginalScmInfo( String key, Scm value ) *putOriginalVersion.
* * @param projectKey a {@link java.lang.String} object - * @param version 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 ); } - + /** *addDependencyOriginalVersion.
* * @param dependencyKey a {@link java.lang.String} object - * @param version a {@link java.lang.String} object + * @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 ); return this; - + } - + /** *addDependencyReleaseVersion.
* * @param dependencyKey a {@link java.lang.String} object - * @param version a {@link java.lang.String} object + * @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 ) @@ -832,12 +831,12 @@ public ReleaseDescriptorBuilder addDependencyReleaseVersion( String dependencyKe releaseDescriptor.addDependencyReleaseVersion( dependencyKey, version ); return this; } - + /** *addDependencyDevelopmentVersion.
* * @param dependencyKey a {@link java.lang.String} object - * @param version a {@link java.lang.String} object + * @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 ) 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 4327be101..86b1f5a84 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 @@ -35,7 +35,7 @@ public interface ReleaseDescriptorStore * @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any. */ ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor ) - throws ReleaseDescriptorStoreException; + throws ReleaseDescriptorStoreException; /** * Save a configuration. @@ -44,7 +44,7 @@ ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor ) * @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any. */ void write( ReleaseDescriptor config ) - throws ReleaseDescriptorStoreException; + throws ReleaseDescriptorStoreException; /** * Remove a configuration. 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 e6f3d708b..75eccb449 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 @@ -25,13 +25,13 @@ * @author Brett Porter */ public class ReleaseDescriptorStoreException - extends Exception + extends Exception { /** *Constructor for ReleaseDescriptorStoreException.
* * @param message a {@link java.lang.String} object - * @param t a {@link java.lang.Throwable} object + * @param t a {@link java.lang.Throwable} object */ public ReleaseDescriptorStoreException( String message, Throwable 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 8ede3e5ea..3847b52d0 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 @@ -59,7 +59,7 @@ public static BuilderReleaseDescriptor buildReleaseDescriptor( ReleaseDescriptor *copyPropertiesToReleaseDescriptor.
* * @param properties a {@link java.util.Properties} object - * @param builder a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object + * @param builder a {@link org.apache.maven.shared.release.config.ReleaseDescriptorBuilder} object */ public static void copyPropertiesToReleaseDescriptor( Properties properties, ReleaseDescriptorBuilder builder ) { @@ -141,8 +141,8 @@ public static void copyPropertiesToReleaseDescriptor( Properties properties, Rel } if ( properties.containsKey( "exec.activateProfiles" ) ) { - builder.setActivateProfiles( - Arrays.asList( properties.getProperty( "exec.activateProfiles" ).split( "," ) ) ); + builder.setActivateProfiles( + Arrays.asList( properties.getProperty( "exec.activateProfiles" ).split( "," ) ) ); } if ( properties.containsKey( "preparationGoals" ) ) { @@ -167,22 +167,22 @@ public static void copyPropertiesToReleaseDescriptor( Properties properties, Rel if ( properties.containsKey( "exec.snapshotReleasePluginAllowed" ) ) { String snapshotReleasePluginAllowedStr = properties.getProperty( "exec.snapshotReleasePluginAllowed" ); - builder.setSnapshotReleasePluginAllowed( Boolean.valueOf( snapshotReleasePluginAllowedStr ) ); + builder.setSnapshotReleasePluginAllowed( Boolean.parseBoolean( snapshotReleasePluginAllowedStr ) ); } if ( properties.containsKey( "remoteTagging" ) ) { String remoteTaggingStr = properties.getProperty( "remoteTagging" ); - builder.setRemoteTagging( Boolean.valueOf( remoteTaggingStr ) ); + builder.setRemoteTagging( Boolean.parseBoolean( remoteTaggingStr ) ); } if ( properties.containsKey( "pinExternals" ) ) { String pinExternals = properties.getProperty( "pinExternals" ); - builder.setPinExternals( Boolean.valueOf( pinExternals ) ); + builder.setPinExternals( Boolean.parseBoolean( pinExternals ) ); } if ( properties.containsKey( "pushChanges" ) ) { String pushChanges = properties.getProperty( "pushChanges" ); - builder.setPushChanges( Boolean.valueOf( pushChanges ) ); + builder.setPushChanges( Boolean.parseBoolean( pushChanges ) ); } if ( properties.containsKey( "workItem" ) ) { @@ -198,28 +198,28 @@ public static void copyPropertiesToReleaseDescriptor( Properties properties, Rel // boolean properties are not written to the properties file because the value from the caller is always used - for ( Iterator i = properties.keySet().iterator(); i.hasNext(); ) + for ( Object o : properties.keySet() ) { - String property = (String) i.next(); + String property = (String) o; if ( property.startsWith( "project.rel." ) ) { builder.addReleaseVersion( property.substring( "project.rel.".length() ), - properties.getProperty( property ) ); + properties.getProperty( property ) ); } else if ( property.startsWith( "project.dev." ) ) { builder.addDevelopmentVersion( property.substring( "project.dev.".length() ), - properties.getProperty( property ) ); + properties.getProperty( property ) ); } else if ( property.startsWith( "dependency.rel." ) ) { builder.addDependencyReleaseVersion( property.substring( "dependency.rel.".length() ), - properties.getProperty( property ) ); + properties.getProperty( property ) ); } else if ( property.startsWith( "dependency.dev." ) ) { builder.addDependencyDevelopmentVersion( property.substring( "dependency.dev.".length() ), - properties.getProperty( property ) ); + properties.getProperty( property ) ); } else if ( property.startsWith( "project.scm." ) ) { @@ -239,7 +239,7 @@ else if ( property.startsWith( "project.scm." ) ) IdentifiedScm scm = new IdentifiedScm(); scm.setConnection( properties.getProperty( "project.scm." + key + ".connection" ) ); scm.setDeveloperConnection( - properties.getProperty( "project.scm." + key + ".developerConnection" ) ); + 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" ) ); @@ -271,12 +271,12 @@ private static void loadResolvedDependencies( Properties prop, ReleaseDescriptor int endIndex; String versionType; - if ( propertyName.indexOf( ".development" ) != -1 ) + if ( propertyName.contains( ".development" ) ) { endIndex = propertyName.lastIndexOf( ".development" ); versionType = DEVELOPMENT_KEY; } - else if ( propertyName.indexOf( ".release" ) != -1 ) + else if ( propertyName.contains( ".release" ) ) { endIndex = propertyName.lastIndexOf( ".release" ); versionType = RELEASE_KEY; 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 1562c2e09..e26684450 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 @@ -26,12 +26,10 @@ /** *DefaultReleaseEnvironment class.
- * */ public class DefaultReleaseEnvironment - implements ReleaseEnvironment + implements ReleaseEnvironment { - private File mavenHome; private File javaHome; 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 0041351f2..f63d2bf68 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 @@ -21,6 +21,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.apache.maven.settings.Proxy; @@ -30,54 +31,34 @@ import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer; import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.env.ReleaseEnvironment; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.LogEnabled; -import org.codehaus.plexus.logging.Logger; +import org.apache.maven.shared.release.util.MavenCrypto; +import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException; import org.codehaus.plexus.util.StringUtils; -import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; -import org.sonatype.plexus.components.cipher.PlexusCipher; -import org.sonatype.plexus.components.cipher.PlexusCipherException; -import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; -import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; -import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException; -import org.sonatype.plexus.components.sec.dispatcher.SecUtil; -import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static java.util.Objects.requireNonNull; /** *Abstract AbstractMavenExecutor class.
- * */ public abstract class AbstractMavenExecutor - implements MavenExecutor, LogEnabled + implements MavenExecutor { + private final Logger logger = LoggerFactory.getLogger( getClass() ); - private Logger logger; - - /** - * When this plugin requires Maven 3.0 as minimum, this component can be removed and o.a.m.s.c.SettingsDecrypter be - * used instead. - */ - @Requirement( role = SecDispatcher.class, hint = "mng-4384" ) - private DefaultSecDispatcher secDispatcher; - - /** - * - */ - @Requirement - private PlexusCipher cipher; + private final MavenCrypto mavenCrypto; - /** - *Constructor for AbstractMavenExecutor.
- */ - protected AbstractMavenExecutor() + 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 + throws MavenExecutorException { ListGetter for the field logger.
encryptSettings.
* @@ -129,26 +100,26 @@ protected Settings encryptSettings( Settings settings ) for ( Server server : encryptedSettings.getServers() ) { String password = server.getPassword(); - if ( password != null && !isEncryptedString( password ) ) + if ( password != null && !mavenCrypto.isEncryptedString( password ) ) { try { - server.setPassword( encryptAndDecorate( password ) ); + server.setPassword( mavenCrypto.encryptAndDecorate( password ) ); } - catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e ) + catch ( MavenCryptoException e ) { // ignore } } String passphrase = server.getPassphrase(); - if ( passphrase != null && !isEncryptedString( passphrase ) ) + if ( passphrase != null && !mavenCrypto.isEncryptedString( passphrase ) ) { try { - server.setPassphrase( encryptAndDecorate( passphrase ) ); + server.setPassphrase( mavenCrypto.encryptAndDecorate( passphrase ) ); } - catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e ) + catch ( MavenCryptoException e ) { // ignore } @@ -158,13 +129,13 @@ protected Settings encryptSettings( Settings settings ) for ( Proxy proxy : encryptedSettings.getProxies() ) { String password = proxy.getPassword(); - if ( password != null && !isEncryptedString( password ) ) + if ( password != null && !mavenCrypto.isEncryptedString( password ) ) { try { - proxy.setPassword( encryptAndDecorate( password ) ); + proxy.setPassword( mavenCrypto.encryptAndDecorate( password ) ); } - catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e ) + catch ( MavenCryptoException e ) { // ignore } @@ -174,42 +145,6 @@ protected Settings encryptSettings( Settings settings ) return encryptedSettings; } - // From org.apache.maven.cli.MavenCli.encryption(CliRequest) - private String encryptAndDecorate( String passwd ) - throws IllegalStateException, SecDispatcherException, PlexusCipherException - { - String configurationFile = secDispatcher.getConfigurationFile(); - - if ( configurationFile.startsWith( "~" ) ) - { - configurationFile = System.getProperty( "user.home" ) + configurationFile.substring( 1 ); - } - - String file = System.getProperty( DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION, configurationFile ); - - String master = null; - - SettingsSecurity sec = SecUtil.read( file, true ); - if ( sec != null ) - { - master = sec.getMaster(); - } - - if ( master == null ) - { - throw new IllegalStateException( "Master password is not set in the setting security file: " + file ); - } - - DefaultPlexusCipher cipher = new DefaultPlexusCipher(); - String masterPasswd = cipher.decryptDecorated( master, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION ); - return cipher.encryptAndDecorate( passwd, masterPasswd ); - } - - private boolean isEncryptedString( String str ) - { - return cipher.isEncryptedString( str ); - } - /** *getSettingsWriter.
* 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 c90d69c11..50e7a12ed 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 @@ -34,8 +34,8 @@ public interface CommandLineFactory * @param executable the executable * @return the command line * @throws org.apache.maven.shared.release.exec.MavenExecutorException if there was a problem creating - * the command line + * the command line */ Commandline createCommandLine( String executable ) - throws MavenExecutorException; + 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 e89b42bdc..cdf8a1914 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 @@ -19,7 +19,9 @@ * under the License. */ -import org.codehaus.plexus.component.annotations.Component; +import javax.inject.Named; +import javax.inject.Singleton; + import org.codehaus.plexus.util.cli.Commandline; /** @@ -27,13 +29,14 @@ * * @author Brett Porter */ -@Component( role = CommandLineFactory.class ) +@Singleton +@Named public class DefaultCommandLineFactory - implements CommandLineFactory + implements CommandLineFactory { @Override public Commandline createCommandLine( String executable ) - throws MavenExecutorException + throws MavenExecutorException { Commandline commandline = new Commandline(); commandline.setExecutable( executable ); 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 2c8907d0a..240c62a1b 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 @@ -19,6 +19,10 @@ * under the License. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -29,26 +33,35 @@ import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer; import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.env.ReleaseEnvironment; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; +import org.apache.maven.shared.release.util.MavenCrypto; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.Commandline; +import static java.util.Objects.requireNonNull; + /** - * Fork Maven to executed a series of goals. + * Fork Maven to execute a series of goals. * * @author Brett Porter */ -@Component( role = MavenExecutor.class, hint = "forked-path" ) +@Singleton +@Named( "forked-path" ) public class ForkedMavenExecutor - extends AbstractMavenExecutor + extends AbstractMavenExecutor { /** * Command line factory. */ - @Requirement - private CommandLineFactory commandLineFactory; + private final CommandLineFactory commandLineFactory; + + @Inject + public ForkedMavenExecutor( MavenCrypto mavenCrypto, + CommandLineFactory commandLineFactory ) + { + super( mavenCrypto ); + this.commandLineFactory = requireNonNull( commandLineFactory ); + } /* * @noinspection UseOfSystemOutOrSystemErr @@ -57,9 +70,9 @@ public class ForkedMavenExecutor public void executeGoals( File workingDirectory, ListSetter for the field commandLineFactory.
executeCommandLine.
* - * @param cl a {@link org.codehaus.plexus.util.cli.Commandline} object - * @param systemIn a {@link java.io.InputStream} object + * @param cl a {@link org.codehaus.plexus.util.cli.Commandline} object + * @param systemIn a {@link java.io.InputStream} object * @param systemOut a {@link java.io.OutputStream} object * @param systemErr a {@link java.io.OutputStream} object * @return a int @@ -185,7 +187,7 @@ public void setCommandLineFactory( CommandLineFactory commandLineFactory ) */ public static int executeCommandLine( Commandline cl, InputStream systemIn, OutputStream systemOut, OutputStream systemErr ) - throws CommandLineException + throws CommandLineException { if ( cl == null ) { 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 2a6e061bc..bed98cbd5 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 @@ -19,6 +19,10 @@ * under the License. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -27,9 +31,9 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; -import org.apache.commons.cli.PosixParser; import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer; import org.apache.maven.shared.invoker.DefaultInvocationRequest; import org.apache.maven.shared.invoker.DefaultInvoker; @@ -41,44 +45,44 @@ import org.apache.maven.shared.invoker.MavenInvocationException; import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.env.ReleaseEnvironment; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.logging.Logger; +import org.apache.maven.shared.release.util.MavenCrypto; import org.codehaus.plexus.util.cli.CommandLineUtils; +import org.slf4j.Logger; /** * Fork Maven using the maven-invoker shared library. */ -@Component( role = MavenExecutor.class, hint = "invoker" ) -@SuppressWarnings( "static-access" ) +@Singleton +@Named( "invoker" ) public class InvokerMavenExecutor - extends AbstractMavenExecutor + extends AbstractMavenExecutor { private static final Options OPTIONS = new Options(); - private static final char SET_SYSTEM_PROPERTY = 'D'; + private static final String SET_SYSTEM_PROPERTY = "D"; - private static final char OFFLINE = 'o'; + private static final String OFFLINE = "o"; - private static final char REACTOR = 'r'; + private static final String REACTOR = "r"; - private static final char QUIET = 'q'; + private static final String QUIET = "q"; - private static final char DEBUG = 'X'; + private static final String DEBUG = "X"; - private static final char ERRORS = 'e'; + private static final String ERRORS = "e"; - private static final char NON_RECURSIVE = 'N'; + private static final String NON_RECURSIVE = "N"; - private static final char UPDATE_SNAPSHOTS = 'U'; + private static final String UPDATE_SNAPSHOTS = "U"; - private static final char ACTIVATE_PROFILES = 'P'; + private static final String ACTIVATE_PROFILES = "P"; - private static final char CHECKSUM_FAILURE_POLICY = 'C'; + private static final String CHECKSUM_FAILURE_POLICY = "C"; - private static final char CHECKSUM_WARNING_POLICY = 'c'; + private static final String CHECKSUM_WARNING_POLICY = "c"; - private static final char ALTERNATE_USER_SETTINGS = 's'; + private static final String ALTERNATE_USER_SETTINGS = "s"; private static final String ALTERNATE_GLOBAL_SETTINGS = "gs"; @@ -87,108 +91,178 @@ public class InvokerMavenExecutor private static final String FAIL_AT_END = "fae"; private static final String FAIL_NEVER = "fn"; - + private static final String ALTERNATE_POM_FILE = "f"; - + private static final String THREADS = "T"; private static final String BATCH_MODE = "B"; - - /** ConstantALTERNATE_USER_TOOLCHAINS='t' */
- public static final char ALTERNATE_USER_TOOLCHAINS = 't';
-
+
+ public static final String ALTERNATE_USER_TOOLCHAINS = "t";
+
static
{
OPTIONS.addOption(
- OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create(
- SET_SYSTEM_PROPERTY ) );
+ Option.builder( SET_SYSTEM_PROPERTY )
+ .longOpt( "define" )
+ .numberOfArgs( 2 )
+ .valueSeparator( '=' )
+ .desc( "Define a system property" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( OFFLINE )
+ .longOpt( "offline" )
+ .desc( "Work offline" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( QUIET )
+ .longOpt( "quiet" )
+ .desc( "Quiet output - only show errors" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( DEBUG )
+ .longOpt( "debug" )
+ .desc( "Produce execution debug output" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( ERRORS )
+ .longOpt( "errors" )
+ .desc( "Produce execution error messages" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( REACTOR )
+ .longOpt( "reactor" )
+ .desc( "Execute goals for project found in the reactor" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( NON_RECURSIVE )
+ .longOpt( "non-recursive" )
+ .desc( "Do not recurse into sub-projects" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( UPDATE_SNAPSHOTS )
+ .longOpt( "update-snapshots" )
+ .desc( "Forces a check for updated releases and snapshots on remote repositories" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( ACTIVATE_PROFILES )
+ .longOpt( "activate-profiles" )
+ .desc( "Comma-delimited list of profiles to activate" )
+ .hasArg()
+ .build() );
- OPTIONS.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) );
+ OPTIONS.addOption(
+ Option.builder( CHECKSUM_FAILURE_POLICY )
+ .longOpt( "strict-checksums" )
+ .desc( "Fail the build if checksums don't match" )
+ .build() );
OPTIONS.addOption(
- OptionBuilder.withLongOpt( "quiet" ).withDescription( "Quiet output - only show errors" ).create( QUIET ) );
+ Option.builder( CHECKSUM_WARNING_POLICY )
+ .longOpt( "lax-checksums" )
+ .desc( "Warn if checksums don't match" )
+ .build() );
OPTIONS.addOption(
- OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce execution debug output" ).create( DEBUG ) );
+ Option.builder( ALTERNATE_USER_SETTINGS )
+ .longOpt( "settings" )
+ .desc( "Alternate path for the user settings file" )
+ .hasArg()
+ .build() );
OPTIONS.addOption(
- OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce execution error messages" ).create(
- ERRORS ) );
+ Option.builder( ALTERNATE_GLOBAL_SETTINGS )
+ .longOpt( "global-settings" )
+ .desc( "Alternate path for the global settings file" )
+ .hasArg()
+ .build() );
- OPTIONS.addOption( OptionBuilder.withLongOpt( "reactor" ).withDescription(
- "Execute goals for project found in the reactor" ).create( REACTOR ) );
+ OPTIONS.addOption(
+ Option.builder( FAIL_FAST )
+ .longOpt( "fail-fast" )
+ .desc( "Stop at first failure in reactorized builds" )
+ .build() );
OPTIONS.addOption(
- OptionBuilder.withLongOpt( "non-recursive" ).withDescription( "Do not recurse into sub-projects" ).create(
- NON_RECURSIVE ) );
+ Option.builder( FAIL_AT_END )
+ .longOpt( "fail-at-end" )
+ .desc( "Only fail the build afterwards; allow all non-impacted builds to continue" )
+ .build() );
- OPTIONS.addOption( OptionBuilder.withLongOpt( "update-snapshots" ).withDescription(
- "Forces a check for updated releases and snapshots on remote repositories" ).create( UPDATE_SNAPSHOTS ) );
+ OPTIONS.addOption(
+ Option.builder( FAIL_NEVER )
+ .longOpt( "fail-never" )
+ .desc( "NEVER fail the build, regardless of project result" )
+ .build() );
- OPTIONS.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription(
- "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) );
+ OPTIONS.addOption(
+ Option.builder( ALTERNATE_POM_FILE )
+ .longOpt( "file" )
+ .desc( "Force the use of an alternate POM file." )
+ .hasArg()
+ .build() );
- OPTIONS.addOption( OptionBuilder.withLongOpt( "strict-checksums" ).withDescription(
- "Fail the build if checksums don't match" ).create( CHECKSUM_FAILURE_POLICY ) );
+ OPTIONS.addOption(
+ Option.builder( THREADS )
+ .longOpt( "threads" )
+ .desc( "Thread count, for instance 2.0C where C is core multiplied" )
+ .hasArg()
+ .build() );
OPTIONS.addOption(
- OptionBuilder.withLongOpt( "lax-checksums" ).withDescription( "Warn if checksums don't match" ).create(
- CHECKSUM_WARNING_POLICY ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "settings" ).withDescription(
- "Alternate path for the user settings file" ).hasArg().create( ALTERNATE_USER_SETTINGS ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "global-settings" ).withDescription(
- " Alternate path for the global settings file" ).hasArg().create( ALTERNATE_GLOBAL_SETTINGS ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "fail-fast" ).withDescription(
- "Stop at first failure in reactorized builds" ).create( FAIL_FAST ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "fail-at-end" ).withDescription(
- "Only fail the build afterwards; allow all non-impacted builds to continue" ).create( FAIL_AT_END ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "fail-never" ).withDescription(
- "NEVER fail the build, regardless of project result" ).create( FAIL_NEVER ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "file" ).withDescription(
- "Force the use of an alternate POM file." ).hasArg().create( ALTERNATE_POM_FILE ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "threads" ).withDescription(
- "Thread count, for instance 2.0C where C is core multiplied" ).hasArg().create( THREADS ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription(
- "Run in non-interactive (batch) mode" ).create( BATCH_MODE ) );
-
- OPTIONS.addOption( OptionBuilder.withLongOpt( "toolchains" ).withDescription(
- "Alternate path for the user toolchains file" ).hasArg().create( ALTERNATE_USER_TOOLCHAINS ) );
+ Option.builder( BATCH_MODE )
+ .longOpt( "batch-mode" )
+ .desc( "Run in non-interactive (batch) mode" )
+ .build() );
+
+ OPTIONS.addOption(
+ Option.builder( ALTERNATE_USER_TOOLCHAINS )
+ .longOpt( "toolchains" )
+ .desc( "Alternate path for the user toolchains file" )
+ .hasArg()
+ .build() );
+ }
+
+ @Inject
+ public InvokerMavenExecutor( MavenCrypto mavenCrypto )
+ {
+ super( mavenCrypto );
}
// TODO: Configuring an invocation request from a command line could as well be part of the Invoker API
+
/**
* setupRequest.
* - * @param req a {@link org.apache.maven.shared.invoker.InvocationRequest} object - * @param bridge a {@link org.apache.maven.shared.invoker.InvokerLogger} object + * @param req a {@link org.apache.maven.shared.invoker.InvocationRequest} object + * @param bridge a {@link org.apache.maven.shared.invoker.InvokerLogger} object * @param additionalArguments a {@link java.lang.String} object * @throws org.apache.maven.shared.release.exec.MavenExecutorException if any. */ protected void setupRequest( InvocationRequest req, InvokerLogger bridge, - String additionalArguments ) - throws MavenExecutorException + String additionalArguments ) + throws MavenExecutorException { try { String[] args = CommandLineUtils.translateCommandline( additionalArguments ); - CommandLine cli = new PosixParser().parse( OPTIONS, args ); + CommandLine cli = new DefaultParser().parse( OPTIONS, args ); if ( cli.hasOption( SET_SYSTEM_PROPERTY ) ) { String[] properties = cli.getOptionValues( SET_SYSTEM_PROPERTY ); Properties props = new Properties(); - for ( int i = 0; i < properties.length; i++ ) + for ( String property : properties ) { - String property = properties[i]; String name, value; int sep = property.indexOf( "=" ); if ( sep <= 0 ) @@ -242,7 +316,7 @@ else if ( cli.hasOption( NON_RECURSIVE ) ) if ( cli.hasOption( ACTIVATE_PROFILES ) ) { String[] profiles = cli.getOptionValues( ACTIVATE_PROFILES ); - + if ( profiles != null ) { req.setProfiles( Arrays.asList( profiles ) ); @@ -262,7 +336,7 @@ else if ( cli.hasOption( CHECKSUM_WARNING_POLICY ) ) { req.setUserSettingsFile( new File( cli.getOptionValue( ALTERNATE_USER_SETTINGS ) ) ); } - + if ( cli.hasOption( ALTERNATE_GLOBAL_SETTINGS ) ) { req.setGlobalSettingsFile( new File( cli.getOptionValue( ALTERNATE_GLOBAL_SETTINGS ) ) ); @@ -291,22 +365,22 @@ else if ( cli.hasOption( FAIL_FAST ) ) req.setPomFileName( cli.getOptionValue( ALTERNATE_POM_FILE ) ); } } - + if ( cli.hasOption( THREADS ) ) { req.setThreads( cli.getOptionValue( THREADS ) ); } - + if ( cli.hasOption( BATCH_MODE ) ) { req.setBatchMode( true ); } - + if ( cli.hasOption( ALTERNATE_USER_TOOLCHAINS ) ) { req.setToolchainsFile( new File( cli.getOptionValue( ALTERNATE_USER_TOOLCHAINS ) ) ); } - + } catch ( Exception e ) { @@ -318,12 +392,12 @@ else if ( cli.hasOption( FAIL_FAST ) ) public void executeGoals( File workingDirectory, ListConstructor for MavenExecutorException.
* - * @param message a {@link java.lang.String} object + * @param message a {@link java.lang.String} object * @param exitCode a int */ public MavenExecutorException( String message, int exitCode ) @@ -46,7 +46,7 @@ public MavenExecutorException( String message, int exitCode ) *Constructor for MavenExecutorException.
* * @param message a {@link java.lang.String} object - * @param cause a {@link java.lang.Throwable} object + * @param cause a {@link java.lang.Throwable} object */ public MavenExecutorException( String message, Throwable cause ) { 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 de38e44b7..34da69704 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 @@ -25,29 +25,28 @@ /** *RawStreamPumper class.
- * */ public class RawStreamPumper - extends Thread + extends Thread { - private InputStream in; + private final InputStream in; - private OutputStream out; + private final OutputStream out; boolean done; boolean poll; - byte buffer[] = new byte[256]; + byte[] buffer = new byte[256]; /** *Constructor for RawStreamPumper.
* - * @param in a {@link java.io.InputStream} object - * @param out a {@link java.io.OutputStream} object + * @param in a {@link java.io.InputStream} object + * @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; @@ -57,10 +56,10 @@ public RawStreamPumper( InputStream in , OutputStream out, boolean poll ) /** *Constructor for RawStreamPumper.
* - * @param in a {@link java.io.InputStream} object + * @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; @@ -81,7 +80,7 @@ public void setDone() * @throws java.io.IOException if any. */ public void closeInput() - throws IOException + throws IOException { in.close(); } @@ -92,7 +91,7 @@ public void closeInput() * @throws java.io.IOException if any. */ public void closeOutput() - throws IOException + throws IOException { out.close(); } @@ -145,7 +144,7 @@ public void run() } catch ( Throwable e ) { - // Catched everything + // Caught everything } finally { 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 c10788e0b..c30d588ac 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 @@ -19,28 +19,28 @@ * under the License. */ -import org.codehaus.plexus.util.cli.StreamConsumer; - import java.io.PrintStream; +import org.codehaus.plexus.util.cli.StreamConsumer; + /** * Consumer that both funnels to System.out/err, and stores in an internal buffer. * * @author Brett Porter */ public class TeeConsumer - implements StreamConsumer + implements StreamConsumer { - private PrintStream stream; + private final PrintStream stream; /** * @noinspection StringBufferField */ - private StringBuffer content = new StringBuffer(); + private final StringBuffer content = new StringBuffer(); private static final String LS = System.getProperty( "line.separator" ); - private String indent; + private final String indent; /** *Constructor for TeeConsumer.
@@ -61,7 +61,6 @@ public TeeConsumer( PrintStream stream ) public TeeConsumer( PrintStream stream, String indent ) { this.stream = stream; - this.indent = indent; } 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 bfa6143d4..363e76ad7 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 @@ -26,13 +26,12 @@ /** *TeeOutputStream class.
- * */ public class TeeOutputStream - extends FilterOutputStream + extends FilterOutputStream { - private ByteArrayOutputStream bout = new ByteArrayOutputStream( 1024 * 8 ); - private byte indent[]; + private final ByteArrayOutputStream bout = new ByteArrayOutputStream( 1024 * 8 ); + private final byte[] indent; private int last = '\n'; /** @@ -49,7 +48,7 @@ public TeeOutputStream( OutputStream out ) *Constructor for TeeOutputStream.
* * @param out a {@link java.io.OutputStream} object - * @param i a {@link java.lang.String} object + * @param i a {@link java.lang.String} object */ public TeeOutputStream( OutputStream out, String i ) { @@ -59,7 +58,7 @@ public TeeOutputStream( OutputStream out, String i ) @Override public void write( byte[] b, int off, int len ) - throws IOException + throws IOException { for ( int x = 0; x < len; x++ ) { @@ -81,7 +80,7 @@ public void write( byte[] b, int off, int len ) @Override public void write( int b ) - throws IOException + throws IOException { if ( last == '\n' || ( last == '\r' && b != '\n' ) ) { 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 81963de50..25770ecbe 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 @@ -19,18 +19,18 @@ * under the License. */ +import java.io.File; + import org.apache.maven.project.MavenProject; import org.apache.maven.shared.release.util.ReleaseUtil; -import java.io.File; - /** *Abstract AbstractBackupPomsPhase class.
* * @author Edwin Punzalan */ public abstract class AbstractBackupPomsPhase - extends AbstractReleasePhase + extends AbstractReleasePhase { private final String backupSuffix = ".releaseBackup"; diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java similarity index 78% rename from maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java rename to maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java index 128721fd8..37c5e4c6c 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java @@ -19,6 +19,8 @@ * under the License. */ +import java.util.List; + import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.scm.manager.NoSuchScmProviderException; @@ -32,33 +34,41 @@ import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator; import org.codehaus.plexus.util.StringUtils; -import java.util.List; +import static java.util.Objects.requireNonNull; /** * Phase that checks the validity of the POM before release. * * @author Brett Porter */ -public class CheckPomPhase - extends AbstractReleasePhase +public abstract class AbstractCheckPomPhase + extends AbstractReleasePhase { + private final ScmRepositoryConfigurator scmRepositoryConfigurator; + /** * @since 2.4 */ - private boolean scmRequired = true; + private final boolean scmRequired; /** * @since 2.5.2 */ - private boolean snapshotsRequired = true; + private final boolean snapshotsRequired; - private ScmRepositoryConfigurator 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, ListgetScmProvider.
+ * + * @param releaseDescriptor a {@link ReleaseDescriptor} object + * @param releaseEnvironment a {@link ReleaseEnvironment} object + * @return a {@link ScmProvider} object + * @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() ); + + 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 ); + } + } + + @Override + public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, + List* The map-phases per goal are: *
Getter for the field scmTranslators.
Setter for the field startTime.
getResolvedSnapshotVersion.
* * @param artifactVersionlessKey a {@link java.lang.String} object - * @param releaseDscriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object + * @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, @@ -616,8 +626,8 @@ protected abstract String getResolvedSnapshotVersion( String artifactVersionless *getOriginalVersion.
* * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param projectKey a {@link java.lang.String} object - * @param simulate a boolean + * @param projectKey a {@link java.lang.String} object + * @param simulate a boolean * @return a {@link java.lang.String} object */ protected abstract String getOriginalVersion( ReleaseDescriptor releaseDescriptor, String projectKey, @@ -627,7 +637,7 @@ protected abstract String getOriginalVersion( ReleaseDescriptor releaseDescripto *getNextVersion.
* * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param key a {@link java.lang.String} object + * @param key a {@link java.lang.String} object * @return a {@link java.lang.String} object */ protected abstract String getNextVersion( ReleaseDescriptor releaseDescriptor, String key ); @@ -635,18 +645,18 @@ protected abstract String getOriginalVersion( ReleaseDescriptor releaseDescripto /** *transformScm.
* - * @param project a {@link org.apache.maven.project.MavenProject} object - * @param modelTarget a {@link org.apache.maven.model.Model} object + * @param project a {@link org.apache.maven.project.MavenProject} object + * @param modelTarget a {@link org.apache.maven.model.Model} object * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param projectId a {@link java.lang.String} object - * @param scmRepository a {@link org.apache.maven.scm.repository.ScmRepository} object - * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object + * @param projectId a {@link java.lang.String} object + * @param scmRepository a {@link org.apache.maven.scm.repository.ScmRepository} object + * @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 ) - throws ReleaseExecutionException; + throws ReleaseExecutionException; /** *isUpdateScm.
@@ -663,7 +673,7 @@ protected boolean isUpdateScm() *getOriginalResolvedSnapshotVersion.
* * @param artifactVersionlessKey a {@link java.lang.String} object - * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object + * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object * @return a {@link java.lang.String} object */ protected String getOriginalResolvedSnapshotVersion( String artifactVersionlessKey, 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 23d4cce71..12ba401d8 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 @@ -28,26 +28,31 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment; import org.apache.maven.shared.release.exec.MavenExecutor; import org.apache.maven.shared.release.exec.MavenExecutorException; -import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.StringUtils; +import static java.util.Objects.requireNonNull; + /** * Run the integration tests for the project to verify that it builds before committing. * * @author Brett Porter */ public abstract class AbstractRunGoalsPhase - extends AbstractReleasePhase + extends AbstractReleasePhase { /** * Component to assist in executing Maven. */ - @Requirement( role = MavenExecutor.class ) - private MaprunLogic.
* - * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object + * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object * @param releaseEnvironment a {@link org.apache.maven.shared.release.env.ReleaseEnvironment} object - * @param reactorProjects a {@link java.util.List} object - * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object - * @param simulating a boolean - * @throws org.apache.maven.shared.release.scm.ReleaseScmCommandException if any. - * @throws org.apache.maven.shared.release.ReleaseExecutionException if any. + * @param reactorProjects a {@link java.util.List} object + * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object + * @param simulating a boolean + * @throws org.apache.maven.shared.release.scm.ReleaseScmCommandException if any. + * @throws org.apache.maven.shared.release.ReleaseExecutionException if any. * @throws org.apache.maven.shared.release.scm.ReleaseScmRepositoryException if any. */ protected abstract void runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, ListperformCheckins.
* - * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object + * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object * @param releaseEnvironment a {@link org.apache.maven.shared.release.env.ReleaseEnvironment} object - * @param reactorProjects a {@link java.util.List} object - * @param message a {@link java.lang.String} object + * @param reactorProjects a {@link java.util.List} object + * @param message a {@link java.lang.String} object * @throws org.apache.maven.shared.release.scm.ReleaseScmRepositoryException if any. - * @throws org.apache.maven.shared.release.ReleaseExecutionException if any. - * @throws org.apache.maven.shared.release.scm.ReleaseScmCommandException if any. + * @throws org.apache.maven.shared.release.ReleaseExecutionException if any. + * @throws org.apache.maven.shared.release.scm.ReleaseScmCommandException if any. */ protected void performCheckins( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, ListsimulateCheckins.
* * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param reactorProjects a {@link java.util.List} object - * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object - * @param message a {@link java.lang.String} object + * @param reactorProjects a {@link java.util.List} object + * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object + * @param message a {@link java.lang.String} object */ protected void simulateCheckins( ReleaseDescriptor releaseDescriptor, ListcreatePomFiles.
* * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param project a {@link org.apache.maven.project.MavenProject} object + * @param project a {@link org.apache.maven.project.MavenProject} object * @return a {@link java.util.List} object */ protected static ListcreatePomFiles.
* * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param reactorProjects a {@link java.util.List} object + * @param reactorProjects a {@link java.util.List} object * @return a {@link java.util.List} object */ protected static ListgetScmProvider.
- * - * @param releaseDescriptor a {@link org.apache.maven.shared.release.config.ReleaseDescriptor} object - * @param releaseEnvironment a {@link org.apache.maven.shared.release.env.ReleaseEnvironment} object - * @return a {@link org.apache.maven.scm.provider.ScmProvider} object - * @throws org.apache.maven.shared.release.scm.ReleaseScmRepositoryException if any. - * @throws org.apache.maven.shared.release.ReleaseExecutionException if any. - */ - 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 ) - { - 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 ); - } - } - - @Override - public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, - List+ * The map-phases per goal are: + *
| MapVersionsPhase field | map-release-versions | map-branch-versions | + *map-development-versions | + *
|---|---|---|---|
| convertToSnapshot | false | true | true | + *
| convertToBranch | false | true | false | + *
+ * The map-phases per goal are: + *
| MapVersionsPhase field | map-release-versions | map-branch-versions | + *map-development-versions | + *
|---|---|---|---|
| convertToSnapshot | false | true | true | + *
| convertToBranch | false | true | false | + *
+ * The map-phases per goal are: + *
| MapVersionsPhase field | map-release-versions | map-branch-versions | + *map-development-versions | + *
|---|---|---|---|
| convertToSnapshot | false | true | true | + *
| convertToBranch | false | true | false | + *
DefaultNamingPolicy class.
@@ -31,12 +33,13 @@ * @author Robert Scholte * @since 3.0.0-M5 */ -@Component( role = NamingPolicy.class, hint = "default" ) +@Singleton +@Named public class DefaultNamingPolicy implements NamingPolicy { @Override public NamingPolicyResult getName( NamingPolicyRequest request ) - throws PolicyException + throws PolicyException { return new NamingPolicyResult().setName( request.getArtifactId() + "-" + request.getVersion() ); } diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java index f4c8cf012..cf29d3868 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java @@ -19,27 +19,28 @@ * under the License. */ -import org.apache.maven.shared.release.policy.PolicyException; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.maven.shared.release.policy.version.VersionPolicy; import org.apache.maven.shared.release.policy.version.VersionPolicyRequest; import org.apache.maven.shared.release.policy.version.VersionPolicyResult; import org.apache.maven.shared.release.versions.DefaultVersionInfo; import org.apache.maven.shared.release.versions.VersionParseException; -import org.codehaus.plexus.component.annotations.Component; /** *DefaultVersionPolicy class.
* * @author Robert Scholte */ -@Component( role = VersionPolicy.class, hint = "default" ) +@Singleton +@Named public class DefaultVersionPolicy - implements VersionPolicy + implements VersionPolicy { - @Override public VersionPolicyResult getReleaseVersion( VersionPolicyRequest request ) - throws PolicyException, VersionParseException + throws VersionParseException { String releaseVersion = new DefaultVersionInfo( request.getVersion() ).getReleaseVersionString(); return new VersionPolicyResult().setVersion( releaseVersion ); @@ -47,10 +48,10 @@ public VersionPolicyResult getReleaseVersion( VersionPolicyRequest request ) @Override public VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request ) - throws PolicyException, VersionParseException + throws VersionParseException { String developmentVersion = - new DefaultVersionInfo( request.getVersion() ).getNextVersion().getSnapshotVersionString(); + new DefaultVersionInfo( request.getVersion() ).getNextVersion().getSnapshotVersionString(); return new VersionPolicyResult().setVersion( developmentVersion ); } diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java index e67b08f19..642c5c7b5 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java @@ -19,16 +19,18 @@ * under the License. */ -import org.codehaus.plexus.component.annotations.Component; +import javax.inject.Named; +import javax.inject.Singleton; /** * ClearCase tag translator. * * @author Arne Degenring */ -@Component( role = ScmTranslator.class, hint = "clearcase" ) +@Singleton +@Named( "clearcase" ) public class ClearCaseScmTranslator - implements ScmTranslator + implements ScmTranslator { @Override public String translateBranchUrl( String url, String branchName, String branchBase ) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java index 3180a3db3..e6c1aa07e 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java @@ -19,16 +19,18 @@ * under the License. */ -import org.codehaus.plexus.component.annotations.Component; +import javax.inject.Named; +import javax.inject.Singleton; /** * CVS tag translator. * * @author Brett Porter */ -@Component( role = ScmTranslator.class, hint = "cvs" ) +@Singleton +@Named( "cvs" ) public class CvsScmTranslator - implements ScmTranslator + implements ScmTranslator { @Override public String translateBranchUrl( String url, String branchName, String branchBase ) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java index 0dd2280ad..e6be92496 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java @@ -19,6 +19,12 @@ * under the License. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + +import java.util.concurrent.atomic.AtomicReference; + import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.ScmProvider; @@ -30,35 +36,44 @@ import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; import org.apache.maven.shared.release.config.ReleaseDescriptor; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.apache.maven.shared.release.util.MavenCrypto; +import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException; import org.codehaus.plexus.util.StringUtils; -import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; -import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static java.util.Objects.requireNonNull; /** * Tool that gets a configured SCM repository from release configuration. * * @author Brett Porter */ -@Component( role = ScmRepositoryConfigurator.class, instantiationStrategy = "singleton" ) +@Singleton +@Named public class DefaultScmRepositoryConfigurator - extends AbstractLogEnabled implements ScmRepositoryConfigurator { - /** - * The SCM manager. - */ - @Requirement - private ScmManager scmManager; + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + private final AtomicReferenceSetter for the field scmManager.
GitScmTranslator class.
*/ -@Component( role = ScmTranslator.class, hint = "git" ) +@Singleton +@Named( "git" ) public class GitScmTranslator - implements ScmTranslator + implements ScmTranslator { @Override diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java index 1968fb352..73a038ac0 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java @@ -19,14 +19,16 @@ * under the License. */ -import org.codehaus.plexus.component.annotations.Component; +import javax.inject.Named; +import javax.inject.Singleton; /** *HgScmTranslator class.
*/ -@Component( role = ScmTranslator.class, hint = "hg" ) +@Singleton +@Named( "hg" ) public class HgScmTranslator - implements ScmTranslator + implements ScmTranslator { @Override diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java index a770d4e54..8da9b534e 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java @@ -19,18 +19,20 @@ * under the License. */ -import java.io.File; +import javax.inject.Named; +import javax.inject.Singleton; -import org.codehaus.plexus.component.annotations.Component; +import java.io.File; /** * Jazz tag translator. * * @author Chris Graham */ -@Component( role = ScmTranslator.class, hint = "jazz" ) +@Singleton +@Named( "jazz" ) public class JazzScmTranslator - implements ScmTranslator + implements ScmTranslator { @Override public String translateBranchUrl( String url, String branchName, String branchBase ) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java index abf68e114..0f8db4b78 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java @@ -19,17 +19,20 @@ * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmTag; import org.apache.maven.scm.provider.svn.SvnTagBranchUtils; -import org.codehaus.plexus.component.annotations.Component; /** * Subversion tag translator. * * @author Brett Porter */ -@Component( role = ScmTranslator.class, hint = "svn" ) +@Singleton +@Named( "svn" ) public class SubversionScmTranslator implements ScmTranslator { diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/strategies/DefaultStrategy.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/strategies/DefaultStrategy.java index d3e892b5d..0dd3874b6 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/strategies/DefaultStrategy.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/strategies/DefaultStrategy.java @@ -19,6 +19,11 @@ * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; + +import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.apache.maven.shared.release.strategy.Strategy; @@ -29,47 +34,92 @@ * @author Robert Scholte * @since 3.0.0-M5 */ +@Singleton +@Named public class DefaultStrategy implements Strategy { /** * The phases of release to run, and in what order. */ - private ListSetter for the field preparePhases.
Setter for the field performPhases.
Setter for the field rollbackPhases.
Setter for the field branchPhases.
Setter for the field updateVersionsPhases.
JDomModelETLFactory class.
@@ -29,11 +31,11 @@ * @author Robert Scholte * @since 3.0 */ -@Component( role = ModelETLFactory.class, hint = JDomModelETLFactory.ROLE_HINT ) +@Singleton +@Named( JDomModelETLFactory.NAME ) public class JDomModelETLFactory implements ModelETLFactory { - /** ConstantROLE_HINT="jdom2-sax" */
- public static final String ROLE_HINT = "jdom2-sax";
+ public static final String NAME = "jdom2-sax";
@Override
public JDomModelETL newInstance( ModelETLRequest request )
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/MavenCrypto.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/MavenCrypto.java
new file mode 100644
index 000000000..3d82414b6
--- /dev/null
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/MavenCrypto.java
@@ -0,0 +1,171 @@
+package org.apache.maven.shared.release.util;
+
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import java.util.Properties;
+
+import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
+import org.sonatype.plexus.components.cipher.PlexusCipher;
+import org.sonatype.plexus.components.cipher.PlexusCipherException;
+import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
+import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
+import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
+
+
+/**
+ * A shared utility to access {@link DefaultSecDispatcher} service.
+ *
+ * @since TBD
+ */
+@Singleton
+@Named
+public class MavenCrypto
+{
+ /**
+ * Exception thrown when "something" of crypto operation did not succeed. All the code all over the place
+ * was catching sec dispatcher and plexus cipher exceptions just to neglect it (maybe log in DEBUG), so
+ * this is one single exception here.
+ */
+ public static class MavenCryptoException extends Exception
+ {
+ private MavenCryptoException( String message )
+ {
+ super( message );
+ }
+
+ private MavenCryptoException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+ }
+
+ private final DefaultSecDispatcher secDispatcher;
+
+ private final PlexusCipher plexusCipher;
+
+ @Inject
+ public MavenCrypto( DefaultSecDispatcher secDispatcher, PlexusCipher plexusCipher )
+ {
+ this.secDispatcher = secDispatcher;
+ this.plexusCipher = plexusCipher;
+ }
+
+ public String decrypt( String value ) throws MavenCryptoException
+ {
+ try
+ {
+ return secDispatcher.decrypt( value );
+ }
+ catch ( SecDispatcherException e )
+ {
+ throw new MavenCryptoException( "decrypt failed", e );
+ }
+ }
+
+ public void decryptProperties( Properties properties ) throws MavenCryptoException
+ {
+ String[] keys = new String[] {"scm.password", "scm.passphrase"};
+
+ for ( String key : keys )
+ {
+ String value = properties.getProperty( key );
+ if ( value != null )
+ {
+ properties.put( key, decryptDecorated( value ) );
+ }
+ }
+ }
+
+ public String encryptAndDecorate( String passwd ) throws MavenCryptoException
+ {
+ try
+ {
+ final String master = getMaster();
+
+ DefaultPlexusCipher cipher = new DefaultPlexusCipher();
+ String masterPasswd = cipher.decryptDecorated( master, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION );
+ return cipher.encryptAndDecorate( passwd, masterPasswd );
+ }
+ catch ( PlexusCipherException e )
+ {
+ throw new MavenCryptoException( "encrypt failed", e );
+ }
+ }
+
+ public boolean isEncryptedString( String str )
+ {
+ return plexusCipher.isEncryptedString( str );
+ }
+
+ private String decryptDecorated( String value ) throws MavenCryptoException
+ {
+ try
+ {
+ final String master = getMaster();
+
+ DefaultPlexusCipher cipher = new DefaultPlexusCipher();
+ String masterPasswd = cipher.decryptDecorated( master, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION );
+ return cipher.decryptDecorated( value, masterPasswd );
+ }
+ catch ( PlexusCipherException e )
+ {
+ throw new MavenCryptoException( "decrypt failed", e );
+ }
+ }
+
+ private String getMaster() throws MavenCryptoException
+ {
+ String configurationFile = secDispatcher.getConfigurationFile();
+
+ if ( configurationFile.startsWith( "~" ) )
+ {
+ configurationFile = System.getProperty( "user.home" ) + configurationFile.substring( 1 );
+ }
+
+ String file = System.getProperty( DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION, configurationFile );
+
+ String master = null;
+
+ try
+ {
+ SettingsSecurity sec = SecUtil.read( file, true );
+ if ( sec != null )
+ {
+ master = sec.getMaster();
+ }
+ }
+ catch ( SecDispatcherException e )
+ {
+ throw new MavenCryptoException( "config file read failed", e );
+ }
+
+ if ( master == null )
+ {
+ throw new MavenCryptoException( "Master password is not set in the setting security file: " + file );
+ }
+
+ return master;
+ }
+}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
index 5f93e590f..28586aea0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
@@ -25,10 +25,12 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+
+import static java.util.Objects.requireNonNull;
/**
* This utility class helps with finding a maven pom file
@@ -62,12 +64,12 @@
public class PomFinder
{
- private Logger log;
+ private final Logger log;
private PomInfo foundPomInfo;
public PomFinder( Logger log )
{
- this.log = log;
+ this.log = requireNonNull( log );
}
/**
@@ -151,19 +153,20 @@ public File findMatchingPom( File startDirectory )
if ( matchingPom == null )
{
String[] childFiles = startDirectory.list();
- for ( int i = 0; i < childFiles.length; i++ )
+ if ( childFiles != null )
{
- String childFile = childFiles[ i ];
-
- File subDir = new File( startDirectory, childFile );
- if ( subDir.isDirectory() && !subDir.isHidden() )
- {
- matchingPom = findMatchingPom( subDir );
- }
-
- if ( matchingPom != null )
+ for ( String childFile : childFiles )
{
- break;
+ File subDir = new File( startDirectory, childFile );
+ if ( subDir.isDirectory() && !subDir.isHidden() )
+ {
+ matchingPom = findMatchingPom( subDir );
+ }
+
+ if ( matchingPom != null )
+ {
+ break;
+ }
}
}
}
@@ -189,7 +192,7 @@ private PomInfo readPomInfo( File pomFile )
MavenXpp3Reader reader = new MavenXpp3Reader();
- Model model = null;
+ Model model;
try ( XmlStreamReader xmlReader = ReaderFactory.newXmlReader( pomFile ) )
{
model = reader.read( xmlReader );
diff --git a/maven-release-manager/src/main/resources/META-INF/plexus/components.xml b/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 6c997dbc6..000000000
--- a/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-