You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/25 20:02:45 UTC
svn commit: r1517354 [1/4] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antrun...
Author: krosenvold
Date: Sun Aug 25 18:02:43 2013
New Revision: 1517354
URL: http://svn.apache.org/r1517354
Log:
Oh, look at that button. Does that convert everything to correct java5 ??
<3 IntelliJ Idea. Don't leave home without it !
Modified:
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/analyze/TestAnalyzeDuplicateMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependencies2ProjectStub.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/DuplicateDependenciesProjectStub.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/tree/TestTreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/utils/JarContentChecker.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReportGenerator.java
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Modified: maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java (original)
+++ maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java Sun Aug 25 18:02:43 2013
@@ -183,7 +183,7 @@ public class AcrMojo
if ( excludes != null && !excludes.isEmpty() )
{
excludes.add( APP_CLIENT_XML );
- mainJarExcludes = excludes.toArray( EMPTY_STRING_ARRAY );
+ mainJarExcludes = excludes.toArray(new String[excludes.size()]);
}
if ( !outputDirectory.exists() )
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Sun Aug 25 18:02:43 2013
@@ -160,7 +160,8 @@ public class AntBuildWriter
// src/main/java
if ( !project.getCompileSourceRoots().isEmpty() )
{
- String[] compileSourceRoots = (String[]) project.getCompileSourceRoots().toArray( new String[0] );
+ List var = project.getCompileSourceRoots();
+ String[] compileSourceRoots = (String[]) var.toArray(new String[var.size()]);
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
addProperty( properties, "maven.build.srcDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
@@ -170,7 +171,8 @@ public class AntBuildWriter
// src/main/resources
if ( project.getBuild().getResources() != null )
{
- Resource[] array = (Resource[]) project.getBuild().getResources().toArray( new Resource[0] );
+ List<Resource> var = project.getBuild().getResources();
+ Resource[] array = (Resource[]) var.toArray(new Resource[var.size()]);
for ( int i = 0; i < array.length; i++ )
{
addProperty( properties, "maven.build.resourceDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
@@ -185,7 +187,8 @@ public class AntBuildWriter
// src/test/java
if ( !project.getTestCompileSourceRoots().isEmpty() )
{
- String[] compileSourceRoots = (String[]) project.getTestCompileSourceRoots().toArray( new String[0] );
+ List var = project.getTestCompileSourceRoots();
+ String[] compileSourceRoots = (String[]) var.toArray(new String[var.size()]);
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
addProperty( properties, "maven.build.testDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
@@ -195,7 +198,8 @@ public class AntBuildWriter
// src/test/resources
if ( project.getBuild().getTestResources() != null )
{
- Resource[] array = (Resource[]) project.getBuild().getTestResources().toArray( new Resource[0] );
+ List<Resource> var = project.getBuild().getTestResources();
+ Resource[] array = (Resource[]) var.toArray(new Resource[var.size()]);
for ( int i = 0; i < array.length; i++ )
{
addProperty( properties, "maven.build.testResourceDir." + i, AntBuildWriterUtil
@@ -221,10 +225,9 @@ public class AntBuildWriter
if ( project.getProperties() != null )
{
- for ( Iterator it = project.getProperties().entrySet().iterator(); it.hasNext(); )
- {
- Map.Entry property = (Map.Entry) it.next();
- addProperty( properties, property.getKey().toString(), property.getValue().toString() );
+ for (Map.Entry<Object, Object> objectObjectEntry : project.getProperties().entrySet()) {
+ Map.Entry property = (Map.Entry) objectObjectEntry;
+ addProperty(properties, property.getKey().toString(), property.getValue().toString());
}
}
@@ -602,22 +605,18 @@ public class AntBuildWriter
writer.startElement( "path" );
writer.addAttribute( "id", id );
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
- {
- Artifact artifact = (Artifact) i.next();
+ for (Object artifact1 : artifacts) {
+ Artifact artifact = (Artifact) artifact1;
- writer.startElement( "pathelement" );
+ writer.startElement("pathelement");
String path;
- if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
- {
- path = getUninterpolatedSystemPath( artifact );
- }
- else
- {
- path = "${maven.repo.local}/" + artifactResolverWrapper.getLocalArtifactPath( artifact );
+ if (Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) {
+ path = getUninterpolatedSystemPath(artifact);
+ } else {
+ path = "${maven.repo.local}/" + artifactResolverWrapper.getLocalArtifactPath(artifact);
}
- writer.addAttribute( "location", path );
+ writer.addAttribute("location", path);
writer.endElement(); // pathelement
}
@@ -629,23 +628,16 @@ public class AntBuildWriter
{
String managementKey = artifact.getDependencyConflictId();
- for ( Iterator it = project.getOriginalModel().getDependencies().iterator(); it.hasNext(); )
- {
- Dependency dependency = (Dependency) it.next();
- if ( managementKey.equals( dependency.getManagementKey() ) )
- {
+ for (Dependency dependency : project.getOriginalModel().getDependencies()) {
+ if (managementKey.equals(dependency.getManagementKey())) {
return dependency.getSystemPath();
}
}
- for ( Iterator itp = project.getOriginalModel().getProfiles().iterator(); itp.hasNext(); )
- {
- Profile profile = (Profile) itp.next();
- for ( Iterator it = profile.getDependencies().iterator(); it.hasNext(); )
- {
+ for (Profile profile : project.getOriginalModel().getProfiles()) {
+ for (Iterator it = profile.getDependencies().iterator(); it.hasNext(); ) {
Dependency dependency = (Dependency) it.next();
- if ( managementKey.equals( dependency.getManagementKey() ) )
- {
+ if (managementKey.equals(dependency.getManagementKey())) {
return dependency.getSystemPath();
}
}
@@ -660,13 +652,11 @@ public class AntBuildWriter
props.put( "basedir", project.getBasedir().getAbsolutePath() );
SortedMap candidateProperties = new TreeMap();
- for ( Iterator it = props.keySet().iterator(); it.hasNext(); )
- {
- String key = (String) it.next();
- String value = new File( props.getProperty( key ) ).getPath();
- if ( path.startsWith( value ) && value.length() > 0 )
- {
- candidateProperties.put( value, key );
+ for (Object o : props.keySet()) {
+ String key = (String) o;
+ String value = new File(props.getProperty(key)).getPath();
+ if (path.startsWith(value) && value.length() > 0) {
+ candidateProperties.put(value, key);
}
}
if ( !candidateProperties.isEmpty() )
@@ -698,10 +688,9 @@ public class AntBuildWriter
{
if ( project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "clean" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "clean");
}
}
}
@@ -736,10 +725,9 @@ public class AntBuildWriter
writer.addAttribute( "description", "Compile the code" );
if ( project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "compile" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "compile");
}
}
writer.endElement(); // target
@@ -779,10 +767,9 @@ public class AntBuildWriter
writer.addAttribute( "description", "Compile the test code" );
if ( project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "compile-tests" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "compile-tests");
}
}
writer.endElement(); // target
@@ -822,10 +809,9 @@ public class AntBuildWriter
writer.addAttribute( "description", "Run the test cases" );
if ( project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "test" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "test");
}
}
writer.endElement(); // target
@@ -1040,10 +1026,9 @@ public class AntBuildWriter
{
if ( project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "javadoc" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "javadoc");
}
}
}
@@ -1082,10 +1067,9 @@ public class AntBuildWriter
{
if ( project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "package" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "package");
}
}
}
@@ -1306,54 +1290,45 @@ public class AntBuildWriter
String basedir = project.getBasedir().getAbsolutePath();
// TODO: proxy - probably better to use wagon!
- for ( Iterator i = project.getTestArtifacts().iterator(); i.hasNext(); )
- {
- Artifact artifact = (Artifact) i.next();
+ for (Object o : project.getTestArtifacts()) {
+ Artifact artifact = (Artifact) o;
- if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
- {
+ if (Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) {
continue;
}
- String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
+ String path = artifactResolverWrapper.getLocalArtifactPath(artifact);
- if ( !new File( path ).exists() )
- {
- File parentDirs = new File( path ).getParentFile();
- if ( parentDirs != null )
- {
- writer.startElement( "mkdir" );
+ if (!new File(path).exists()) {
+ File parentDirs = new File(path).getParentFile();
+ if (parentDirs != null) {
+ writer.startElement("mkdir");
// Replace \ with / in the parent dir path
- writer.addAttribute( "dir", "${maven.repo.local}/" + parentDirs.getPath().replace( '\\', '/' ) );
+ writer.addAttribute("dir", "${maven.repo.local}/" + parentDirs.getPath().replace('\\', '/'));
writer.endElement(); // mkdir
}
- for ( Iterator j = project.getRepositories().iterator(); j.hasNext(); )
- {
+ for (Iterator j = project.getRepositories().iterator(); j.hasNext(); ) {
Repository repository = (Repository) j.next();
String url = repository.getUrl();
- String localDir = getProjectRepoDirectory( url, basedir );
- if ( localDir != null )
- {
- if ( localDir.length() > 0 && !localDir.endsWith( "/" ) )
- {
+ String localDir = getProjectRepoDirectory(url, basedir);
+ if (localDir != null) {
+ if (localDir.length() > 0 && !localDir.endsWith("/")) {
localDir += '/';
}
- writer.startElement( "copy" );
- writer.addAttribute( "file", localDir + path );
- AntBuildWriterUtil.addWrapAttribute( writer, "copy", "tofile", "${maven.repo.local}/" + path, 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "copy", "failonerror", "false", 3 );
+ writer.startElement("copy");
+ writer.addAttribute("file", localDir + path);
+ AntBuildWriterUtil.addWrapAttribute(writer, "copy", "tofile", "${maven.repo.local}/" + path, 3);
+ AntBuildWriterUtil.addWrapAttribute(writer, "copy", "failonerror", "false", 3);
writer.endElement(); // copy
- }
- else
- {
- writer.startElement( "get" );
- writer.addAttribute( "src", url + '/' + path );
- AntBuildWriterUtil.addWrapAttribute( writer, "get", "dest", "${maven.repo.local}/" + path, 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "get", "usetimestamp", "false", 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "get", "ignoreerrors", "true", 3 );
+ } else {
+ writer.startElement("get");
+ writer.addAttribute("src", url + '/' + path);
+ AntBuildWriterUtil.addWrapAttribute(writer, "get", "dest", "${maven.repo.local}/" + path, 3);
+ AntBuildWriterUtil.addWrapAttribute(writer, "get", "usetimestamp", "false", 3);
+ AntBuildWriterUtil.addWrapAttribute(writer, "get", "ignoreerrors", "true", 3);
writer.endElement(); // get
}
}
@@ -1489,10 +1464,8 @@ public class AntBuildWriter
List list = new ArrayList();
if ( options != null && options.length > 0 )
{
- for ( int i = 0; i < options.length; i++ )
- {
- Map option = options[i];
- list.addAll( option.values() );
+ for (Map option : options) {
+ list.addAll(option.values());
}
}
return list;
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java Sun Aug 25 18:02:43 2013
@@ -64,12 +64,10 @@ public class AntBuildWriterUtil
if ( compileSourceRoots != null )
{
// copy as I may be modifying it
- for ( Iterator i = compileSourceRoots.iterator(); i.hasNext(); )
- {
- String srcDir = (String) i.next();
- if ( new File( srcDir ).exists() )
- {
- newCompileSourceRootsList.add( srcDir );
+ for (Object compileSourceRoot : compileSourceRoots) {
+ String srcDir = (String) compileSourceRoot;
+ if (new File(srcDir).exists()) {
+ newCompileSourceRootsList.add(srcDir);
}
}
}
@@ -88,21 +86,19 @@ public class AntBuildWriterUtil
{
if ( includes != null )
{
- for ( Iterator i = includes.iterator(); i.hasNext(); )
- {
- String include = (String) i.next();
- writer.startElement( "include" );
- writer.addAttribute( "name", include );
+ for (Object include1 : includes) {
+ String include = (String) include1;
+ writer.startElement("include");
+ writer.addAttribute("name", include);
writer.endElement(); // include
}
}
if ( excludes != null )
{
- for ( Iterator i = excludes.iterator(); i.hasNext(); )
- {
- String exclude = (String) i.next();
- writer.startElement( "exclude" );
- writer.addAttribute( "name", exclude );
+ for (Object exclude1 : excludes) {
+ String exclude = (String) exclude1;
+ writer.startElement("exclude");
+ writer.addAttribute("name", exclude);
writer.endElement(); // exclude
}
}
@@ -173,13 +169,11 @@ public class AntBuildWriterUtil
throws IOException
{
List sources = new ArrayList();
- for ( Iterator it = project.getCompileSourceRoots().iterator(); it.hasNext(); )
- {
- String source = (String) it.next();
+ for (Object o : project.getCompileSourceRoots()) {
+ String source = (String) o;
- if ( new File( source ).exists() )
- {
- sources.add( source );
+ if (new File(source).exists()) {
+ sources.add(source);
}
}
@@ -307,10 +301,9 @@ public class AntBuildWriterUtil
Map[] links = getMavenJavadocPluginOptions( project, "links", null );
if ( links != null )
{
- for ( int i = 0; i < links.length; i++ )
- {
- writer.startElement( "link" );
- writer.addAttribute( "href", (String) links[i].get( "link" ) );
+ for (Map link : links) {
+ writer.startElement("link");
+ writer.addAttribute("href", (String) link.get("link"));
writer.endElement(); // link
}
}
@@ -318,11 +311,10 @@ public class AntBuildWriterUtil
Map[] offlineLinks = getMavenJavadocPluginOptions( project, "offlineLinks", null );
if ( offlineLinks != null )
{
- for ( int i = 0; i < offlineLinks.length; i++ )
- {
- writer.startElement( "link" );
- writer.addAttribute( "href", (String) offlineLinks[i].get( "url" ) );
- addWrapAttribute( writer, "javadoc", "offline", "true", 4 );
+ for (Map offlineLink : offlineLinks) {
+ writer.startElement("link");
+ writer.addAttribute("href", (String) offlineLink.get("url"));
+ addWrapAttribute(writer, "javadoc", "offline", "true", 4);
writer.endElement(); // link
}
}
@@ -330,12 +322,11 @@ public class AntBuildWriterUtil
Map[] groups = getMavenJavadocPluginOptions( project, "groups", null );
if ( groups != null )
{
- for ( int i = 0; i < groups.length; i++ )
- {
- Map group = (Map) groups[i].get( "group" );
- writer.startElement( "group" );
- writer.addAttribute( "title", (String) group.get( "title" ) );
- addWrapAttribute( writer, "javadoc", "package", (String) group.get( "package" ), 4 );
+ for (Map group1 : groups) {
+ Map group = (Map) group1.get("group");
+ writer.startElement("group");
+ writer.addAttribute("title", (String) group.get("title"));
+ addWrapAttribute(writer, "javadoc", "package", (String) group.get("package"), 4);
writer.endElement(); // group
}
}
@@ -397,13 +388,12 @@ public class AntBuildWriterUtil
Map[] tags = getMavenJavadocPluginOptions( project, "tags", null );
if ( tags != null )
{
- for ( int i = 0; i < tags.length; i++ )
- {
- Map props = (Map) tags[i].get( "tag" );
- writer.startElement( "tag" );
- writer.addAttribute( "name", (String) props.get( "name" ) );
- addWrapAttribute( writer, "javadoc", "scope", (String) props.get( "placement" ), 4 );
- addWrapAttribute( writer, "javadoc", "description", (String) props.get( "head" ), 4 );
+ for (Map tag : tags) {
+ Map props = (Map) tag.get("tag");
+ writer.startElement("tag");
+ writer.addAttribute("name", (String) props.get("name"));
+ addWrapAttribute(writer, "javadoc", "scope", (String) props.get("placement"), 4);
+ addWrapAttribute(writer, "javadoc", "description", (String) props.get("head"), 4);
writer.endElement(); // tag
}
}
@@ -972,73 +962,59 @@ public class AntBuildWriterUtil
throws IOException
{
List plugins = new ArrayList();
- for ( Iterator it = project.getModel().getReporting().getPlugins().iterator(); it.hasNext(); )
- {
- plugins.add( it.next() );
+ for (ReportPlugin reportPlugin1 : project.getModel().getReporting().getPlugins()) {
+ plugins.add(reportPlugin1);
}
- for ( Iterator it = project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
- {
- plugins.add( it.next() );
+ for (Plugin plugin1 : project.getModel().getBuild().getPlugins()) {
+ plugins.add(plugin1);
}
if ( project.getBuild().getPluginManagement() != null )
{
- for ( Iterator it = project.getBuild().getPluginManagement().getPlugins().iterator(); it.hasNext(); )
- {
- plugins.add( it.next() );
+ for (Plugin plugin : project.getBuild().getPluginManagement().getPlugins()) {
+ plugins.add(plugin);
}
}
- for ( Iterator it = plugins.iterator(); it.hasNext(); )
- {
- Object next = it.next();
-
+ for (Object next : plugins) {
Object pluginConf = null;
- if ( next instanceof Plugin )
- {
+ if (next instanceof Plugin) {
Plugin plugin = (Plugin) next;
// using out-of-box Maven plugins
- if ( !( ( plugin.getGroupId().equals( "org.apache.maven.plugins" ) ) && ( plugin.getArtifactId()
- .equals( pluginArtifactId ) ) ) )
- {
+ if (!((plugin.getGroupId().equals("org.apache.maven.plugins")) && (plugin.getArtifactId()
+ .equals(pluginArtifactId)))) {
continue;
}
pluginConf = plugin.getConfiguration();
}
- if ( next instanceof ReportPlugin )
- {
+ if (next instanceof ReportPlugin) {
ReportPlugin reportPlugin = (ReportPlugin) next;
// using out-of-box Maven plugins
- if ( !( ( reportPlugin.getGroupId().equals( "org.apache.maven.plugins" ) ) && ( reportPlugin
- .getArtifactId().equals( pluginArtifactId ) ) ) )
- {
+ if (!((reportPlugin.getGroupId().equals("org.apache.maven.plugins")) && (reportPlugin
+ .getArtifactId().equals(pluginArtifactId)))) {
continue;
}
pluginConf = reportPlugin.getConfiguration();
}
- if ( pluginConf == null )
- {
+ if (pluginConf == null) {
continue;
}
- try
- {
+ try {
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
- .parse( new ByteArrayInputStream( pluginConf.toString().getBytes( "UTF-8" ) ) );
+ .parse(new ByteArrayInputStream(pluginConf.toString().getBytes("UTF-8")));
- NodeList nodeList = XPathAPI.eval( doc, "//configuration/" + optionName ).nodelist();
- if ( nodeList.getLength() > 0 )
- {
- Node optionNode = nodeList.item( 0 );
+ NodeList nodeList = XPathAPI.eval(doc, "//configuration/" + optionName).nodelist();
+ if (nodeList.getLength() > 0) {
+ Node optionNode = nodeList.item(0);
- if ( isList( optionNode ) )
- {
+ if (isList(optionNode)) {
/*
* <optionNames>
* <optionName>
@@ -1051,46 +1027,37 @@ public class AntBuildWriterUtil
List optionNames = new ArrayList();
NodeList childs = optionNode.getChildNodes();
- for ( int i = 0; i < childs.getLength(); i++ )
- {
- Node child = childs.item( i );
- if ( child.getNodeType() == Node.ELEMENT_NODE )
- {
+ for (int i = 0; i < childs.getLength(); i++) {
+ Node child = childs.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
Map option = new HashMap();
- if ( isElementContent( child ) )
- {
+ if (isElementContent(child)) {
Map properties = new HashMap();
NodeList childs2 = child.getChildNodes();
- if ( childs2.getLength() > 0 )
- {
- for ( int j = 0; j < childs2.getLength(); j++ )
- {
- Node child2 = childs2.item( j );
- if ( child2.getNodeType() == Node.ELEMENT_NODE )
- {
- properties.put( child2.getNodeName(), getTextContent( child2 ) );
+ if (childs2.getLength() > 0) {
+ for (int j = 0; j < childs2.getLength(); j++) {
+ Node child2 = childs2.item(j);
+ if (child2.getNodeType() == Node.ELEMENT_NODE) {
+ properties.put(child2.getNodeName(), getTextContent(child2));
}
}
- option.put( child.getNodeName(), properties );
+ option.put(child.getNodeName(), properties);
}
- }
- else
- {
- option.put( child.getNodeName(), getTextContent( child ) );
+ } else {
+ option.put(child.getNodeName(), getTextContent(child));
}
- optionNames.add( option );
+ optionNames.add(option);
}
}
- options.put( optionName, optionNames.toArray( new Map[0] ) );
+ options.put(optionName, optionNames.toArray(new Map[0]));
return options;
}
- if ( isElementContent( optionNode ) )
- {
+ if (isElementContent(optionNode)) {
/*
* <optionName>
* <param1>value1</param1>
@@ -1100,40 +1067,33 @@ public class AntBuildWriterUtil
Map option = new HashMap();
NodeList childs = optionNode.getChildNodes();
- if ( childs.getLength() > 1 )
- {
+ if (childs.getLength() > 1) {
Map parameters = new HashMap();
- for ( int i = 0; i < childs.getLength(); i++ )
- {
- Node child = childs.item( i );
- if ( child.getNodeType() == Node.ELEMENT_NODE )
- {
- parameters.put( child.getNodeName(), getTextContent( child ) );
+ for (int i = 0; i < childs.getLength(); i++) {
+ Node child = childs.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ parameters.put(child.getNodeName(), getTextContent(child));
}
}
- option.put( optionName, parameters );
+ option.put(optionName, parameters);
}
return option;
- }
- else
- {
+ } else {
/*
* <optionName>value1</optionName>
*/
Map option = new HashMap();
- option.put( optionName, getTextContent( optionNode ) );
+ option.put(optionName, getTextContent(optionNode));
return option;
}
}
- }
- catch ( Exception e )
- {
- throw new IOException( "Exception occured: " + e.getMessage() );
+ } catch (Exception e) {
+ throw new IOException("Exception occured: " + e.getMessage());
}
}
@@ -1161,22 +1121,19 @@ public class AntBuildWriterUtil
if ( project.getArtifacts() != null )
{
- for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
- {
- Artifact artifact = (Artifact) i.next();
+ for (Object o : project.getArtifacts()) {
+ Artifact artifact = (Artifact) o;
- if ( Artifact.SCOPE_COMPILE.equals( artifact.getScope() )
- || Artifact.SCOPE_RUNTIME.equals( artifact.getScope() ) )
- {
- String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
- if ( !new File( path ).isAbsolute() )
- {
+ if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())
+ || Artifact.SCOPE_RUNTIME.equals(artifact.getScope())) {
+ String path = artifactResolverWrapper.getLocalArtifactPath(artifact);
+ if (!new File(path).isAbsolute()) {
path = "${maven.repo.local}/" + path;
}
- writer.startElement( "copy" );
- writer.addAttribute( "file", path );
- addWrapAttribute( writer, "copy", "todir", outputDir, 3 );
+ writer.startElement("copy");
+ writer.addAttribute("file", path);
+ addWrapAttribute(writer, "copy", "todir", outputDir, 3);
writer.endElement(); // copy
}
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java Sun Aug 25 18:02:43 2013
@@ -56,7 +56,7 @@ public abstract class AbstractAntTestMav
File antTestDir = new File( PlexusTestCase.getBasedir() + "/src/test/resources/unit/" + getProjetPath() + "/" );
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
+ Model model;
try
{
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java Sun Aug 25 18:02:43 2013
@@ -50,27 +50,17 @@ public class SpecificScopesArtifactFilte
public SpecificScopesArtifactFilter( String scopes )
{
String [] scopeList = scopes.split( "," );
-
- for ( int i=0; i<scopeList.length; ++i )
- {
- if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_COMPILE) )
- {
+
+ for (String aScopeList : scopeList) {
+ if (aScopeList.trim().equals(DefaultArtifact.SCOPE_COMPILE)) {
compileScope = true;
- }
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_PROVIDED) )
- {
+ } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_PROVIDED)) {
providedScope = true;
- }
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_RUNTIME) )
- {
+ } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_RUNTIME)) {
runtimeScope = true;
- }
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_SYSTEM) )
- {
+ } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_SYSTEM)) {
systemScope = true;
- }
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_TEST) )
- {
+ } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_TEST)) {
testScope = true;
}
}
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Sun Aug 25 18:02:43 2013
@@ -641,7 +641,7 @@ public class AntRunMojo
try
{
reader = new LineNumberReader( ReaderFactory.newXmlReader( antFile ) );
- String line = "";
+ String line;
while ( ( line = reader.readLine() ) != null )
{
if ( reader.getLineNumber() == buildException.getLocation().getLineNumber() )
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java Sun Aug 25 18:02:43 2013
@@ -90,9 +90,8 @@ public class AntrunXmlPlexusConfiguratio
{
String[] names = c.getAttributeNames();
- for ( int i = 0; i < names.length; i++ )
- {
- w.addAttribute( names[i], c.getAttribute( names[i], null ) );
+ for (String name : names) {
+ w.addAttribute(name, c.getAttribute(name, null));
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Sun Aug 25 18:02:43 2013
@@ -235,32 +235,27 @@ public class DefaultAssemblyArchiver
if ( ( requestedContainerDescriptorHandlers != null ) && !requestedContainerDescriptorHandlers.isEmpty() )
{
- for ( final Iterator<ContainerDescriptorHandlerConfig> it = requestedContainerDescriptorHandlers.iterator(); it.hasNext(); )
- {
- final ContainerDescriptorHandlerConfig config = it.next();
-
+ for (final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers) {
final String hint = config.getHandlerName();
- final ContainerDescriptorHandler handler = containerDescriptorHandlers.get( hint );
+ final ContainerDescriptorHandler handler = containerDescriptorHandlers.get(hint);
- if ( handler == null )
- {
+ if (handler == null) {
throw new InvalidAssemblerConfigurationException(
- "Cannot find ContainerDescriptorHandler with hint: "
- + hint );
+ "Cannot find ContainerDescriptorHandler with hint: "
+ + hint);
}
- getLogger().debug( "Found container descriptor handler with hint: " + hint + " (component: " + handler
- + ")" );
+ getLogger().debug("Found container descriptor handler with hint: " + hint + " (component: " + handler
+ + ")");
- if ( config.getConfiguration() != null )
- {
- getLogger().debug( "Configuring handler with:\n\n" + config.getConfiguration() + "\n\n" );
+ if (config.getConfiguration() != null) {
+ getLogger().debug("Configuring handler with:\n\n" + config.getConfiguration() + "\n\n");
- configureContainerDescriptorHandler( handler, (Xpp3Dom) config.getConfiguration(), configSource );
+ configureContainerDescriptorHandler(handler, (Xpp3Dom) config.getConfiguration(), configSource);
}
- handlers.add( handler );
- hints.add( hint );
+ handlers.add(handler);
+ hints.add(hint);
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java Sun Aug 25 18:02:43 2013
@@ -59,62 +59,49 @@ public class FileItemAssemblyPhase
final File basedir = configSource.getBasedir();
final FileFormatter fileFormatter = new FileFormatter( configSource, getLogger() );
- for ( final Iterator<FileItem> i = fileList.iterator(); i.hasNext(); )
- {
- final FileItem fileItem = i.next();
-
+ for (final FileItem fileItem : fileList) {
final String sourcePath = fileItem.getSource();
// ensure source file is in absolute path for reactor build to work
- File source = new File( sourcePath );
+ File source = new File(sourcePath);
// save the original sourcefile's name, because filtration may
// create a temp file with a different name.
final String sourceName = source.getName();
- if ( !source.isAbsolute() )
- {
- source = new File( basedir, sourcePath );
+ if (!source.isAbsolute()) {
+ source = new File(basedir, sourcePath);
}
source =
- fileFormatter.format( source, fileItem.isFiltered(), fileItem.getLineEnding(),
- configSource.getEncoding() );
+ fileFormatter.format(source, fileItem.isFiltered(), fileItem.getLineEnding(),
+ configSource.getEncoding());
String destName = fileItem.getDestName();
- if ( destName == null )
- {
+ if (destName == null) {
destName = sourceName;
}
final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( fileItem.getOutputDirectory(), configSource.getProject(), null,
- configSource.getFinalName(), configSource );
+ AssemblyFormatUtils.getOutputDirectory(fileItem.getOutputDirectory(), configSource.getProject(), null,
+ configSource.getFinalName(), configSource);
String target;
// omit the last char if ends with / or \\
- if ( outputDirectory.endsWith( "/" ) || outputDirectory.endsWith( "\\" ) )
- {
+ if (outputDirectory.endsWith("/") || outputDirectory.endsWith("\\")) {
target = outputDirectory + destName;
- }
- else if ( outputDirectory.length() < 1 )
- {
+ } else if (outputDirectory.length() < 1) {
target = destName;
- }
- else
- {
+ } else {
target = outputDirectory + "/" + destName;
}
- try
- {
- archiver.addFile( source, target, TypeConversionUtils.modeToInt( fileItem.getFileMode(), getLogger() ) );
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e );
+ try {
+ archiver.addFile(source, target, TypeConversionUtils.modeToInt(fileItem.getFileMode(), getLogger()));
+ } catch (final ArchiverException e) {
+ throw new ArchiveCreationException("Error adding file to archive: " + e.getMessage(), e);
}
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Sun Aug 25 18:02:43 2013
@@ -96,19 +96,16 @@ public class ModuleSetAssemblyPhase
{
final List<ModuleSet> moduleSets = assembly.getModuleSets();
- for ( final Iterator<ModuleSet> i = moduleSets.iterator(); i.hasNext(); )
- {
- final ModuleSet moduleSet = i.next();
-
- validate( moduleSet, configSource );
+ for (final ModuleSet moduleSet : moduleSets) {
+ validate(moduleSet, configSource);
- final Set<MavenProject> moduleProjects = getModuleProjects( moduleSet, configSource, getLogger() );
+ final Set<MavenProject> moduleProjects = getModuleProjects(moduleSet, configSource, getLogger());
final ModuleSources sources = moduleSet.getSources();
- addModuleSourceFileSets( sources, moduleProjects, archiver, configSource );
+ addModuleSourceFileSets(sources, moduleProjects, archiver, configSource);
final ModuleBinaries binaries = moduleSet.getBinaries();
- addModuleBinaries( binaries, moduleProjects, archiver, configSource, context );
+ addModuleBinaries(binaries, moduleProjects, archiver, configSource, context);
}
}
@@ -183,83 +180,65 @@ public class ModuleSetAssemblyPhase
final Map<MavenProject, Artifact> chosenModuleArtifacts = new HashMap<MavenProject, Artifact>();
- for ( final Iterator<MavenProject> j = moduleProjects.iterator(); j.hasNext(); )
- {
- final MavenProject project = j.next();
-
+ for (final MavenProject project : moduleProjects) {
Artifact artifact = null;
- if ( classifier == null )
- {
- getLogger().debug( "Processing binary artifact for module project: " + project.getId() );
+ if (classifier == null) {
+ getLogger().debug("Processing binary artifact for module project: " + project.getId());
artifact = project.getArtifact();
- }
- else
- {
- getLogger().debug( "Processing binary attachment: " + classifier + " for module project: "
- + project.getId() );
+ } else {
+ getLogger().debug("Processing binary attachment: " + classifier + " for module project: "
+ + project.getId());
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
final List<Artifact> attachments = project.getAttachedArtifacts();
- if ( ( attachments != null ) && !attachments.isEmpty() )
- {
- for ( final Iterator<Artifact> attachmentIterator = attachments.iterator(); attachmentIterator.hasNext(); )
- {
- final Artifact attachment = attachmentIterator.next();
-
- if ( classifier.equals( attachment.getClassifier() ) )
- {
+ if ((attachments != null) && !attachments.isEmpty()) {
+ for (final Artifact attachment : attachments) {
+ if (classifier.equals(attachment.getClassifier())) {
artifact = attachment;
break;
}
}
}
- if ( artifact == null )
- {
- throw new InvalidAssemblerConfigurationException( "Cannot find attachment with classifier: "
- + classifier + " in module project: " + project.getId()
- + ". Please exclude this module from the module-set." );
+ if (artifact == null) {
+ throw new InvalidAssemblerConfigurationException("Cannot find attachment with classifier: "
+ + classifier + " in module project: " + project.getId()
+ + ". Please exclude this module from the module-set.");
}
}
- chosenModuleArtifacts.put( project, artifact );
- addModuleArtifact( artifact, project, archiver, configSource, binaries );
+ chosenModuleArtifacts.put(project, artifact);
+ addModuleArtifact(artifact, project, archiver, configSource, binaries);
}
final List<DependencySet> depSets = getDependencySets( binaries );
if ( depSets != null )
{
- for ( final Iterator<DependencySet> it = depSets.iterator(); it.hasNext(); )
- {
- final DependencySet ds = it.next();
-
+ for (final DependencySet ds : depSets) {
// NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled!
- ds.setUseProjectArtifact( false );
+ ds.setUseProjectArtifact(false);
}
// FIXME: This will produce unpredictable results when module dependencies have a version conflict.
getLogger().warn( "NOTE: Currently, inclusion of module dependencies may produce unpredictable "
+ "results if a version conflict occurs." );
- for ( final Iterator<MavenProject> it = moduleProjects.iterator(); it.hasNext(); )
- {
- final MavenProject moduleProject = it.next();
-
- getLogger().debug( "Processing binary dependencies for module project: " + moduleProject.getId() );
+ for (final MavenProject moduleProject : moduleProjects) {
+ getLogger().debug("Processing binary dependencies for module project: " + moduleProject.getId());
final AddDependencySetsTask task =
- new AddDependencySetsTask( depSets, context.getResolvedArtifacts(), moduleProject, projectBuilder,
- archiverManager, getLogger() );
+ new AddDependencySetsTask(depSets, context.getResolvedArtifacts(), moduleProject, projectBuilder,
+ archiverManager, getLogger());
- task.setModuleProject( moduleProject );
- task.setModuleArtifact( chosenModuleArtifacts.get( moduleProject ) );
- task.setDefaultOutputDirectory( binaries.getOutputDirectory() );
- task.setDefaultOutputFileNameMapping( binaries.getOutputFileNameMapping() );
+ task.setModuleProject(moduleProject);
+ task.setModuleArtifact(chosenModuleArtifacts.get(moduleProject));
+ task.setDefaultOutputDirectory(binaries.getOutputDirectory());
+ task.setDefaultOutputFileNameMapping(binaries.getOutputFileNameMapping());
- task.execute( archiver, configSource );
+ task.execute(archiver, configSource);
}
}
}
@@ -385,28 +364,22 @@ public class ModuleSetAssemblyPhase
fileSets.addAll( subFileSets );
- for ( final Iterator<MavenProject> j = moduleProjects.iterator(); j.hasNext(); )
- {
- final MavenProject moduleProject = j.next();
-
- getLogger().info( "Processing sources for module project: " + moduleProject.getId() );
+ for (final MavenProject moduleProject : moduleProjects) {
+ getLogger().info("Processing sources for module project: " + moduleProject.getId());
final List<FileSet> moduleFileSets = new ArrayList<FileSet>();
- for ( final Iterator<FileSet> fsIterator = fileSets.iterator(); fsIterator.hasNext(); )
- {
- final FileSet fileSet = fsIterator.next();
-
- moduleFileSets.add( createFileSet( fileSet, sources, moduleProject, configSource ) );
+ for (final FileSet fileSet : fileSets) {
+ moduleFileSets.add(createFileSet(fileSet, sources, moduleProject, configSource));
}
- final AddFileSetsTask task = new AddFileSetsTask( moduleFileSets );
+ final AddFileSetsTask task = new AddFileSetsTask(moduleFileSets);
- task.setProject( moduleProject );
- task.setModuleProject( moduleProject );
- task.setLogger( getLogger() );
+ task.setProject(moduleProject);
+ task.setModuleProject(moduleProject);
+ task.setLogger(getLogger());
- task.execute( archiver, configSource );
+ task.execute(archiver, configSource);
}
}
@@ -472,11 +445,8 @@ public class ModuleSetAssemblyPhase
{
@SuppressWarnings( "unchecked" )
final List<String> modules = moduleProject.getModules();
- for ( final Iterator<String> moduleIterator = modules.iterator(); moduleIterator.hasNext(); )
- {
- final String moduleSubPath = moduleIterator.next();
-
- excludes.add( moduleSubPath + "/**" );
+ for (final String moduleSubPath : modules) {
+ excludes.add(moduleSubPath + "/**");
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java Sun Aug 25 18:02:43 2013
@@ -78,49 +78,40 @@ public class RepositoryAssemblyPhase
final File tempRoot = configSource.getTemporaryRootDirectory();
- for ( final Iterator<Repository> i = repositoriesList.iterator(); i.hasNext(); )
- {
- final Repository repository = i.next();
-
+ for (final Repository repository : repositoriesList) {
final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( repository.getOutputDirectory(), configSource.getProject(),
- null, configSource.getFinalName(), configSource );
+ AssemblyFormatUtils.getOutputDirectory(repository.getOutputDirectory(), configSource.getProject(),
+ null, configSource.getFinalName(), configSource);
- final File repositoryDirectory = new File( tempRoot, outputDirectory );
+ final File repositoryDirectory = new File(tempRoot, outputDirectory);
- if ( !repositoryDirectory.exists() )
- {
+ if (!repositoryDirectory.exists()) {
repositoryDirectory.mkdirs();
}
- try
- {
- getLogger().debug( "Assembling repository to: " + repositoryDirectory );
- repositoryAssembler.buildRemoteRepository( repositoryDirectory, wrap( repository ), wrap( configSource ) );
- getLogger().debug( "Finished assembling repository to: " + repositoryDirectory );
- }
- catch ( final RepositoryAssemblyException e )
- {
- throw new ArchiveCreationException( "Failed to assemble repository: " + e.getMessage(), e );
+ try {
+ getLogger().debug("Assembling repository to: " + repositoryDirectory);
+ repositoryAssembler.buildRemoteRepository(repositoryDirectory, wrap(repository), wrap(configSource));
+ getLogger().debug("Finished assembling repository to: " + repositoryDirectory);
+ } catch (final RepositoryAssemblyException e) {
+ throw new ArchiveCreationException("Failed to assemble repository: " + e.getMessage(), e);
}
- final AddDirectoryTask task = new AddDirectoryTask( repositoryDirectory );
+ final AddDirectoryTask task = new AddDirectoryTask(repositoryDirectory);
- final int dirMode = TypeConversionUtils.modeToInt( repository.getDirectoryMode(), getLogger() );
- if ( dirMode != -1 )
- {
- task.setDirectoryMode( dirMode );
+ final int dirMode = TypeConversionUtils.modeToInt(repository.getDirectoryMode(), getLogger());
+ if (dirMode != -1) {
+ task.setDirectoryMode(dirMode);
}
- final int fileMode = TypeConversionUtils.modeToInt( repository.getFileMode(), getLogger() );
- if ( fileMode != -1 )
- {
- task.setFileMode( fileMode );
+ final int fileMode = TypeConversionUtils.modeToInt(repository.getFileMode(), getLogger());
+ if (fileMode != -1) {
+ task.setFileMode(fileMode);
}
- task.setOutputDirectory( outputDirectory );
+ task.setOutputDirectory(outputDirectory);
- task.execute( archiver, configSource );
+ task.execute(archiver, configSource);
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java Sun Aug 25 18:02:43 2013
@@ -57,11 +57,8 @@ public class RepoInfoWrapper
final List<GroupVersionAlignmentWrapper> l =
new ArrayList<GroupVersionAlignmentWrapper>( alignments.size() );
- for ( final Iterator<GroupVersionAlignment> it = alignments.iterator(); it.hasNext(); )
- {
- final GroupVersionAlignment alignment = it.next();
-
- l.add( new GroupVersionAlignmentWrapper( alignment ) );
+ for (final GroupVersionAlignment alignment : alignments) {
+ l.add(new GroupVersionAlignmentWrapper(alignment));
}
convertedAlignments = l;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Sun Aug 25 18:02:43 2013
@@ -117,11 +117,8 @@ public class AddDependencySetsTask
logger.debug( "Project " + project.getId() + " has no dependencies. Skipping dependency set addition." );
}
- for ( final Iterator<DependencySet> i = dependencySets.iterator(); i.hasNext(); )
- {
- final DependencySet dependencySet = i.next();
-
- addDependencySet( dependencySet, archiver, configSource );
+ for (final DependencySet dependencySet : dependencySets) {
+ addDependencySet(dependencySet, archiver, configSource);
}
}
@@ -152,38 +149,26 @@ public class AddDependencySetsTask
logger.debug( "Adding " + dependencyArtifacts.size() + " dependency artifacts." );
- for ( final Iterator<Artifact> j = dependencyArtifacts.iterator(); j.hasNext(); )
- {
- final Artifact depArtifact = j.next();
-
+ for (final Artifact depArtifact : dependencyArtifacts) {
MavenProject depProject;
- try
- {
+ try {
depProject =
- projectBuilder.buildFromRepository( depArtifact, configSource.getRemoteRepositories(),
- configSource.getLocalRepository() );
- }
- catch ( final ProjectBuildingException e )
- {
- logger.debug( "Error retrieving POM of module-dependency: " + depArtifact.getId() + "; Reason: "
- + e.getMessage() + "\n\nBuilding stub project instance." );
-
- depProject = buildProjectStub( depArtifact );
- }
-
- if ( NON_ARCHIVE_DEPENDENCY_TYPES.contains( depArtifact.getType() ) )
- {
- addNonArchiveDependency( depArtifact, depProject, dependencySet, archiver, configSource );
- }
- else
- {
- if ( filterContents )
- {
- addFilteredUnpackedArtifact( dependencySet, depArtifact, depProject, archiver, configSource );
- }
- else
- {
- addNormalArtifact( dependencySet, depArtifact, depProject, archiver, configSource );
+ projectBuilder.buildFromRepository(depArtifact, configSource.getRemoteRepositories(),
+ configSource.getLocalRepository());
+ } catch (final ProjectBuildingException e) {
+ logger.debug("Error retrieving POM of module-dependency: " + depArtifact.getId() + "; Reason: "
+ + e.getMessage() + "\n\nBuilding stub project instance.");
+
+ depProject = buildProjectStub(depArtifact);
+ }
+
+ if (NON_ARCHIVE_DEPENDENCY_TYPES.contains(depArtifact.getType())) {
+ addNonArchiveDependency(depArtifact, depProject, dependencySet, archiver, configSource);
+ } else {
+ if (filterContents) {
+ addFilteredUnpackedArtifact(dependencySet, depArtifact, depProject, archiver, configSource);
+ } else {
+ addNormalArtifact(dependencySet, depArtifact, depProject, archiver, configSource);
}
}
}
@@ -203,7 +188,7 @@ public class AddDependencySetsTask
mapping = defaultOutputFileNameMapping;
}
- if ( ( dir == null || dir.indexOf( "${" ) < 0 ) && ( mapping == null || mapping.indexOf( "${" ) < 0 ) )
+ if ( ( dir == null || !dir.contains("${")) && ( mapping == null || !mapping.contains("${")) )
{
logger.warn( "NOTE: Your assembly specifies a dependencySet that matches multiple artifacts, but specifies a concrete output format. "
+ "THIS MAY RESULT IN ONE OR MORE ARTIFACTS BEING OBSCURED!\n\nOutput directory: '"
@@ -396,18 +381,12 @@ public class AddDependencySetsTask
final List<Artifact> attachments = project.getAttachedArtifacts();
if ( attachments != null )
{
- for ( final Iterator<Artifact> attachmentIt = attachments.iterator(); attachmentIt.hasNext(); )
- {
- final Artifact attachment = attachmentIt.next();
-
- if ( attachment.getFile() != null )
- {
- dependencyArtifacts.add( attachment );
- }
- else
- {
- logger.warn( "Cannot include attached artifact: " + project.getId() + " for project: "
- + project.getId() + "; it doesn't have an associated file or directory." );
+ for (final Artifact attachment : attachments) {
+ if (attachment.getFile() != null) {
+ dependencyArtifacts.add(attachment);
+ } else {
+ logger.warn("Cannot include attached artifact: " + project.getId() + " for project: "
+ + project.getId() + "; it doesn't have an associated file or directory.");
}
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Sun Aug 25 18:02:43 2013
@@ -87,11 +87,8 @@ public class AddFileSetsTask
}
}
- for ( final Iterator<FileSet> i = fileSets.iterator(); i.hasNext(); )
- {
- final FileSet fileSet = i.next();
-
- addFileSet( fileSet, archiver, configSource, archiveBaseDir );
+ for (final FileSet fileSet : fileSets) {
+ addFileSet(fileSet, archiver, configSource, archiveBaseDir);
}
}
@@ -193,7 +190,7 @@ public class AddFileSetsTask
sourceDirectory = basedir.getAbsolutePath();
}
- File fileSetDir = null;
+ File fileSetDir;
if ( archiveBaseDir == null )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1517354&r1=1517353&r2=1517354&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Sun Aug 25 18:02:43 2013
@@ -138,32 +138,22 @@ public class DefaultDependencyResolver
final List<Artifact> missing = new ArrayList<Artifact>();
final Set<Artifact> resolved = new LinkedHashSet<Artifact>();
- for ( final Iterator<Artifact> it = dependencyArtifacts.iterator(); it.hasNext(); )
- {
- final Artifact depArtifact = it.next();
-
- try
- {
- resolver.resolve( depArtifact, repos, configSource.getLocalRepository() );
- resolved.add( depArtifact );
- }
- catch ( final ArtifactResolutionException e )
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "Failed to resolve: " + depArtifact.getId() + " for assembly: "
- + assembly.getId() );
+ for (final Artifact depArtifact : dependencyArtifacts) {
+ try {
+ resolver.resolve(depArtifact, repos, configSource.getLocalRepository());
+ resolved.add(depArtifact);
+ } catch (final ArtifactResolutionException e) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Failed to resolve: " + depArtifact.getId() + " for assembly: "
+ + assembly.getId());
}
- missing.add( depArtifact );
- }
- catch ( final ArtifactNotFoundException e )
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "Failed to resolve: " + depArtifact.getId() + " for assembly: "
- + assembly.getId() );
+ missing.add(depArtifact);
+ } catch (final ArtifactNotFoundException e) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Failed to resolve: " + depArtifact.getId() + " for assembly: "
+ + assembly.getId());
}
- missing.add( depArtifact );
+ missing.add(depArtifact);
}
}
@@ -282,7 +272,7 @@ public class DefaultDependencyResolver
{
getDependencySetResolutionRequirements( assembly,
ModuleSetAssemblyPhase.getDependencySets( binaries ),
- requirements, projects.toArray( new MavenProject[] {} ) );
+ requirements, projects.toArray(new MavenProject[projects.size()]));
}
}
}
@@ -375,20 +365,12 @@ public class DefaultDependencyResolver
final List<ArtifactRepository> remoteRepos = new ArrayList<ArtifactRepository>();
final Set<String> encounteredUrls = new HashSet<String>();
- for ( final Iterator<List<ArtifactRepository>> listIterator = repoLists.iterator(); listIterator.hasNext(); )
- {
- final List<ArtifactRepository> repositoryList = listIterator.next();
-
- if ( ( repositoryList != null ) && !repositoryList.isEmpty() )
- {
- for ( final Iterator<ArtifactRepository> it = repositoryList.iterator(); it.hasNext(); )
- {
- final ArtifactRepository repo = it.next();
-
- if ( !encounteredUrls.contains( repo.getUrl() ) )
- {
- remoteRepos.add( repo );
- encounteredUrls.add( repo.getUrl() );
+ for (final List<ArtifactRepository> repositoryList : repoLists) {
+ if ((repositoryList != null) && !repositoryList.isEmpty()) {
+ for (final ArtifactRepository repo : repositoryList) {
+ if (!encounteredUrls.contains(repo.getUrl())) {
+ remoteRepos.add(repo);
+ encounteredUrls.add(repo.getUrl());
}
}
}