Repository: maven Updated Branches: refs/heads/master 36b8a6d56 -> 7f206ef1c
http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java index 3bba817..eeb07cf 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java @@ -19,38 +19,38 @@ package org.apache.maven.toolchain; * under the License. */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.verify; - -import java.io.InputStream; -import java.util.Collections; - import org.apache.maven.toolchain.java.DefaultJavaToolChain; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.ToolchainModel; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.IOUtil; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.io.InputStream; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.verify; + public class DefaultToolchainTest { @Mock private Logger logger; - + private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader(); - + @Before - public void setUp() throws Exception + public void setUp() + throws Exception { MockitoAnnotations.initMocks( this ); } - + private DefaultToolchain newDefaultToolchain( ToolchainModel model ) { return new DefaultToolchain( model, logger ) @@ -102,14 +102,14 @@ public class DefaultToolchainTest DefaultToolchain toolchain = newDefaultToolchain( model ); assertEquals( logger, toolchain.getLog() ); } - + @Test public void testMissingRequirementProperty() { ToolchainModel model = new ToolchainModel(); model.setType( "TYPE" ); DefaultToolchain toolchain = newDefaultToolchain( model ); - + assertFalse( toolchain.matchesRequirements( Collections.singletonMap( "name", "John Doe" ) ) ); verify( logger ).debug( "Toolchain type:TYPE{} is missing required property: name" ); } @@ -122,22 +122,19 @@ public class DefaultToolchainTest model.setType( "TYPE" ); DefaultToolchain toolchain = newDefaultToolchain( model ); toolchain.addProvideToken( "name", RequirementMatcherFactory.createExactMatcher( "Jane Doe" ) ); - + assertFalse( toolchain.matchesRequirements( Collections.singletonMap( "name", "John Doe" ) ) ); verify( logger ).debug( "Toolchain type:TYPE{name = Jane Doe} doesn't match required property: name" ); } @Test - public void testEquals() throws Exception + public void testEquals() + throws Exception { - InputStream jdksIS = null; - InputStream jdksExtraIS = null; - try + try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); + InputStream jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) ) { - jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ); - PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); @@ -149,10 +146,5 @@ public class DefaultToolchainTest assertFalse( tc2.equals( tc1 ) ); assertTrue( tc2.equals( tc2 ) ); } - finally - { - IOUtil.close( jdksIS ); - IOUtil.close( jdksExtraIS ); - } } } http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java index 9183e17..536e1a6 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java @@ -19,18 +19,17 @@ package org.apache.maven.toolchain.merge; * under the License. */ -import static org.junit.Assert.assertEquals; - -import java.io.InputStream; - import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.ToolchainModel; import org.apache.maven.toolchain.model.TrackableBase; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.junit.Test; +import java.io.InputStream; + +import static org.junit.Assert.assertEquals; + public class MavenToolchainMergerTest { private MavenToolchainMerger merger = new MavenToolchainMerger(); @@ -41,97 +40,71 @@ public class MavenToolchainMergerTest public void testMergeNulls() { merger.merge( null, null, null ); - + PersistedToolchains pt = new PersistedToolchains(); merger.merge( pt, null, null ); merger.merge( null, pt, null ); } - + @Test - public void testMergeJdk() throws Exception + public void testMergeJdk() + throws Exception { - InputStream isDominant = null; - InputStream isRecessive = null; - try + try ( InputStream isDominant = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); + InputStream isRecessive = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ) ) { - isDominant = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - isRecessive = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - PersistedToolchains dominant = reader.read( isDominant ); PersistedToolchains recessive = reader.read( isRecessive ); assertEquals( 2, dominant.getToolchains().size() ); - + merger.merge( dominant, recessive, TrackableBase.USER_LEVEL ); assertEquals( 2, dominant.getToolchains().size() ); } - finally - { - IOUtil.close( isDominant ); - } } @Test - public void testMergeJdkExtra() throws Exception + public void testMergeJdkExtra() + throws Exception { - InputStream jdksIS = null; - InputStream jdksExtraIS = null; - try + try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); + InputStream jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) ) { - jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ); - PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); assertEquals( 2, jdks.getToolchains().size() ); - + merger.merge( jdks, jdksExtra, TrackableBase.USER_LEVEL ); assertEquals( 4, jdks.getToolchains().size() ); assertEquals( 2, jdksExtra.getToolchains().size() ); } - finally + try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); + InputStream jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) ) { - IOUtil.close( jdksIS ); - IOUtil.close( jdksExtraIS ); - } - - try - { - jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ); - PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); assertEquals( 2, jdks.getToolchains().size() ); - + // switch dominant with reccessive merger.merge( jdksExtra, jdks, TrackableBase.USER_LEVEL ); assertEquals( 4, jdksExtra.getToolchains().size() ); assertEquals( 2, jdks.getToolchains().size() ); } - finally - { - IOUtil.close( jdksIS ); - IOUtil.close( jdksExtraIS ); - } } - + @Test - public void testMergeJdkExtend() throws Exception + public void testMergeJdkExtend() + throws Exception { - InputStream jdksIS = null; - InputStream jdksExtendIS = null; - try + try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); + InputStream jdksExtendIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extend.xml" ) ) { - jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - jdksExtendIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extend.xml" ); - PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtend = reader.read( jdksExtendIS ); assertEquals( 2, jdks.getToolchains().size() ); - + merger.merge( jdks, jdksExtend, TrackableBase.USER_LEVEL ); assertEquals( 2, jdks.getToolchains().size() ); - Xpp3Dom config0 = (Xpp3Dom) jdks.getToolchains().get( 0 ).getConfiguration(); + Xpp3Dom config0 = (Xpp3Dom) jdks.getToolchains().get( 0 ).getConfiguration(); assertEquals( "lib/tools.jar", config0.getChild( "toolsJar" ).getValue() ); assertEquals( 2, config0.getChildCount() ); Xpp3Dom config1 = (Xpp3Dom) jdks.getToolchains().get( 1 ).getConfiguration(); @@ -139,25 +112,17 @@ public class MavenToolchainMergerTest assertEquals( "lib/classes.jar", config1.getChild( "toolsJar" ).getValue() ); assertEquals( 2, jdksExtend.getToolchains().size() ); } - finally + try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); + InputStream jdksExtendIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extend.xml" ) ) { - IOUtil.close( jdksIS ); - IOUtil.close( jdksExtendIS ); - } - - try - { - jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); - jdksExtendIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extend.xml" ); - PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtend = reader.read( jdksExtendIS ); assertEquals( 2, jdks.getToolchains().size() ); - + // switch dominant with reccessive merger.merge( jdksExtend, jdks, TrackableBase.USER_LEVEL ); assertEquals( 2, jdksExtend.getToolchains().size() ); - Xpp3Dom config0 = (Xpp3Dom) jdksExtend.getToolchains().get( 0 ).getConfiguration(); + Xpp3Dom config0 = (Xpp3Dom) jdksExtend.getToolchains().get( 0 ).getConfiguration(); assertEquals( "lib/tools.jar", config0.getChild( "toolsJar" ).getValue() ); assertEquals( 2, config0.getChildCount() ); Xpp3Dom config1 = (Xpp3Dom) jdksExtend.getToolchains().get( 1 ).getConfiguration(); @@ -165,12 +130,6 @@ public class MavenToolchainMergerTest assertEquals( "lib/classes.jar", config1.getChild( "toolsJar" ).getValue() ); assertEquals( 2, jdks.getToolchains().size() ); } - finally - { - IOUtil.close( jdksIS ); - IOUtil.close( jdksExtendIS ); - } - } } http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java index 07863b7..cab39e2 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java @@ -19,6 +19,9 @@ package org.apache.maven.cli; * under the License. */ +import org.codehaus.plexus.util.Os; +import org.slf4j.Logger; + import java.io.IOException; import java.io.InputStream; import java.util.Date; @@ -26,15 +29,10 @@ import java.util.Locale; import java.util.Properties; import java.util.TimeZone; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.Os; -import org.slf4j.Logger; - /** * Utility class used to report errors, statistics, application version info, etc. * * @author jdcasey - * */ public final class CLIReportingUtils { @@ -42,8 +40,11 @@ public final class CLIReportingUtils public static final long MB = 1024 * 1024; private static final long ONE_SECOND = 1000L; + private static final long ONE_MINUTE = 60 * ONE_SECOND; + private static final long ONE_HOUR = 60 * ONE_MINUTE; + private static final long ONE_DAY = 24 * ONE_HOUR; // CHECKSTYLE_ON: MagicNumber @@ -55,8 +56,12 @@ public final class CLIReportingUtils Properties properties = getBuildProperties(); StringBuilder version = new StringBuilder(); version.append( createMavenVersionString( properties ) ).append( ls ); - version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: " - + System.getProperty( "maven.home", "<unknown maven home>" ) ) ).append( ls ); + version.append( reduce( + properties.getProperty( "distributionShortName" ) + " home: " + System.getProperty( "maven.home", + "<unknown maven " + + "home>" ) ) ) + .append( + ls ); version.append( "Java version: " ).append( System.getProperty( "java.version", "<unknown java version>" ) ).append( ", vendor: " ).append( System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( ls ); @@ -105,10 +110,10 @@ public final class CLIReportingUtils static Properties getBuildProperties() { Properties properties = new Properties(); - InputStream resourceAsStream = null; - try + + try ( InputStream resourceAsStream = MavenCli.class.getResourceAsStream( + "/org/apache/maven/messages/build.properties" ) ) { - resourceAsStream = MavenCli.class.getResourceAsStream( "/org/apache/maven/messages/build.properties" ); if ( resourceAsStream != null ) { @@ -119,10 +124,6 @@ public final class CLIReportingUtils { System.err.println( "Unable determine version from JAR file: " + e.getMessage() ); } - finally - { - IOUtil.close( resourceAsStream ); - } return properties; } http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 2f17008..8ce299f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -19,27 +19,9 @@ package org.apache.maven.cli; * under the License. */ -import java.io.BufferedInputStream; -import java.io.Console; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.Set; -import java.util.StringTokenizer; - +import com.google.common.base.Charsets; +import com.google.common.io.Files; +import com.google.inject.AbstractModule; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.UnrecognizedOptionException; @@ -93,7 +75,6 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.logging.LoggerManager; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.eclipse.aether.transfer.TransferListener; @@ -106,15 +87,32 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; import org.sonatype.plexus.components.sec.dispatcher.SecUtil; import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import com.google.inject.AbstractModule; +import java.io.BufferedInputStream; +import java.io.Console; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; // TODO: push all common bits back to plexus cli and prepare for transition to Guice. We don't need 50 ways to make CLIs /** * @author Jason van Zyl - * @noinspection UseOfSystemOutOrSystemErr,ACCESS_STATIC_VIA_INSTANCE + * @noinspection UseOfSystemOutOrSystemErr, ACCESS_STATIC_VIA_INSTANCE */ public class MavenCli { @@ -143,8 +141,8 @@ public class MavenCli public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( userMavenConfigurationHome, "toolchains.xml" ); - public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE = - new File( System.getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), "conf/toolchains.xml" ); + public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE = + new File( System.getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), "conf/toolchains.xml" ); private static final String EXT_CLASS_PATH = "maven.ext.class.path"; @@ -171,7 +169,7 @@ public class MavenCli private DefaultSecDispatcher dispatcher; private Map<String, ConfigurationProcessor> configurationProcessors; - + public MavenCli() { this( null ); @@ -190,7 +188,9 @@ public class MavenCli System.exit( result ); } - /** @noinspection ConfusingMainMethod */ + /** + * @noinspection ConfusingMainMethod + */ public static int main( String[] args, ClassWorld classWorld ) { MavenCli cli = new MavenCli(); @@ -328,8 +328,9 @@ public class MavenCli String basedirProperty = System.getProperty( MULTIMODULE_PROJECT_DIRECTORY ); if ( basedirProperty == null ) { - System.err.format( "-D%s system property is not set." - + " Check $M2_HOME environment variable and mvn script match.", MULTIMODULE_PROJECT_DIRECTORY ); + System.err.format( + "-D%s system property is not set." + " Check $M2_HOME environment variable and mvn script match.", + MULTIMODULE_PROJECT_DIRECTORY ); throw new ExitException( 1 ); } File basedir = basedirProperty != null ? new File( basedirProperty ) : new File( "" ); @@ -522,12 +523,9 @@ public class MavenCli ClassRealm containerRealm = setupContainerRealm( cliRequest.classWorld, coreRealm, extClassPath, extensions ); - ContainerConfiguration cc = new DefaultContainerConfiguration() - .setClassWorld( cliRequest.classWorld ) - .setRealm( containerRealm ) - .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) - .setAutoWiring( true ) - .setName( "maven" ); + ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ).setRealm( + containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ).setName( + "maven" ); Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() ); Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() ); @@ -586,7 +584,7 @@ public class MavenCli modelProcessor = createModelProcessor( container ); configurationProcessors = container.lookupMap( ConfigurationProcessor.class ); - + toolchainsBuilder = container.lookup( ToolchainsBuilder.class ); dispatcher = (DefaultSecDispatcher) container.lookup( SecDispatcher.class, "maven" ); @@ -643,19 +641,19 @@ public class MavenCli Thread.currentThread().setContextClassLoader( container.getContainerRealm() ); executionRequestPopulator = container.lookup( MavenExecutionRequestPopulator.class ); - + configurationProcessors = container.lookupMap( ConfigurationProcessor.class ); - + configure( cliRequest ); - + MavenExecutionRequest request = DefaultMavenExecutionRequest.copy( cliRequest.request ); request = populateRequest( cliRequest, request ); - + request = executionRequestPopulator.populateDefaults( request ); BootstrapCoreExtensionManager resolver = container.lookup( BootstrapCoreExtensionManager.class ); - + return resolver.loadCoreExtensions( request, providedArtifacts, extensions ); } finally @@ -680,16 +678,13 @@ public class MavenCli throws IOException, XmlPullParserException { CoreExtensionsXpp3Reader parser = new CoreExtensionsXpp3Reader(); - InputStream is = null; - try + + try ( InputStream is = new BufferedInputStream( new FileInputStream( extensionsFile ) ) ) { - is = new BufferedInputStream( new FileInputStream( extensionsFile ) ); + return parser.read( is ).getExtensions(); } - finally - { - IOUtil.close( is ); - } + } private ClassRealm setupContainerRealm( ClassWorld classWorld, ClassRealm coreRealm, List<File> extClassPath, @@ -790,8 +785,8 @@ public class MavenCli DefaultPlexusCipher cipher = new DefaultPlexusCipher(); - System.out.println( cipher.encryptAndDecorate( passwd, - DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION ) ); + System.out.println( + cipher.encryptAndDecorate( passwd, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION ) ); throw new ExitException( 0 ); } @@ -846,17 +841,18 @@ public class MavenCli private void repository( CliRequest cliRequest ) throws Exception { - if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) - || Boolean.getBoolean( "maven.legacyLocalRepo" ) ) + if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean( + "maven.legacyLocalRepo" ) ) { - cliRequest.request.setUseLegacyLocalRepository( true ); + cliRequest.request.setUseLegacyLocalRepository( true ); } } - private int execute( CliRequest cliRequest ) throws MavenExecutionRequestPopulationException + private int execute( CliRequest cliRequest ) + throws MavenExecutionRequestPopulationException { MavenExecutionRequest request = executionRequestPopulator.populateDefaults( cliRequest.request ); - + eventSpyDispatcher.onEvent( request ); MavenExecutionResult result = maven.execute( request ); @@ -900,7 +896,7 @@ public class MavenCli { slf4jLogger.error( "" ); slf4jLogger.error( "For more information about the errors and possible solutions" - + ", please read the following articles:" ); + + ", please read the following articles:" ); for ( Map.Entry<String, String> entry : references.entrySet() ) { @@ -967,8 +963,8 @@ public class MavenCli { String line = indent + lines[i].trim(); - if ( ( i == lines.length - 1 ) - && ( showErrors || ( summary.getException() instanceof InternalErrorException ) ) ) + if ( ( i == lines.length - 1 ) && ( showErrors + || ( summary.getException() instanceof InternalErrorException ) ) ) { slf4jLogger.error( line, summary.getException() ); } @@ -997,7 +993,7 @@ public class MavenCli // it can be accessed by configuration processors. // cliRequest.request.setEventSpyDispatcher( eventSpyDispatcher ); - + // // We expect at most 2 implementations to be available. The SettingsXmlConfigurationProcessor implementation // is always available in the core and likely always will be, but we may have another ConfigurationProcessor @@ -1006,15 +1002,15 @@ public class MavenCli // the default SettingsXmlConfigurationProcessor. // int userSuppliedConfigurationProcessorCount = configurationProcessors.size() - 1; - + if ( userSuppliedConfigurationProcessorCount == 0 ) { // // Our settings.xml source is historically how we have configured Maven from the CLI so we are going to // have to honour its existence forever. So let's run it. // - configurationProcessors.get( SettingsXmlConfigurationProcessor.HINT ).process( cliRequest ); - } + configurationProcessors.get( SettingsXmlConfigurationProcessor.HINT ).process( cliRequest ); + } else if ( userSuppliedConfigurationProcessorCount == 1 ) { // @@ -1028,7 +1024,7 @@ public class MavenCli ConfigurationProcessor configurationProcessor = entry.getValue(); configurationProcessor.process( cliRequest ); } - } + } } else if ( userSuppliedConfigurationProcessorCount > 1 ) { @@ -1036,7 +1032,7 @@ public class MavenCli // There are too many ConfigurationProcessors so we don't know which one to run so report the error. // StringBuilder sb = new StringBuilder( - String.format( "\nThere can only be one user supplied ConfigurationProcessor, there are %s:\n\n", + String.format( "\nThere can only be one user supplied ConfigurationProcessor, there are %s:\n\n", userSuppliedConfigurationProcessorCount ) ); for ( Entry<String, ConfigurationProcessor> entry : configurationProcessors.entrySet() ) { @@ -1049,9 +1045,9 @@ public class MavenCli } sb.append( String.format( "\n" ) ); throw new Exception( sb.toString() ); - } + } } - + @SuppressWarnings( "checkstyle:methodlength" ) private void toolchains( CliRequest cliRequest ) throws Exception @@ -1066,8 +1062,8 @@ public class MavenCli if ( !userToolchainsFile.isFile() ) { - throw new FileNotFoundException( "The specified user toolchains file does not exist: " - + userToolchainsFile ); + throw new FileNotFoundException( + "The specified user toolchains file does not exist: " + userToolchainsFile ); } } else @@ -1085,8 +1081,8 @@ public class MavenCli if ( !globalToolchainsFile.isFile() ) { - throw new FileNotFoundException( "The specified global toolchains file does not exist: " - + globalToolchainsFile ); + throw new FileNotFoundException( + "The specified global toolchains file does not exist: " + globalToolchainsFile ); } } else @@ -1109,10 +1105,11 @@ public class MavenCli eventSpyDispatcher.onEvent( toolchainsRequest ); - slf4jLogger.debug( "Reading global toolchains from " - + getLocation( toolchainsRequest.getGlobalToolchainsSource(), globalToolchainsFile ) ); - slf4jLogger.debug( "Reading user toolchains from " - + getLocation( toolchainsRequest.getUserToolchainsSource(), userToolchainsFile ) ); + slf4jLogger.debug( + "Reading global toolchains from " + getLocation( toolchainsRequest.getGlobalToolchainsSource(), + globalToolchainsFile ) ); + slf4jLogger.debug( "Reading user toolchains from " + getLocation( toolchainsRequest.getUserToolchainsSource(), + userToolchainsFile ) ); ToolchainsBuildingResult toolchainsResult = toolchainsBuilder.build( toolchainsRequest ); @@ -1162,7 +1159,7 @@ public class MavenCli if ( commandLine.hasOption( deprecatedOption ) ) { slf4jLogger.warn( "Command line option -" + deprecatedOption - + " is deprecated and will be removed in future Maven versions." ); + + " is deprecated and will be removed in future Maven versions." ); } } @@ -1186,8 +1183,7 @@ public class MavenCli // // ---------------------------------------------------------------------- - @SuppressWarnings( "unchecked" ) - List<String> goals = commandLine.getArgList(); + @SuppressWarnings( "unchecked" ) List<String> goals = commandLine.getArgList(); boolean recursive = true; @@ -1317,16 +1313,15 @@ public class MavenCli userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE; } - request.setBaseDirectory( baseDirectory ).setGoals( goals ) - .setSystemProperties( cliRequest.systemProperties ) - .setUserProperties( cliRequest.userProperties ) - .setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast + request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties( + cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior( + reactorFailureBehaviour ) // default: fail fast .setRecursive( recursive ) // default: true .setShowErrors( showErrors ) // default: false .addActiveProfiles( activeProfiles ) // optional .addInactiveProfiles( inactiveProfiles ) // optional - .setExecutionListener( executionListener ) - .setTransferListener( transferListener ) // default: batch mode which goes along with interactive + .setExecutionListener( executionListener ).setTransferListener( + transferListener ) // default: batch mode which goes along with interactive .setUpdateSnapshots( updateSnapshots ) // default: false .setNoSnapshotUpdates( noSnapshotUpdates ) // default: false .setGlobalChecksumPolicy( globalChecksumPolicy ) // default: warn @@ -1399,18 +1394,18 @@ public class MavenCli request.setExcludedProjects( exclProjects ); } - if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) - && !commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) + if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && !commandLine.hasOption( + CLIManager.ALSO_MAKE_DEPENDENTS ) ) { request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_UPSTREAM ); } - else if ( !commandLine.hasOption( CLIManager.ALSO_MAKE ) - && commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) + else if ( !commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption( + CLIManager.ALSO_MAKE_DEPENDENTS ) ) { request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM ); } - else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) - && commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) + else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption( + CLIManager.ALSO_MAKE_DEPENDENTS ) ) { request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_BOTH ); } @@ -1420,8 +1415,8 @@ public class MavenCli if ( localRepoProperty == null ) { localRepoProperty = request.getSystemProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY ); - } - + } + if ( localRepoProperty != null ) { request.setLocalRepositoryPath( localRepoProperty ); http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java index 1aef12e..f9e95ec 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java @@ -19,22 +19,21 @@ package org.apache.maven.model.inheritance; * under the License. */ -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; - import org.apache.maven.model.Model; import org.apache.maven.model.building.SimpleProblemCollector; import org.apache.maven.model.io.ModelParseException; import org.apache.maven.model.io.ModelReader; import org.apache.maven.model.io.ModelWriter; import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.util.IOUtil; import org.custommonkey.xmlunit.XMLAssert; import org.custommonkey.xmlunit.XMLUnit; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + /** * @author Hervé Boutemy */ @@ -85,24 +84,16 @@ public class DefaultInheritanceAssemblerTest writer.write( actual, null, child ); // check with getPom( "plugin-configuration-effective" ) - Reader control = null; - Reader test = null; - try + File expected = getPom( "plugin-configuration-expected" ); + try ( Reader control = new InputStreamReader( new FileInputStream( expected ), "UTF-8" ); + Reader test = new InputStreamReader( new FileInputStream( actual ), "UTF-8" ) ) { - File expected = getPom( "plugin-configuration-expected" ); - control = new InputStreamReader( new FileInputStream( expected ), "UTF-8" ); - - test = new InputStreamReader( new FileInputStream( actual ), "UTF-8" ); XMLUnit.setIgnoreComments( true ); XMLUnit.setIgnoreWhitespace( true ); XMLAssert.assertXMLEqual( control, test ); } - catch ( IOException ioe ) - { - IOUtil.close( control ); - IOUtil.close( test ); - } + } } http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java index b70d291..f65f824 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java @@ -19,6 +19,17 @@ package org.apache.maven.plugin.descriptor; * under the License. */ +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.ArtifactUtils; +import org.apache.maven.model.Plugin; +import org.apache.maven.plugin.lifecycle.Lifecycle; +import org.apache.maven.plugin.lifecycle.LifecycleConfiguration; +import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.codehaus.plexus.component.repository.ComponentSetDescriptor; +import org.codehaus.plexus.util.ReaderFactory; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -32,18 +43,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.ArtifactUtils; -import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.lifecycle.Lifecycle; -import org.apache.maven.plugin.lifecycle.LifecycleConfiguration; -import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - /** * @author Jason van Zyl */ @@ -115,8 +114,9 @@ public class PluginDescriptor if ( existing != null ) { - throw new DuplicateMojoDescriptorException( getGoalPrefix(), mojoDescriptor.getGoal(), existing - .getImplementation(), mojoDescriptor.getImplementation() ); + throw new DuplicateMojoDescriptorException( getGoalPrefix(), mojoDescriptor.getGoal(), + existing.getImplementation(), + mojoDescriptor.getImplementation() ); } else { @@ -272,7 +272,7 @@ public class PluginDescriptor return true; } - return object instanceof PluginDescriptor && getId().equals( ( (PluginDescriptor) object ).getId() ); + return object instanceof PluginDescriptor && getId().equals( ( (PluginDescriptor) object ).getId() ); } public int hashCode() @@ -316,8 +316,9 @@ public class PluginDescriptor public Set<Artifact> getIntroducedDependencyArtifacts() { - return ( introducedDependencyArtifacts != null ) ? introducedDependencyArtifacts - : Collections.<Artifact>emptySet(); + return ( introducedDependencyArtifacts != null ) + ? introducedDependencyArtifacts + : Collections.<Artifact>emptySet(); } public void setName( String name ) @@ -377,17 +378,10 @@ public class PluginDescriptor { LifecycleConfiguration lifecycleConfiguration; - Reader reader = null; - try + try ( Reader reader = ReaderFactory.newXmlReader( getDescriptorStream( LIFECYCLE_DESCRIPTOR ) ) ) { - reader = ReaderFactory.newXmlReader( getDescriptorStream( LIFECYCLE_DESCRIPTOR ) ); - lifecycleConfiguration = new LifecycleMappingsXpp3Reader().read( reader ); } - finally - { - IOUtil.close( reader ); - } lifecycleMappings = new HashMap<>();
