Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try-with-resources 

Reformatted to code style by me. This fixes #53
This commit is contained in:
sugartxy 2015-06-19 17:10:43 +08:00 committed by Kristian Rosenvold
parent 36b8a6d562
commit 7f206ef1cc
25 changed files with 517 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
View File

@ -19,15 +19,14 @@ package org.apache.maven.settings;
* under the License.
*/
import junit.framework.TestCase;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import junit.framework.TestCase;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
*
@ -45,7 +44,7 @@ public class GlobalSettingsTest
File globalSettingsFile = new File( basedir, "src/conf/settings.xml" );
assertTrue( globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile() );
try (Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), "UTF-8" ))
try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), "UTF-8" ) )
{
new SettingsXpp3Reader().read( reader );
}

33
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
View File

@ -19,17 +19,9 @@ package org.apache.maven.repository.internal;
* under the License.
*/
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Collections;
import java.util.Map;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@ -37,6 +29,13 @@ import org.eclipse.aether.RepositoryException;
import org.eclipse.aether.metadata.AbstractMetadata;
import org.eclipse.aether.metadata.MergeableMetadata;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Collections;
import java.util.Map;
/**
* @author Benjamin Bentmann
*/
@ -96,10 +95,8 @@ abstract class MavenMetadata
return new Metadata();
}
Reader reader = null;
try
try ( Reader reader = ReaderFactory.newXmlReader( metadataFile ) )
{
reader = ReaderFactory.newXmlReader( metadataFile );
return new MetadataXpp3Reader().read( reader, false );
}
catch ( IOException e )
@ -110,30 +107,20 @@ abstract class MavenMetadata
{
throw new RepositoryException( "Could not parse metadata " + metadataFile + ": " + e.getMessage(), e );
}
finally
{
IOUtil.close( reader );
}
}
private void write( File metadataFile, Metadata metadata )
throws RepositoryException
{
Writer writer = null;
try
{
metadataFile.getParentFile().mkdirs();
writer = WriterFactory.newXmlWriter( metadataFile );
try ( Writer writer = WriterFactory.newXmlWriter( metadataFile ) )
{
new MetadataXpp3Writer().write( writer, metadata );
}
catch ( IOException e )
{
throw new RepositoryException( "Could not write metadata " + metadataFile + ": " + e.getMessage(), e );
}
finally
{
IOUtil.close( writer );
}
}
public Map<String, String> getProperties()

24
maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
View File

@ -19,14 +19,14 @@ package org.apache.maven.building;
* under the License.
*/
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
import java.io.File;
import java.io.InputStream;
import java.util.Scanner;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
public class FileSourceTest
{
@ -52,26 +52,12 @@ public class FileSourceTest
File txtFile = new File( "target/test-classes/source.txt" );
FileSource source = new FileSource( txtFile );
Scanner scanner = null;
InputStream is = null;
try
try ( InputStream is = source.getInputStream();
Scanner scanner = new Scanner( is ) )
{
is = source.getInputStream();
scanner = new Scanner( is );
assertEquals( "Hello World!", scanner.nextLine() );
}
finally
{
if ( scanner != null )
{
scanner.close();
}
if ( is != null )
{
is.close();
}
}
}
@Test

23
maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
View File

@ -19,12 +19,12 @@ package org.apache.maven.building;
* under the License.
*/
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import java.io.InputStream;
import java.util.Scanner;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class StringSourceTest
{
@ -34,26 +34,11 @@ public class StringSourceTest
{
StringSource source = new StringSource( "Hello World!" );
Scanner scanner = null;
InputStream is = null;
try
try ( InputStream is = source.getInputStream();
Scanner scanner = new Scanner( is ) )
{
is = source.getInputStream();
scanner = new Scanner( is );
assertEquals( "Hello World!", scanner.nextLine() );
}
finally
{
if ( scanner != null )
{
scanner.close();
}
if ( is != null )
{
is.close();
}
}
}
@Test

26
maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
View File

@ -19,15 +19,15 @@ package org.apache.maven.building;
* under the License.
*/
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
import java.io.File;
import java.io.InputStream;
import java.net.URL;
import java.util.Scanner;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
public class UrlSourceTest
{
@ -52,27 +52,11 @@ public class UrlSourceTest
{
URL txtFile = new File( "target/test-classes/source.txt" ).toURI().toURL();
UrlSource source = new UrlSource( txtFile );
Scanner scanner = null;
InputStream is = null;
try
try ( InputStream is = source.getInputStream();
Scanner scanner = new Scanner( is ) )
{
is = source.getInputStream();
scanner = new Scanner( is );
assertEquals( "Hello World!", scanner.nextLine() );
}
finally
{
if ( scanner != null )
{
scanner.close();
}
if ( is != null )
{
is.close();
}
}
}
@Test

93
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
View File

@ -19,16 +19,6 @@ package org.apache.maven.artifact.repository.metadata;
* under the License.
*/
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@ -43,11 +33,20 @@ import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Jason van Zyl
*/
@ -100,8 +99,7 @@ public class DefaultRepositoryMetadataManager
if ( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Skipping update check for " + metadata.getKey() + " (" + file
getLogger().debug( "Skipping update check for " + metadata.getKey() + " (" + file
+ ") from disabled repository " + repository.getId() + " ("
+ repository.getUrl() + ")" );
}
@ -117,9 +115,8 @@ public class DefaultRepositoryMetadataManager
if ( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Skipping update check for " + metadata.getKey() + " (" + file
+ ") from repository " + repository.getId() + " (" + repository.getUrl()
+ ") in favor of local copy" );
"Skipping update check for " + metadata.getKey() + " (" + file + ") from repository "
+ repository.getId() + " (" + repository.getUrl() + ") in favor of local copy" );
}
}
else
@ -183,8 +180,8 @@ public class DefaultRepositoryMetadataManager
}
catch ( RepositoryMetadataStoreException e )
{
throw new RepositoryMetadataResolutionException( "Unable to store local copy of metadata: "
+ e.getMessage(), e );
throw new RepositoryMetadataResolutionException(
"Unable to store local copy of metadata: " + e.getMessage(), e );
}
}
@ -267,14 +264,13 @@ public class DefaultRepositoryMetadataManager
}
private boolean loadMetadata( RepositoryMetadata repoMetadata, ArtifactRepository remoteRepository,
ArtifactRepository localRepository, Map<ArtifactRepository,
Metadata> previousMetadata )
ArtifactRepository localRepository,
Map<ArtifactRepository, Metadata> previousMetadata )
{
boolean setRepository = false;
File metadataFile =
new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( repoMetadata,
remoteRepository ) );
File metadataFile = new File( localRepository.getBasedir(),
localRepository.pathOfLocalRepositoryMetadata( repoMetadata, remoteRepository ) );
if ( metadataFile.exists() )
{
@ -315,17 +311,16 @@ public class DefaultRepositoryMetadataManager
return setRepository;
}
/** @todo share with DefaultPluginMappingManager. */
/**
* @todo share with DefaultPluginMappingManager.
*/
protected Metadata readMetadata( File mappingFile )
throws RepositoryMetadataReadException
{
Metadata result;
Reader reader = null;
try
try ( Reader reader = ReaderFactory.newXmlReader( mappingFile ) )
{
reader = ReaderFactory.newXmlReader( mappingFile );
MetadataXpp3Reader mappingReader = new MetadataXpp3Reader();
result = mappingReader.read( reader, false );
@ -336,14 +331,9 @@ public class DefaultRepositoryMetadataManager
}
catch ( IOException | XmlPullParserException e )
{
throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': "
+ e.getMessage(), e );
throw new RepositoryMetadataReadException(
"Cannot read metadata from '" + mappingFile + "': " + e.getMessage(), e );
}
finally
{
IOUtil.close( reader );
}
return result;
}
@ -366,9 +356,8 @@ public class DefaultRepositoryMetadataManager
if ( lastUpdated != null && now != null && now.compareTo( lastUpdated ) < 0 )
{
getLogger().warn(
"The last updated timestamp in " + metadataFile + " refers to the future (now = "
+ now + ", lastUpdated = " + lastUpdated
+ "). Please verify that the clocks of all"
"The last updated timestamp in " + metadataFile + " refers to the future (now = " + now
+ ", lastUpdated = " + lastUpdated + "). Please verify that the clocks of all"
+ " deploying machines are reasonably synchronized." );
versioning.setLastUpdated( now );
changed = true;
@ -380,10 +369,8 @@ public class DefaultRepositoryMetadataManager
{
getLogger().debug( "Repairing metadata in " + metadataFile );
Writer writer = null;
try
try ( Writer writer = WriterFactory.newXmlWriter( metadataFile ) )
{
writer = WriterFactory.newXmlWriter( metadataFile );
new MetadataXpp3Writer().write( writer, metadata );
}
catch ( IOException e )
@ -398,10 +385,6 @@ public class DefaultRepositoryMetadataManager
getLogger().warn( msg );
}
}
finally
{
IOUtil.close( writer );
}
}
}
@ -416,8 +399,9 @@ public class DefaultRepositoryMetadataManager
}
catch ( TransferFailedException e )
{
throw new RepositoryMetadataResolutionException( metadata + " could not be retrieved from repository: "
+ remoteRepository.getId() + " due to an error: " + e.getMessage(), e );
throw new RepositoryMetadataResolutionException(
metadata + " could not be retrieved from repository: " + remoteRepository.getId() + " due to an error: "
+ e.getMessage(), e );
}
try
@ -434,8 +418,7 @@ public class DefaultRepositoryMetadataManager
}
}
private File getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata,
ArtifactRepository localRepo,
private File getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository localRepo,
ArtifactRepository remoteRepository )
throws TransferFailedException
{
@ -449,8 +432,8 @@ public class DefaultRepositoryMetadataManager
}
catch ( ResourceDoesNotExistException e )
{
getLogger().info( metadata + " could not be found on repository: " + remoteRepository.getId()
+ ", so will be created" );
getLogger().info(
metadata + " could not be found on repository: " + remoteRepository.getId() + ", so will be created" );
// delete the local copy so the old details aren't used.
if ( file.exists() )
@ -494,8 +477,9 @@ public class DefaultRepositoryMetadataManager
}
catch ( TransferFailedException e )
{
throw new RepositoryMetadataDeploymentException( metadata + " could not be retrieved from repository: "
+ deploymentRepository.getId() + " due to an error: " + e.getMessage(), e );
throw new RepositoryMetadataDeploymentException(
metadata + " could not be retrieved from repository: " + deploymentRepository.getId()
+ " due to an error: " + e.getMessage(), e );
}
if ( file.isFile() )
@ -513,8 +497,7 @@ public class DefaultRepositoryMetadataManager
else
{
// It's a POM - we don't need to retrieve it first
file =
new File( localRepository.getBasedir(),
file = new File( localRepository.getBasedir(),
localRepository.pathOfLocalRepositoryMetadata( metadata, deploymentRepository ) );
}

18
maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
View File

@ -52,13 +52,9 @@ public class DefaultMavenProfilesBuilder
if ( profilesXml.exists() )
{
ProfilesXpp3Reader reader = new ProfilesXpp3Reader();
Reader profileReader = null;
try
try ( Reader profileReader = ReaderFactory.newXmlReader( profilesXml );
StringWriter sWriter = new StringWriter() )
{
profileReader = ReaderFactory.newXmlReader( profilesXml );
StringWriter sWriter = new StringWriter();
IOUtil.copy( profileReader, sWriter );
String rawInput = sWriter.toString();
@ -72,8 +68,9 @@ public class DefaultMavenProfilesBuilder
}
catch ( Exception e )
{
getLogger().warn( "Failed to initialize environment variable resolver. Skipping environment "
+ "substitution in " + PROFILES_XML_FILE + "." );
getLogger().warn(
"Failed to initialize environment variable resolver. Skipping environment " + "substitution in "
+ PROFILES_XML_FILE + "." );
getLogger().debug( "Failed to initialize envar resolver. Skipping resolution.", e );
}
@ -81,10 +78,7 @@ public class DefaultMavenProfilesBuilder
profilesRoot = reader.read( sReader );
}
finally
{
IOUtil.close( profileReader );
}
}
return profilesRoot;

52
maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
View File

@ -19,6 +19,17 @@ package org.apache.maven.repository.legacy;
* under the License.
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.repository.Proxy;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -31,17 +42,6 @@ import java.nio.channels.FileLock;
import java.util.Date;
import java.util.Properties;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.repository.Proxy;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
@Component( role = UpdateCheckManager.class )
public class DefaultUpdateCheckManager
extends AbstractLogEnabled
@ -75,8 +75,8 @@ public class DefaultUpdateCheckManager
if ( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Skipping update check for " + artifact + " (" + file + ") from "
+ repository.getId() + " (" + repository.getUrl() + ")" );
"Skipping update check for " + artifact + " (" + file + ") from " + repository.getId() + " ("
+ repository.getUrl() + ")" );
}
return false;
@ -85,8 +85,8 @@ public class DefaultUpdateCheckManager
if ( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Determining update check for " + artifact + " (" + file + ") from "
+ repository.getId() + " (" + repository.getUrl() + ")" );
"Determining update check for " + artifact + " (" + file + ") from " + repository.getId() + " ("
+ repository.getUrl() + ")" );
}
if ( file == null )
@ -99,7 +99,7 @@ public class DefaultUpdateCheckManager
if ( file.exists() )
{
lastCheckDate = new Date ( file.lastModified() );
lastCheckDate = new Date( file.lastModified() );
}
else
{
@ -125,8 +125,8 @@ public class DefaultUpdateCheckManager
if ( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Skipping update check for " + metadata.getKey() + " (" + file + ") from "
+ repository.getId() + " (" + repository.getUrl() + ")" );
"Skipping update check for " + metadata.getKey() + " (" + file + ") from " + repository.getId()
+ " (" + repository.getUrl() + ")" );
}
return false;
@ -135,8 +135,8 @@ public class DefaultUpdateCheckManager
if ( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Determining update check for " + metadata.getKey() + " (" + file + ") from "
+ repository.getId() + " (" + repository.getUrl() + ")" );
"Determining update check for " + metadata.getKey() + " (" + file + ") from " + repository.getId()
+ " (" + repository.getUrl() + ")" );
}
if ( file == null )
@ -282,8 +282,9 @@ public class DefaultUpdateCheckManager
}
catch ( IOException e )
{
getLogger().debug( "Failed to record lastUpdated information for resolution.\nFile: "
+ touchfile.toString() + "; key: " + key, e );
getLogger().debug(
"Failed to record lastUpdated information for resolution.\nFile: " + touchfile.toString()
+ "; key: " + key, e );
}
finally
{
@ -295,8 +296,8 @@ public class DefaultUpdateCheckManager
}
catch ( IOException e )
{
getLogger().debug( "Error releasing exclusive lock for resolution tracking file: "
+ touchfile, e );
getLogger().debug( "Error releasing exclusive lock for resolution tracking file: " + touchfile,
e );
}
}
@ -308,8 +309,7 @@ public class DefaultUpdateCheckManager
}
catch ( IOException e )
{
getLogger().debug( "Error closing FileChannel for resolution tracking file: "
+ touchfile, e );
getLogger().debug( "Error closing FileChannel for resolution tracking file: " + touchfile, e );
}
}
}

20
maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.usability.plugin;
*/
import org.apache.maven.usability.plugin.io.xpp3.ParamdocXpp3Reader;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@ -56,12 +55,9 @@ public class ExpressionDocumenter
for ( String EXPRESSION_ROOT : EXPRESSION_ROOTS )
{
InputStream docStream = null;
try
try ( InputStream docStream = docLoader.getResourceAsStream(
EXPRESSION_DOCO_ROOTPATH + EXPRESSION_ROOT + ".paramdoc.xml" ) )
{
docStream =
docLoader.getResourceAsStream( EXPRESSION_DOCO_ROOTPATH + EXPRESSION_ROOT + ".paramdoc.xml" );
if ( docStream != null )
{
Map<String, Expression> doco = parseExpressionDocumentation( docStream );
@ -79,10 +75,7 @@ public class ExpressionDocumenter
throw new ExpressionDocumentationException(
"Failed to parse documentation for expression root: " + EXPRESSION_ROOT, e );
}
finally
{
IOUtil.close( docStream );
}
}
}
@ -111,6 +104,7 @@ public class ExpressionDocumenter
* ]]></usage>
* </expression>
* <expressions>
*
* @throws IOException
* @throws XmlPullParserException
*/
@ -165,11 +159,11 @@ public class ExpressionDocumenter
}
catch ( MalformedURLException e )
{
throw new ExpressionDocumentationException( "Cannot construct expression documentation classpath"
+ " resource base.", e );
throw new ExpressionDocumentationException(
"Cannot construct expression documentation classpath" + " resource base.", e );
}
return new URLClassLoader( new URL[] { docResource } );
return new URLClassLoader( new URL[]{ docResource } );
}
}

58
maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
View File

@ -19,23 +19,15 @@ package org.apache.maven.artifact;
* under the License.
*/
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
@ -54,14 +46,22 @@ import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
import org.eclipse.aether.util.graph.selector.ScopeDependencySelector;
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
import org.eclipse.aether.util.graph.transformer.ConflictResolver;
import org.eclipse.aether.util.graph.transformer.JavaDependencyContextRefiner;
import org.eclipse.aether.util.graph.transformer.JavaScopeDeriver;
import org.eclipse.aether.util.graph.transformer.JavaScopeSelector;
import org.eclipse.aether.util.graph.transformer.JavaDependencyContextRefiner;
import org.eclipse.aether.util.graph.transformer.NearestVersionSelector;
import org.eclipse.aether.util.graph.transformer.SimpleOptionalitySelector;
import org.eclipse.aether.util.graph.traverser.FatArtifactTraverser;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
*/
@ -85,15 +85,14 @@ public abstract class AbstractArtifactComponentTestCase
throws Exception
{
super.setUp();
artifactFactory = lookup( ArtifactFactory.class);
artifactFactory = lookup( ArtifactFactory.class );
artifactRepositoryFactory = lookup( ArtifactRepositoryFactory.class );
RepositorySystemSession repoSession = initRepoSession();
MavenSession session =
new MavenSession( getContainer(), repoSession, new DefaultMavenExecutionRequest(),
MavenSession session = new MavenSession( getContainer(), repoSession, new DefaultMavenExecutionRequest(),
new DefaultMavenExecutionResult() );
LegacySupport legacySupport = lookup(LegacySupport.class);
LegacySupport legacySupport = lookup( LegacySupport.class );
legacySupport.setSession( session );
}
@ -125,7 +124,8 @@ public abstract class AbstractArtifactComponentTestCase
ArtifactRepositoryLayout repoLayout =
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
return artifactRepositoryFactory.createArtifactRepository( "test", "file://" + f.getPath(), repoLayout, null, null );
return artifactRepositoryFactory.createArtifactRepository( "test", "file://" + f.getPath(), repoLayout, null,
null );
}
protected String getRepositoryLayout()
@ -143,7 +143,8 @@ public abstract class AbstractArtifactComponentTestCase
ArtifactRepositoryLayout repoLayout =
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
return artifactRepositoryFactory.createArtifactRepository( "local", "file://" + f.getPath(), repoLayout, null, null );
return artifactRepositoryFactory.createArtifactRepository( "local", "file://" + f.getPath(), repoLayout, null,
null );
}
protected ArtifactRepository remoteRepository()
@ -157,7 +158,8 @@ public abstract class AbstractArtifactComponentTestCase
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
return artifactRepositoryFactory.createArtifactRepository( "test", "file://" + f.getPath(), repoLayout,
new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy() );
new ArtifactRepositoryPolicy(),
new ArtifactRepositoryPolicy() );
}
protected ArtifactRepository badRemoteRepository()
@ -166,7 +168,8 @@ public abstract class AbstractArtifactComponentTestCase
ArtifactRepositoryLayout repoLayout =
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
return artifactRepositoryFactory.createArtifactRepository( "test", "http://foo.bar/repository", repoLayout, null, null );
return artifactRepositoryFactory.createArtifactRepository( "test", "http://foo.bar/repository", repoLayout,
null, null );
}
protected void assertRemoteArtifactPresent( Artifact artifact )
@ -290,12 +293,10 @@ public abstract class AbstractArtifactComponentTestCase
{
artifactFile.getParentFile().mkdirs();
}
Writer writer = new OutputStreamWriter( new FileOutputStream( artifactFile ), "ISO-8859-1" );
try ( Writer writer = new OutputStreamWriter( new FileOutputStream( artifactFile ), "ISO-8859-1" ) )
{
writer.write( artifact.getId() );
writer.close();
}
}
protected Artifact createArtifact( String artifactId, String version )
@ -351,9 +352,9 @@ public abstract class AbstractArtifactComponentTestCase
DependencyManager depManager = new ClassicDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter =
new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),
new OptionalDependencySelector(), new ExclusionDependencySelector() );
DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),
new OptionalDependencySelector(),
new ExclusionDependencySelector() );
session.setDependencySelector( depFilter );
DependencyGraphTransformer transformer =
@ -363,7 +364,8 @@ public abstract class AbstractArtifactComponentTestCase
session.setDependencyGraphTransformer( transformer );
LocalRepository localRepo = new LocalRepository( localRepository().getBasedir() );
session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) );
session.setLocalRepositoryManager(
new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) );
return session;
}

47
maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
View File

@ -19,22 +19,21 @@ package org.apache.maven.artifact.repository.metadata;
* under the License.
*/
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
/**
* Shared methods of the repository metadata handling.
*
@ -60,8 +59,7 @@ public abstract class AbstractRepositoryMetadata
return "maven-metadata-" + repository.getKey() + ".xml";
}
public void storeInLocalRepository( ArtifactRepository localRepository,
ArtifactRepository remoteRepository )
public void storeInLocalRepository( ArtifactRepository localRepository, ArtifactRepository remoteRepository )
throws RepositoryMetadataStoreException
{
try
@ -74,8 +72,7 @@ public abstract class AbstractRepositoryMetadata
}
}
protected void updateRepositoryMetadata( ArtifactRepository localRepository,
ArtifactRepository remoteRepository )
protected void updateRepositoryMetadata( ArtifactRepository localRepository, ArtifactRepository remoteRepository )
throws IOException, XmlPullParserException
{
MetadataXpp3Reader mappingReader = new MetadataXpp3Reader();
@ -104,18 +101,10 @@ public abstract class AbstractRepositoryMetadata
}
else if ( metadataFile.exists() )
{
Reader reader = null;
try
try ( Reader reader = ReaderFactory.newXmlReader( metadataFile ) )
{
reader = ReaderFactory.newXmlReader( metadataFile );
metadata = mappingReader.read( reader, false );
}
finally
{
IOUtil.close( reader );
}
}
boolean changed;
@ -142,21 +131,14 @@ public abstract class AbstractRepositoryMetadata
}
if ( changed || !metadataFile.exists() )
{
Writer writer = null;
try
{
metadataFile.getParentFile().mkdirs();
writer = WriterFactory.newXmlWriter( metadataFile );
try ( Writer writer = WriterFactory.newXmlWriter( metadataFile ) )
{
MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer();
mappingWriter.write( writer, metadata );
}
finally
{
IOUtil.close( writer );
}
}
else
{
@ -169,8 +151,7 @@ public abstract class AbstractRepositoryMetadata
return "repository metadata for: \'" + getKey() + "\'";
}
protected static Metadata createMetadata( Artifact artifact,
Versioning versioning )
protected static Metadata createMetadata( Artifact artifact, Versioning versioning )
{
Metadata metadata = new Metadata();
metadata.setGroupId( artifact.getGroupId() );
@ -200,14 +181,16 @@ public abstract class AbstractRepositoryMetadata
public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
{
// TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact replaces?
// TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact
// replaces?
AbstractRepositoryMetadata repoMetadata = (AbstractRepositoryMetadata) metadata;
this.metadata.merge( repoMetadata.getMetadata() );
}
public void merge( ArtifactMetadata metadata )
{
// TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact replaces?
// TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact
// replaces?
AbstractRepositoryMetadata repoMetadata = (AbstractRepositoryMetadata) metadata;
this.metadata.merge( repoMetadata.getMetadata() );
}

20
maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
View File

@ -19,6 +19,11 @@ package org.apache.maven.extension.internal;
* under the License.
*/
import com.google.common.collect.ImmutableSet;
import org.apache.maven.project.ExtensionDescriptor;
import org.apache.maven.project.ExtensionDescriptorBuilder;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@ -28,13 +33,6 @@ import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.Set;
import org.apache.maven.project.ExtensionDescriptor;
import org.apache.maven.project.ExtensionDescriptorBuilder;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.util.IOUtil;
import com.google.common.collect.ImmutableSet;
/**
* Provides information about artifacts (identified by groupId:artifactId string key) and classpath elements exported by
* Maven core itself or a Maven core extension.
@ -92,17 +90,13 @@ public class CoreExtensionEntry
Enumeration<URL> urls = loader.getResources( builder.getExtensionDescriptorLocation() );
while ( urls.hasMoreElements() )
{
InputStream is = urls.nextElement().openStream();
try
try ( InputStream is = urls.nextElement().openStream() )
{
ExtensionDescriptor descriptor = builder.build( is );
artifacts.addAll( descriptor.getExportedArtifacts() );
packages.addAll( descriptor.getExportedPackages() );
}
finally
{
IOUtil.close( is );
}
}
}
catch ( IOException ignored )

37
maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
View File

@ -19,15 +19,6 @@ package org.apache.maven.internal.aether;
* under the License.
*/
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.bridge.MavenRepositorySystem;
@ -43,7 +34,6 @@ import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.apache.maven.settings.crypto.SettingsDecryptionResult;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.aether.ConfigurationProperties;
import org.eclipse.aether.DefaultRepositorySystemSession;
@ -61,6 +51,14 @@ import org.eclipse.aether.util.repository.DefaultProxySelector;
import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy;
import org.eclipse.sisu.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
/**
* @since 3.3.0
*/
@ -125,8 +123,8 @@ public class DefaultRepositorySystemSessionFactory
int errorPolicy = 0;
errorPolicy |= request.isCacheNotFound() ? ResolutionErrorPolicy.CACHE_NOT_FOUND : 0;
errorPolicy |= request.isCacheTransferError() ? ResolutionErrorPolicy.CACHE_TRANSFER_ERROR : 0;
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( errorPolicy, errorPolicy
| ResolutionErrorPolicy.CACHE_NOT_FOUND ) );
session.setResolutionErrorPolicy(
new SimpleResolutionErrorPolicy( errorPolicy, errorPolicy | ResolutionErrorPolicy.CACHE_NOT_FOUND ) );
session.setArtifactTypeRegistry( RepositoryUtils.newArtifactTypeRegistry( artifactHandlerManager ) );
@ -187,9 +185,9 @@ public class DefaultRepositorySystemSessionFactory
{
AuthenticationBuilder authBuilder = new AuthenticationBuilder();
authBuilder.addUsername( proxy.getUsername() ).addPassword( proxy.getPassword() );
proxySelector.add( new org.eclipse.aether.repository.Proxy( proxy.getProtocol(), proxy.getHost(),
proxy.getPort(), authBuilder.build() ),
proxy.getNonProxyHosts() );
proxySelector.add(
new org.eclipse.aether.repository.Proxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(),
authBuilder.build() ), proxy.getNonProxyHosts() );
}
session.setProxySelector( proxySelector );
@ -251,19 +249,18 @@ public class DefaultRepositorySystemSessionFactory
{
Properties props = new Properties();
InputStream is = getClass().getResourceAsStream( "/META-INF/maven/org.apache.maven/maven-core/pom.properties" );
try ( InputStream is = getClass().getResourceAsStream(
"/META-INF/maven/org.apache.maven/maven-core/pom.properties" ) )
{
if ( is != null )
{
try
{
props.load( is );
}
}
catch ( IOException e )
{
logger.debug( "Failed to read Maven version", e );
}
IOUtil.close( is );
}
return props.getProperty( "version", "unknown-version" );
}

113
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
View File

@ -19,24 +19,6 @@ package org.apache.maven.plugin.internal;
* under the License.
*/
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.classrealm.ClassRealmManager;
@ -96,7 +78,6 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@ -107,13 +88,31 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
/**
* Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such
* that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build
* plugins as well as special purpose plugins like reports.
*
* @since 3.0
* @author Benjamin Bentmann
* @since 3.0
*/
@Component( role = MavenPluginManager.class )
public class DefaultMavenPluginManager
@ -227,15 +226,10 @@ public class DefaultMavenPluginManager
if ( pluginXml.isFile() )
{
InputStream is = new BufferedInputStream( new FileInputStream( pluginXml ) );
try
try ( InputStream is = new BufferedInputStream( new FileInputStream( pluginXml ) ) )
{
pluginDescriptor = parsePluginDescriptor( is, plugin, pluginXml.getAbsolutePath() );
}
finally
{
IOUtil.close( is );
}
}
}
@ -255,8 +249,8 @@ public class DefaultMavenPluginManager
if ( validator.hasErrors() )
{
throw new InvalidPluginDescriptorException( "Invalid plugin descriptor for " + plugin.getId() + " ("
+ pluginFile + ")", validator.getErrors() );
throw new InvalidPluginDescriptorException(
"Invalid plugin descriptor for " + plugin.getId() + " (" + pluginFile + ")", validator.getErrors() );
}
pluginDescriptor.setPluginArtifact( pluginArtifact );
@ -317,8 +311,9 @@ public class DefaultMavenPluginManager
{
if ( !runtimeInformation.isMavenVersion( requiredMavenVersion ) )
{
throw new PluginIncompatibleException( pluginDescriptor.getPlugin(), "The plugin "
+ pluginDescriptor.getId() + " requires Maven version " + requiredMavenVersion );
throw new PluginIncompatibleException( pluginDescriptor.getPlugin(),
"The plugin " + pluginDescriptor.getId()
+ " requires Maven version " + requiredMavenVersion );
}
}
catch ( RuntimeException e )
@ -365,9 +360,9 @@ public class DefaultMavenPluginManager
{
Map<String, ClassLoader> foreignImports = calcImports( project, parent, imports );
PluginRealmCache.Key cacheKey =
pluginRealmCache.createKey( plugin, parent, foreignImports, filter,
project.getRemotePluginRepositories(), session.getRepositorySession() );
PluginRealmCache.Key cacheKey = pluginRealmCache.createKey( plugin, parent, foreignImports, filter,
project.getRemotePluginRepositories(),
session.getRepositorySession() );
PluginRealmCache.CacheRecord cacheRecord = pluginRealmCache.get( cacheKey );
@ -420,17 +415,15 @@ public class DefaultMavenPluginManager
dependencyFilter = AndDependencyFilter.newInstance( dependencyFilter, filter );
DependencyNode root =
pluginDependenciesResolver.resolve( plugin, RepositoryUtils.toArtifact( pluginArtifact ),
dependencyFilter, project.getRemotePluginRepositories(),
repositorySession );
pluginDependenciesResolver.resolve( plugin, RepositoryUtils.toArtifact( pluginArtifact ), dependencyFilter,
project.getRemotePluginRepositories(), repositorySession );
PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
root.accept( nlg );
pluginArtifacts = toMavenArtifacts( root, nlg );
pluginRealm =
classRealmManager.createPluginRealm( plugin, parent, null, foreignImports,
pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, foreignImports,
toAetherArtifacts( pluginArtifacts ) );
discoverPluginComponents( pluginRealm, plugin, pluginDescriptor );
@ -454,19 +447,20 @@ public class DefaultMavenPluginManager
}
}
( (DefaultPlexusContainer) container ).discoverComponents( pluginRealm,
new SessionScopeModule( container ),
( (DefaultPlexusContainer) container ).discoverComponents( pluginRealm, new SessionScopeModule( container ),
new MojoExecutionScopeModule( container ) );
}
catch ( ComponentLookupException e )
{
throw new PluginContainerException( plugin, pluginRealm, "Error in component graph of plugin "
+ plugin.getId() + ": " + e.getMessage(), e );
throw new PluginContainerException( plugin, pluginRealm,
"Error in component graph of plugin " + plugin.getId() + ": "
+ e.getMessage(), e );
}
catch ( CycleDetectedInComponentGraphException e )
{
throw new PluginContainerException( plugin, pluginRealm, "Error in component graph of plugin "
+ plugin.getId() + ": " + e.getMessage(), e );
throw new PluginContainerException( plugin, pluginRealm,
"Error in component graph of plugin " + plugin.getId() + ": "
+ e.getMessage(), e );
}
}
@ -559,7 +553,8 @@ public class DefaultMavenPluginManager
ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
PrintStream ps = new PrintStream( os );
ps.println( "Unable to load the mojo '" + mojoDescriptor.getGoal() + "' in the plugin '"
+ pluginDescriptor.getId() + "'. A required class is missing: " + cause.getMessage() );
+ pluginDescriptor.getId() + "'. A required class is missing: "
+ cause.getMessage() );
pluginRealm.display( ps );
throw new PluginContainerException( mojoDescriptor, pluginRealm, os.toString(), cause );
@ -569,15 +564,16 @@ public class DefaultMavenPluginManager
ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
PrintStream ps = new PrintStream( os );
ps.println( "Unable to load the mojo '" + mojoDescriptor.getGoal() + "' in the plugin '"
+ pluginDescriptor.getId() + "' due to an API incompatibility: " + e.getClass().getName()
+ ": " + cause.getMessage() );
+ pluginDescriptor.getId() + "' due to an API incompatibility: "
+ e.getClass().getName() + ": " + cause.getMessage() );
pluginRealm.display( ps );
throw new PluginContainerException( mojoDescriptor, pluginRealm, os.toString(), cause );
}
throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to load the mojo '"
+ mojoDescriptor.getGoal() + "' (or one of its required components) from the plugin '"
throw new PluginContainerException( mojoDescriptor, pluginRealm,
"Unable to load the mojo '" + mojoDescriptor.getGoal()
+ "' (or one of its required components) from the plugin '"
+ pluginDescriptor.getId() + "'", e );
}
@ -653,8 +649,8 @@ public class DefaultMavenPluginManager
ValidatingConfigurationListener validator =
new ValidatingConfigurationListener( mojo, mojoDescriptor, listener );
logger.debug( "Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId
+ " configurator -->" );
logger.debug(
"Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId + " configurator -->" );
configurator.configureComponent( mojo, configuration, expressionEvaluator, pluginRealm, validator );
@ -708,8 +704,9 @@ public class DefaultMavenPluginManager
{
ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
PrintStream ps = new PrintStream( os );
ps.println( "An API incompatibility was encountered during configuration of mojo " + mojoDescriptor.getId()
+ ": " + e.getClass().getName() + ": " + e.getMessage() );
ps.println(
"An API incompatibility was encountered during configuration of mojo " + mojoDescriptor.getId() + ": "
+ e.getClass().getName() + ": " + e.getMessage() );
pluginRealm.display( ps );
throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), os.toString(), e );
@ -766,8 +763,7 @@ public class DefaultMavenPluginManager
}
catch ( ExpressionEvaluationException e )
{
String msg =
"Error evaluating the expression '" + expression + "' for configuration value '"
String msg = "Error evaluating the expression '" + expression + "' for configuration value '"
+ configuration.getName() + "'";
throw new ComponentConfigurationException( configuration, msg, e );
}
@ -811,8 +807,7 @@ public class DefaultMavenPluginManager
RepositorySystemSession session )
throws PluginManagerException
{
@SuppressWarnings( "unchecked" )
Map<String, ExtensionRealmCache.CacheRecord> pluginRealms =
@SuppressWarnings( "unchecked" ) Map<String, ExtensionRealmCache.CacheRecord> pluginRealms =
(Map<String, ExtensionRealmCache.CacheRecord>) project.getContextValue( KEY_EXTENSIONS_REALMS );
if ( pluginRealms == null )
{
@ -881,8 +876,8 @@ public class DefaultMavenPluginManager
extensionRecord = extensionRealmCache.get( extensionKey );
if ( extensionRecord == null )
{
ClassRealm extensionRealm = classRealmManager.createExtensionRealm( plugin,
toAetherArtifacts( artifacts ) );
ClassRealm extensionRealm =
classRealmManager.createExtensionRealm( plugin, toAetherArtifacts( artifacts ) );
// TODO figure out how to use the same PluginDescriptor when running mojos

16
maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
View File

@ -19,7 +19,6 @@ package org.apache.maven.project;
* under the License.
*/
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@ -71,16 +70,10 @@ public class ExtensionDescriptorBuilder
if ( pluginDescriptorEntry != null )
{
InputStream is = pluginJar.getInputStream( pluginDescriptorEntry );
try
try ( InputStream is = pluginJar.getInputStream( pluginDescriptorEntry ) )
{
extensionDescriptor = build( is );
}
finally
{
IOUtil.close( is );
}
}
}
}
@ -90,15 +83,10 @@ public class ExtensionDescriptorBuilder
if ( pluginXml.canRead() )
{
InputStream is = new BufferedInputStream( new FileInputStream( pluginXml ) );
try
try ( InputStream is = new BufferedInputStream( new FileInputStream( pluginXml ) ) )
{
extensionDescriptor = build( is );
}
finally
{
IOUtil.close( is );
}
}
}

15
maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
View File

@ -19,14 +19,14 @@ package org.apache.maven.project;
* under the License.
*/
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemUtils;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemUtils;
/**
* @author Jason van Zyl
*/
@ -122,9 +122,11 @@ public class ProjectBuildingException
private static String createMessage( List<ProjectBuildingResult> results )
{
StringWriter buffer = new StringWriter( 1024 );
PrintWriter writer = new PrintWriter( buffer );
writer.println( "Some problems were encountered while processing the POMs:" );
try
{
for ( ProjectBuildingResult result : results )
{
for ( ModelProblem problem : result.getProblems() )
@ -137,8 +139,11 @@ public class ProjectBuildingException
writer.println( ModelProblemUtils.formatLocation( problem, result.getProjectId() ) );
}
}
}
finally
{
writer.close();
}
return buffer.toString();
}

30
maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
View File

@ -19,15 +19,10 @@ package org.apache.maven.rtinfo.internal;
* under the License.
*/
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.InvalidVersionSpecificationException;
@ -35,6 +30,10 @@ import org.eclipse.aether.version.Version;
import org.eclipse.aether.version.VersionConstraint;
import org.eclipse.aether.version.VersionScheme;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
/**
* Provides information about the current Maven runtime.
*/
@ -56,13 +55,18 @@ public class DefaultRuntimeInformation
String resource = "META-INF/maven/org.apache.maven/maven-core/pom.properties";
InputStream is = DefaultRuntimeInformation.class.getResourceAsStream( "/" + resource );
try ( InputStream is = DefaultRuntimeInformation.class.getResourceAsStream( "/" + resource ) )
{
if ( is != null )
{
try
{
props.load( is );
}
else
{
logger.warn(
"Could not locate " + resource + " on classpath, Maven runtime information not available" );
}
}
catch ( IOException e )
{
String msg = "Could not parse " + resource + ", Maven runtime information not available";
@ -75,16 +79,6 @@ public class DefaultRuntimeInformation
logger.warn( msg );
}
}
finally
{
IOUtil.close( is );
}
}
else
{
logger.warn( "Could not locate " + resource
+ " on classpath, Maven runtime information not available" );
}
String version = props.getProperty( "version", "" ).trim();

21
maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
View File

@ -19,20 +19,18 @@ package org.apache.maven.toolchain;
* under the License.
*/
import java.io.File;
import java.io.Reader;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
import java.io.Reader;
/**
* @author Benjamin Bentmann
*
* @deprecated instead use {@link org.apache.maven.toolchain.building.DefaultToolchainsBuilder}
*/
@Deprecated
@ -51,21 +49,16 @@ public class DefaultToolchainsBuilder
if ( userToolchainsFile != null && userToolchainsFile.isFile() )
{
Reader in = null;
try
try ( Reader in = ReaderFactory.newXmlReader( userToolchainsFile ) )
{
in = ReaderFactory.newXmlReader( userToolchainsFile );
toolchains = new MavenToolchainsXpp3Reader().read( in );
}
catch ( Exception e )
{
throw new MisconfiguredToolchainException( "Cannot read toolchains file at "
+ userToolchainsFile.getAbsolutePath(), e );
}
finally
{
IOUtil.close( in );
throw new MisconfiguredToolchainException(
"Cannot read toolchains file at " + userToolchainsFile.getAbsolutePath(), e );
}
}
else if ( userToolchainsFile != null )
{

45
maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
View File

@ -19,10 +19,6 @@ package org.apache.maven.settings;
* under the License.
*/
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuilder;
@ -36,13 +32,16 @@ import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
public class PomConstructionWithSettingsTest
extends PlexusTestCase
{
@ -81,14 +80,18 @@ public class PomConstructionWithSettingsTest
super.tearDown();
}
public void testSettingsNoPom() throws Exception
public void testSettingsNoPom()
throws Exception
{
PomTestWrapper pom = buildPom( "settings-no-pom" );
assertEquals( "local-profile-prop-value", pom.getValue( "properties/local-profile-prop" ) );
}
/**MNG-4107 */
public void testPomAndSettingsInterpolation() throws Exception
/**
* MNG-4107
*/
public void testPomAndSettingsInterpolation()
throws Exception
{
PomTestWrapper pom = buildPom( "test-pom-and-settings-interpolation" );
assertEquals( "applied", pom.getValue( "properties/settingsProfile" ) );
@ -97,8 +100,11 @@ public class PomConstructionWithSettingsTest
assertEquals( "settings", pom.getValue( "properties/pomVsSettingsInterpolated" ) );
}
/**MNG-4107 */
public void testRepositories() throws Exception
/**
* MNG-4107
*/
public void testRepositories()
throws Exception
{
PomTestWrapper pom = buildPom( "repositories" );
assertEquals( "maven-core-it-0", pom.getValue( "repositories[1]/id" ) );
@ -122,13 +128,15 @@ public class PomConstructionWithSettingsTest
String localRepoUrl =
System.getProperty( "maven.repo.local", System.getProperty( "user.home" ) + "/.m2/repository" );
localRepoUrl = "file://" + localRepoUrl;
config.setLocalRepository( repositorySystem.createArtifactRepository( "local", localRepoUrl,
new DefaultRepositoryLayout(), null, null ) );
config.setLocalRepository(
repositorySystem.createArtifactRepository( "local", localRepoUrl, new DefaultRepositoryLayout(), null,
null ) );
config.setActiveProfileIds( settings.getActiveProfiles() );
DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession();
LocalRepository localRepo = new LocalRepository( config.getLocalRepository().getBasedir() );
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) );
repoSession.setLocalRepositoryManager(
new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) );
config.setRepositorySession( repoSession );
return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() );
@ -139,21 +147,12 @@ public class PomConstructionWithSettingsTest
{
Settings settings = null;
Reader reader = null;
try
try ( Reader reader = ReaderFactory.newXmlReader( settingsFile ) )
{
reader = ReaderFactory.newXmlReader( settingsFile );
SettingsXpp3Reader modelReader = new SettingsXpp3Reader();
settings = modelReader.read( reader );
}
finally
{
IOUtil.close( reader );
}
return settings;
}
}

36
maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
View File

@ -19,25 +19,24 @@ 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
@ -46,7 +45,8 @@ public class DefaultToolchainTest
private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
@Before
public void setUp() throws Exception
public void setUp()
throws Exception
{
MockitoAnnotations.initMocks( this );
}
@ -129,15 +129,12 @@ public class DefaultToolchainTest
@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 );
}
}
}

81
maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
View File

@ -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();
@ -48,15 +47,12 @@ public class MavenToolchainMergerTest
}
@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() );
@ -64,22 +60,15 @@ public class MavenToolchainMergerTest
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() );
@ -88,17 +77,9 @@ public class MavenToolchainMergerTest
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() );
@ -108,23 +89,15 @@ public class MavenToolchainMergerTest
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() );
@ -139,17 +112,9 @@ 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() );
@ -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 );
}
}
}

29
maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
View File

@ -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;
}

137
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -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
{
@ -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() );
@ -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,14 +841,15 @@ 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 );
}
}
private int execute( CliRequest cliRequest ) throws MavenExecutionRequestPopulationException
private int execute( CliRequest cliRequest )
throws MavenExecutionRequestPopulationException
{
MavenExecutionRequest request = executionRequestPopulator.populateDefaults( cliRequest.request );
@ -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() );
}
@ -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 );
@ -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 );
}

29
maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
View File

@ -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" );
control = new InputStreamReader( new FileInputStream( expected ), "UTF-8" );
test = new InputStreamReader( new FileInputStream( actual ), "UTF-8" );
try ( Reader control = new InputStreamReader( new FileInputStream( expected ), "UTF-8" );
Reader 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 );
}
}
}

40
maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
View File

@ -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
{
@ -316,7 +316,8 @@ public class PluginDescriptor
public Set<Artifact> getIntroducedDependencyArtifacts()
{
return ( introducedDependencyArtifacts != null ) ? introducedDependencyArtifacts
return ( introducedDependencyArtifacts != null )
? introducedDependencyArtifacts
: Collections.<Artifact>emptySet();
}
@ -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<>();