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/27 16:16:57 UTC
svn commit: r1517827 [6/24] - 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-antru...
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java Tue Aug 27 14:16:42 2013
@@ -58,16 +58,16 @@ public final class TypeConversionUtils
if ( ( list != null ) && !list.isEmpty() )
{
- result = list.toArray(new String[list.size()]);
+ result = list.toArray( new String[list.size()] );
}
return result;
}
- public static int modeToInt( final String mode, final Logger logger ) throws AssemblyFormattingException
+ public static int modeToInt( final String mode, final Logger logger )
+ throws AssemblyFormattingException
{
- if ( mode == null || mode.trim()
- .length() < 1 )
+ if ( mode == null || mode.trim().length() < 1 )
{
return -1;
}
@@ -93,7 +93,8 @@ public final class TypeConversionUtils
{
final StringBuilder messages = new StringBuilder();
- messages.append("The mode: ").append(Integer.toString(mode, 8)).append(" contains nonsensical permissions:");
+ messages.append( "The mode: " ).append( Integer.toString( mode, 8 ) ).append(
+ " contains nonsensical permissions:" );
boolean warn = false;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java Tue Aug 27 14:16:42 2013
@@ -27,6 +27,7 @@ import java.io.StringWriter;
import java.net.JarURLConnection;
import java.net.URL;
import java.util.Collections;
+
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.testutils.MockManager;
@@ -90,10 +91,8 @@ public class ManifestCreationFinalizerTe
JarArchiver archiver = new JarArchiver();
- archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
- null,
- project,
- config ) ) );
+ archiver.setArchiveFinalizers(
+ Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer( null, project, config ) ) );
File file = fileManager.createTempFile();
@@ -109,7 +108,7 @@ public class ManifestCreationFinalizerTe
IOUtil.copy( reader, writer );
- assertTrue(writer.toString().contains("Main-Class: Stuff"));
+ assertTrue( writer.toString().contains( "Main-Class: Stuff" ) );
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678
( (JarURLConnection) resource.openConnection() ).getJarFile().close();
@@ -128,10 +127,8 @@ public class ManifestCreationFinalizerTe
JarArchiver archiver = new JarArchiver();
- archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
- null,
- project,
- config ) ) );
+ archiver.setArchiveFinalizers(
+ Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer( null, project, config ) ) );
File file = fileManager.createTempFile();
@@ -149,7 +146,7 @@ public class ManifestCreationFinalizerTe
System.out.println( "Test Manifest:\n\n" + writer );
- assertTrue(writer.toString().contains(testKey + ": " + testValue));
+ assertTrue( writer.toString().contains( testKey + ": " + testValue ) );
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678
( (JarURLConnection) resource.openConnection() ).getJarFile().close();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Tue Aug 27 14:16:42 2013
@@ -237,10 +237,8 @@ public class ModuleSetAssemblyPhaseTest
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources, project,
macTask.configSource );
- assertEquals( 1, result.getExcludes()
- .size() );
- assertEquals( "submodule/**", result.getExcludes()
- .get( 0 ) );
+ assertEquals( 1, result.getExcludes().size() );
+ assertEquals( "submodule/**", result.getExcludes().get( 0 ) );
mm.verifyAll();
}
@@ -340,8 +338,7 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries,
- projects,
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries, projects,
macTask.archiver,
macTask.configSource,
new DefaultAssemblyContext() );
@@ -362,8 +359,8 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
+ Logger.LEVEL_DEBUG, "test" ) ) );
final ModuleBinaries binaries = new ModuleBinaries();
@@ -444,8 +441,8 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
+ Logger.LEVEL_DEBUG, "test" ) ) );
final ModuleBinaries binaries = new ModuleBinaries();
@@ -483,8 +480,8 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectCSGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
+ Logger.LEVEL_DEBUG, "test" ) ) );
macTask.expectGetSession( null );
final ModuleBinaries binaries = new ModuleBinaries();
@@ -508,8 +505,8 @@ public class ModuleSetAssemblyPhaseTest
final ArtifactMock depArtifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false );
final File depArtifactFile = depArtifactMock.setNewFile();
- macTask.expectAddFile( depArtifactFile, "out/dep",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( depArtifactFile, "out/dep", TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
+ Logger.LEVEL_DEBUG, "test" ) ) );
final MavenProject depProject = createProject( "group", "dep", "version", null );
depProject.setArtifact( depArtifactMock.getArtifact() );
@@ -645,9 +642,8 @@ public class ModuleSetAssemblyPhaseTest
try
{
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(),
- null, null, null,
- null );
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact(
+ artifactMock.getArtifact(), null, null, null, null );
fail( "Expected ArchiveCreationException since artifact file is null." );
}
@@ -675,8 +671,8 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
+ Logger.LEVEL_DEBUG, "test" ) ) );
final ModuleBinaries binaries = new ModuleBinaries();
binaries.setOutputDirectory( "out" );
@@ -686,11 +682,8 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(),
- project,
- macTask.archiver,
- macTask.configSource,
- binaries );
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact(
+ artifactMock.getArtifact(), project, macTask.archiver, macTask.configSource, binaries );
mm.verifyAll();
}
@@ -746,7 +739,8 @@ public class ModuleSetAssemblyPhaseTest
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, macTask.configSource );
+ createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver,
+ macTask.configSource );
mm.verifyAll();
}
@@ -758,7 +752,8 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mm, project );
final List<MavenProject> projects = Collections.singletonList( project );
@@ -784,7 +779,8 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mm, project );
final MavenProject project2 = createProject( "group", "artifact2", "version", null );
@@ -814,7 +810,8 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mm, project );
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
@@ -834,8 +831,7 @@ public class ModuleSetAssemblyPhaseTest
assertFalse( moduleProjects.isEmpty() );
- final MavenProject result = moduleProjects.iterator()
- .next();
+ final MavenProject result = moduleProjects.iterator().next();
assertEquals( "artifact2", result.getArtifactId() );
@@ -849,7 +845,8 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mm, project );
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
@@ -887,7 +884,8 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mm, project );
final List<ArtifactMock> macArtifacts = new ArrayList<ArtifactMock>();
@@ -960,8 +958,9 @@ public class ModuleSetAssemblyPhaseTest
System.out.println( "Unexpected projects in output: " );
- for (final MavenProject project : checkTooMany) {
- System.out.println(project.getId());
+ for ( final MavenProject project : checkTooMany )
+ {
+ System.out.println( project.getId() );
}
}
@@ -974,8 +973,9 @@ public class ModuleSetAssemblyPhaseTest
System.out.println( "Expected projects missing from output: " );
- for (final MavenProject project : checkTooMany) {
- System.out.println(project.getId());
+ for ( final MavenProject project : checkTooMany )
+ {
+ System.out.println( project.getId() );
}
}
@@ -1006,8 +1006,7 @@ public class ModuleSetAssemblyPhaseTest
final File parentBase = parentProject.getBasedir();
pomFile = new File( parentBase, artifactId + "/pom.xml" );
- parentProject.getModel()
- .addModule( artifactId );
+ parentProject.getModel().addModule( artifactId );
project.setParent( parentProject );
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java Tue Aug 27 14:16:42 2013
@@ -298,9 +298,9 @@ public class ArtifactMock
{
if ( ( groupId != null ) && ( artifactId != null ) && ( typeAndExt != null ) && ( version != null ) )
{
- final String id =
- groupId + ":" + artifactId + ":" + version + ":" + typeAndExt
- + ( classifier == null ? "" : ":" + classifier );
+ final String id = groupId + ":" + artifactId + ":" + version + ":" + typeAndExt + ( classifier == null
+ ? ""
+ : ":" + classifier );
setId( id );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Tue Aug 27 14:16:42 2013
@@ -101,10 +101,9 @@ public class DefaultDependencyResolverTe
final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).getDependencySetResolutionRequirements( new Assembly(),
- depSets,
- info,
- project );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector,
+ logger ).getDependencySetResolutionRequirements( new Assembly(), depSets, info,
+ project );
assertTrue( info.isResolutionRequired() );
assertFalse( info.isResolvedTransitively() );
@@ -257,9 +256,8 @@ public class DefaultDependencyResolverTe
assembly.setRepositories( repositories );
final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).getRepositoryResolutionRequirements( assembly,
- info,
- project );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector,
+ logger ).getRepositoryResolutionRequirements( assembly, info, project );
assertTrue( info.isResolutionRequired() );
@@ -298,8 +296,10 @@ public class DefaultDependencyResolverTe
project.setRemoteArtifactRepositories( projectRepos );
final List<ArtifactRepository> aggregated =
- new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).aggregateRemoteArtifactRepositories( externalRepos,
- Collections.singleton( project ) );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector,
+ logger ).aggregateRemoteArtifactRepositories( externalRepos,
+ Collections.singleton(
+ project ) );
assertRepositoryWithId( er1.getId(), aggregated, true );
assertRepositoryWithId( er2.getId(), aggregated, true );
@@ -593,8 +593,10 @@ public class DefaultDependencyResolverTe
else
{
boolean found = false;
- for (final ArtifactRepository repo : repos) {
- if (repoId.equals(repo.getId())) {
+ for ( final ArtifactRepository repo : repos )
+ {
+ if ( repoId.equals( repo.getId() ) )
+ {
found = true;
break;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java Tue Aug 27 14:16:42 2013
@@ -339,12 +339,9 @@ public class DefaultAssemblyReaderTest
assertNotNull( depSets );
assertEquals( 3, depSets.size() );
- assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 )
- .getScope() );
- assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 )
- .getScope() );
- assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 )
- .getScope() );
+ assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 ).getScope() );
+ assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 ).getScope() );
+ assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 ).getScope() );
}
public void testMergeComponentWithAssembly_ShouldAddOneRepositoryToExistingListOfTwo()
@@ -375,12 +372,9 @@ public class DefaultAssemblyReaderTest
assertNotNull( depSets );
assertEquals( 3, depSets.size() );
- assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 )
- .getScope() );
- assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 )
- .getScope() );
- assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 )
- .getScope() );
+ assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 ).getScope() );
+ assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 ).getScope() );
+ assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 ).getScope() );
}
public void testMergeComponentWithAssembly_ShouldAddOneContainerDescriptorHandlerToExistingListOfTwo()
@@ -412,12 +406,9 @@ public class DefaultAssemblyReaderTest
assertEquals( 3, result.size() );
final Iterator<ContainerDescriptorHandlerConfig> it = result.iterator();
- assertEquals( "one", it.next()
- .getHandlerName() );
- assertEquals( "two", it.next()
- .getHandlerName() );
- assertEquals( "three", it.next()
- .getHandlerName() );
+ assertEquals( "one", it.next().getHandlerName() );
+ assertEquals( "two", it.next().getHandlerName() );
+ assertEquals( "three", it.next().getHandlerName() );
}
// FIXME: Deep merging should take place...
@@ -614,8 +605,7 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
- assertEquals( "/site", fileSets.get( 0 )
- .getOutputDirectory() );
+ assertEquals( "/site", fileSets.get( 0 ).getOutputDirectory() );
mockManager.verifyAll();
}
@@ -666,8 +656,7 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
- assertEquals( "/site", fileSets.get( 0 )
- .getOutputDirectory() );
+ assertEquals( "/site", fileSets.get( 0 ).getOutputDirectory() );
mockManager.verifyAll();
}
@@ -736,8 +725,7 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
- assertEquals( "/dir", fileSets.get( 0 )
- .getDirectory() );
+ assertEquals( "/dir", fileSets.get( 0 ).getDirectory() );
mockManager.verifyAll();
}
@@ -807,8 +795,7 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
- assertEquals( "group-dir", fileSets.get( 0 )
- .getDirectory() );
+ assertEquals( "group-dir", fileSets.get( 0 ).getDirectory() );
mockManager.verifyAll();
}
@@ -985,7 +972,8 @@ public class DefaultAssemblyReaderTest
catch ( final AssemblyReadException e )
{
e.printStackTrace();
- fail( "Setting ignoreMissingDescriptor == true (true flag in performReadAssemblies, above) should NOT produce an exception." );
+ fail(
+ "Setting ignoreMissingDescriptor == true (true flag in performReadAssemblies, above) should NOT produce an exception." );
}
}
@@ -1022,7 +1010,7 @@ public class DefaultAssemblyReaderTest
final List<String> files = writeAssembliesToFile( assemblies, basedir );
final List<Assembly> results =
- performReadAssemblies( basedir, null, null, files.toArray(new String[files.size()]), null, null );
+ performReadAssemblies( basedir, null, null, files.toArray( new String[files.size()] ), null, null );
assertNotNull( results );
assertEquals( 2, results.size() );
@@ -1042,7 +1030,7 @@ public class DefaultAssemblyReaderTest
final File basedir = fileManager.createTempDir();
final List<Assembly> assemblies =
- performReadAssemblies( basedir, null, null, null, new String[] { "bin", "src" }, null );
+ performReadAssemblies( basedir, null, null, null, new String[]{ "bin", "src" }, null );
assertNotNull( assemblies );
assertEquals( 2, assemblies.size() );
@@ -1125,18 +1113,22 @@ public class DefaultAssemblyReaderTest
{
final List<String> files = new ArrayList<String>();
- for (final Assembly assembly : assemblies) {
- final File assemblyFile = new File(dir, assembly.getId() + ".xml");
+ for ( final Assembly assembly : assemblies )
+ {
+ final File assemblyFile = new File( dir, assembly.getId() + ".xml" );
Writer writer = null;
- try {
- writer = new OutputStreamWriter(new FileOutputStream(assemblyFile), "UTF-8");
- new AssemblyXpp3Writer().write(writer, assembly);
- } finally {
- IOUtil.close(writer);
+ try
+ {
+ writer = new OutputStreamWriter( new FileOutputStream( assemblyFile ), "UTF-8" );
+ new AssemblyXpp3Writer().write( writer, assembly );
+ }
+ finally
+ {
+ IOUtil.close( writer );
}
- files.add(assemblyFile.getAbsolutePath());
+ files.add( assemblyFile.getAbsolutePath() );
}
return files;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/MockManager.java Tue Aug 27 14:16:42 2013
@@ -43,21 +43,26 @@ public class MockManager
public void replayAll()
{
- for (final MockControl control : mockControls) {
+ for ( final MockControl control : mockControls )
+ {
control.replay();
}
}
public void verifyAll()
{
- for (final MockControl control : mockControls) {
- try {
+ for ( final MockControl control : mockControls )
+ {
+ try
+ {
control.verify();
- } catch (final AssertionFailedError err) {
+ }
+ catch ( final AssertionFailedError err )
+ {
final String message =
- "MockControl: " + control + " of: " + control.getMock() + " failed.\n" + err.getMessage();
- final AssertionFailedError e = new AssertionFailedError(message);
- e.initCause(err);
+ "MockControl: " + control + " of: " + control.getMock() + " failed.\n" + err.getMessage();
+ final AssertionFailedError e = new AssertionFailedError( message );
+ e.initCause( err );
throw e;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestUtils.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestUtils.java Tue Aug 27 14:16:42 2013
@@ -57,7 +57,8 @@ public final class TestUtils
/**
* Read file content using platform encoding and converting line endings to \\n.
*/
- public static String readFile( File file ) throws IOException
+ public static String readFile( File file )
+ throws IOException
{
StringBuilder buffer = new StringBuilder();
@@ -65,7 +66,7 @@ public final class TestUtils
String line;
- while( ( line = reader.readLine() ) != null )
+ while ( ( line = reader.readLine() ) != null )
{
if ( buffer.length() > 0 )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java Tue Aug 27 14:16:42 2013
@@ -299,13 +299,18 @@ public class TrackingArchiverStub
{
/**
* {@inheritDoc}
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString()
{
- return "Addition (\n resource= " + resource + "\n directory= " + directory + "\n destination= " + destination + "\n permissions= " + permissions + "\n includes= " + (includes == null ? "-none-" : StringUtils.join(includes, ", ")) + "\n excludes= " + (excludes == null ? "-none-" : StringUtils.join(excludes, ", ")) + "\n)";
+ return "Addition (\n resource= " + resource + "\n directory= " + directory + "\n destination= "
+ + destination + "\n permissions= " + permissions + "\n includes= " + ( includes == null
+ ? "-none-"
+ : StringUtils.join( includes, ", " ) ) + "\n excludes= " + ( excludes == null
+ ? "-none-"
+ : StringUtils.join( excludes, ", " ) ) + "\n)";
}
public final Object resource;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java Tue Aug 27 14:16:42 2013
@@ -113,23 +113,17 @@ public class FilterUtilsTest
public void testFilterArtifacts_ShouldNotRemoveArtifactTransitivelyIncluded()
throws InvalidAssemblerConfigurationException
{
- verifyArtifactInclusion( "group",
- "artifact",
- "group:dependentArtifact",
- null,
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version"), null );
+ verifyArtifactInclusion( "group", "artifact", "group:dependentArtifact", null,
+ Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ),
+ null );
}
public void testFilterArtifacts_ShouldRemoveArtifactTransitivelyExcluded()
throws InvalidAssemblerConfigurationException
{
- verifyArtifactExclusion( "group",
- "artifact",
- null,
- "group:dependentArtifact",
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version"), null );
+ verifyArtifactExclusion( "group", "artifact", null, "group:dependentArtifact",
+ Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ),
+ null );
}
public void testFilterArtifacts_ShouldRemoveArtifactDirectlyExcluded()
@@ -173,22 +167,14 @@ public class FilterUtilsTest
public void testFilterProjects_ShouldNotRemoveProjectTransitivelyIncluded()
{
- verifyProjectInclusion( "group",
- "artifact",
- "group:dependentArtifact",
- null,
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version") );
+ verifyProjectInclusion( "group", "artifact", "group:dependentArtifact", null,
+ Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ) );
}
public void testFilterProjects_ShouldRemoveProjectTransitivelyExcluded()
{
- verifyProjectExclusion( "group",
- "artifact",
- null,
- "group:dependentArtifact",
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version") );
+ verifyProjectExclusion( "group", "artifact", null, "group:dependentArtifact",
+ Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ) );
}
public void testFilterProjects_ShouldRemoveProjectDirectlyExcluded()
@@ -259,9 +245,8 @@ public class FilterUtilsTest
if ( verifyInclusion )
{
assertEquals( 1, artifacts.size() );
- assertEquals( mac.artifact.getDependencyConflictId(), artifacts.iterator()
- .next()
- .getDependencyConflictId() );
+ assertEquals( mac.artifact.getDependencyConflictId(),
+ artifacts.iterator().next().getDependencyConflictId() );
}
else
{
@@ -330,9 +315,7 @@ public class FilterUtilsTest
if ( verifyInclusion )
{
assertEquals( 1, projects.size() );
- assertEquals( pmac.getId(), projects.iterator()
- .next()
- .getId() );
+ assertEquals( pmac.getId(), projects.iterator().next().getId() );
}
else
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java Tue Aug 27 14:16:42 2013
@@ -50,14 +50,14 @@ public class ProjectUtilsTest
return project;
}
- public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() throws IOException
+ public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject()
+ throws IOException
{
final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
master.setFile( new File( "pom.xml" ) );
- master.getModel()
- .addModule( "module" );
+ master.getModel().addModule( "module" );
final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
@@ -73,12 +73,11 @@ public class ProjectUtilsTest
assertNotNull( result );
assertEquals( 1, result.size() );
- assertEquals( module.getId(), result.iterator()
- .next()
- .getId() );
+ assertEquals( module.getId(), result.iterator().next().getId() );
}
- public void testGetProjectModules_ShouldNotIncludeMasterProject() throws IOException
+ public void testGetProjectModules_ShouldNotIncludeMasterProject()
+ throws IOException
{
final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
@@ -97,13 +96,11 @@ public class ProjectUtilsTest
master.setFile( new File( "project/pom.xml" ) );
- master.getModel()
- .addModule( "module" );
+ master.getModel().addModule( "module" );
final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
- module.getModel()
- .addModule( "submodule" );
+ module.getModel().addModule( "submodule" );
module.setFile( new File( "project/module/pom.xml" ) );
@@ -136,13 +133,11 @@ public class ProjectUtilsTest
master.setFile( new File( "project/pom.xml" ) );
- master.getModel()
- .addModule( "module" );
+ master.getModel().addModule( "module" );
final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
- module.getModel()
- .addModule( "submodule" );
+ module.getModel().addModule( "submodule" );
module.setFile( new File( "project/module/pom.xml" ) );
@@ -169,7 +164,8 @@ public class ProjectUtilsTest
verifyProjectsPresent( verify, result );
}
- public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() throws IOException
+ public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject()
+ throws IOException
{
final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
@@ -197,21 +193,24 @@ public class ProjectUtilsTest
final List<MavenProject> unexpected = new ArrayList<MavenProject>();
- for (final MavenProject project : result) {
+ for ( final MavenProject project : result )
+ {
boolean removed = false;
- for (final Iterator<MavenProject> verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) {
+ for ( final Iterator<MavenProject> verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); )
+ {
final MavenProject verification = verifyIterator.next();
- if (verification.getId()
- .equals(project.getId())) {
+ if ( verification.getId().equals( project.getId() ) )
+ {
verifyIterator.remove();
removed = true;
}
}
- if (!removed) {
- unexpected.add(project);
+ if ( !removed )
+ {
+ unexpected.add( project );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java Tue Aug 27 14:16:42 2013
@@ -35,17 +35,19 @@ public class TypeConversionUtilsTest
extends TestCase
{
- public void testModeToInt_InterpretAsOctalWithoutLeadingZero() throws AssemblyFormattingException
+ public void testModeToInt_InterpretAsOctalWithoutLeadingZero()
+ throws AssemblyFormattingException
{
- final int check = Integer.decode("0777");
+ final int check = Integer.decode( "0777" );
final int test = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
assertEquals( check, test );
}
- public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal() throws AssemblyFormattingException
+ public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal()
+ throws AssemblyFormattingException
{
- final int check = Integer.decode("0777");
+ final int check = Integer.decode( "0777" );
final int test = TypeConversionUtils.modeToInt( "0777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
assertEquals( check, test );
@@ -115,8 +117,9 @@ public class TypeConversionUtilsTest
{
final String message = new String( baos.toByteArray() );
- for (final String checkMessage : messagesToCheckIfInsane) {
- assertTrue("\'" + checkMessage + "\' is not present in output.", message.contains(checkMessage));
+ for ( final String checkMessage : messagesToCheckIfInsane )
+ {
+ assertTrue( "\'" + checkMessage + "\' is not present in output.", message.contains( checkMessage ) );
}
}
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java Tue Aug 27 14:16:42 2013
@@ -235,19 +235,21 @@ public class ChangeLogReport
*
* @since 2.3
*/
- @Parameter( property = "encodeFileUri", defaultValue = "false")
+ @Parameter( property = "encodeFileUri", defaultValue = "false" )
protected boolean encodeFileUri;
/**
* List of files to include. Specified as fileset patterns of files to include in the report
+ *
* @since 2.3
*/
@Parameter
private String[] includes;
/**
- * List of files to include. Specified as fileset patterns of files to omit in the report
- * @since 2.3
+ * List of files to include. Specified as fileset patterns of files to omit in the report
+ *
+ * @since 2.3
*/
@Parameter
private String[] excludes;
@@ -317,6 +319,7 @@ public class ChangeLogReport
* value is a JIRA-style issue identification pattern.
* <p/>
* <strong>Note:</strong> Default value is [a-zA-Z]{2,}-\d+
+ *
* @since 2.2
*/
@Parameter( property = "issueIDRegexPattern", defaultValue = DEFAULT_ISSUE_ID_REGEX_PATTERN, required = true )
@@ -418,7 +421,9 @@ public class ChangeLogReport
@Parameter
private Properties systemProperties;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -436,12 +441,13 @@ public class ChangeLogReport
{
String providerType = entry.getKey();
String providerImplementation = entry.getValue();
- getLog().info( "Change the default '" + providerType + "' provider implementation to '"
- + providerImplementation + "'." );
+ getLog().info(
+ "Change the default '" + providerType + "' provider implementation to '" + providerImplementation
+ + "'." );
manager.setScmProviderImplementation( providerType, providerImplementation );
}
}
-
+
initializeDefaultConfigurationParameters();
initializeDeveloperMaps();
@@ -527,7 +533,8 @@ public class ChangeLogReport
getLog().info( "Using existing changelog.xml..." );
- changelogList = ChangeLog.loadChangedSets( ReaderFactory.newReader( outputXML, getOutputEncoding() ) );
+ changelogList =
+ ChangeLog.loadChangedSets( ReaderFactory.newReader( outputXML, getOutputEncoding() ) );
}
catch ( FileNotFoundException e )
{
@@ -606,7 +613,8 @@ public class ChangeLogReport
//pw.flush();
//pw.close();
// MCHANGELOG-86
- Writer writer = WriterFactory.newWriter( new BufferedOutputStream( new FileOutputStream( outputXML ) ), getOutputEncoding() );
+ Writer writer = WriterFactory.newWriter( new BufferedOutputStream( new FileOutputStream( outputXML ) ),
+ getOutputEncoding() );
writer.write( changelogXml.toString() );
writer.flush();
writer.close();
@@ -715,7 +723,7 @@ public class ChangeLogReport
{
throw new MavenReportException( "The type '" + type + "' isn't supported." );
}
- filter(changeSets);
+ filter( changeSets );
return changeSets;
}
@@ -732,82 +740,96 @@ public class ChangeLogReport
/**
* filters out unwanted files from the changesets
*/
- private void filter(List<ChangeLogSet> changeSets)
+ private void filter( List<ChangeLogSet> changeSets )
{
- List<Pattern> include = compilePatterns(includes);
- List<Pattern> exclude = compilePatterns(excludes);
- if(includes==null && excludes==null)
+ List<Pattern> include = compilePatterns( includes );
+ List<Pattern> exclude = compilePatterns( excludes );
+ if ( includes == null && excludes == null )
+ {
return;
- for (ChangeLogSet changeLogSet : changeSets)
+ }
+ for ( ChangeLogSet changeLogSet : changeSets )
{
List<ChangeSet> set = changeLogSet.getChangeSets();
- filter(set, include, exclude);
+ filter( set, include, exclude );
}
}
- private List<Pattern> compilePatterns(String[] patternArray)
+ private List<Pattern> compilePatterns( String[] patternArray )
{
- if(patternArray==null)
+ if ( patternArray == null )
+ {
return new ArrayList<Pattern>();
- List<Pattern> patterns = new ArrayList<Pattern>(patternArray.length);
- for (String string : patternArray)
+ }
+ List<Pattern> patterns = new ArrayList<Pattern>( patternArray.length );
+ for ( String string : patternArray )
{
//replaces * with [/\]* (everything but file seperators)
//replaces ** with .*
//quotes the rest of the string
string = "\\Q" + string + "\\E";
- string = string.replace("**", "\\E.?REPLACEMENT?\\Q");
- string = string.replace("*", "\\E[^/\\\\]?REPLACEMENT?\\Q");
- string = string.replace("?REPLACEMENT?", "*");
- string = string.replace("\\Q\\E", "");
- patterns.add(Pattern.compile(string));
+ string = string.replace( "**", "\\E.?REPLACEMENT?\\Q" );
+ string = string.replace( "*", "\\E[^/\\\\]?REPLACEMENT?\\Q" );
+ string = string.replace( "?REPLACEMENT?", "*" );
+ string = string.replace( "\\Q\\E", "" );
+ patterns.add( Pattern.compile( string ) );
}
return patterns;
}
- private void filter(List<ChangeSet> sets, List<Pattern> includes, List<Pattern> excludes)
+ private void filter( List<ChangeSet> sets, List<Pattern> includes, List<Pattern> excludes )
{
Iterator<ChangeSet> it = sets.iterator();
- while (it.hasNext())
+ while ( it.hasNext() )
{
ChangeSet changeSet = it.next();
List<ChangeFile> files = changeSet.getFiles();
Iterator<ChangeFile> iterator = files.iterator();
- while (iterator.hasNext())
+ while ( iterator.hasNext() )
{
ChangeFile changeFile = iterator.next();
String name = changeFile.getName();
- if(!isIncluded(includes,name) || isExcluded(excludes, name))
+ if ( !isIncluded( includes, name ) || isExcluded( excludes, name ) )
{
iterator.remove();
}
}
- if(files.isEmpty())
+ if ( files.isEmpty() )
+ {
it.remove();
+ }
}
}
- private boolean isExcluded(List<Pattern> excludes, String name)
+ private boolean isExcluded( List<Pattern> excludes, String name )
{
- if(excludes==null || excludes.isEmpty())
+ if ( excludes == null || excludes.isEmpty() )
+ {
return false;
- for (Pattern pattern : excludes)
+ }
+ for ( Pattern pattern : excludes )
{
- if(pattern.matcher(name).matches())
+ if ( pattern.matcher( name ).matches() )
+ {
return true;
+ }
}
return false;
}
- private boolean isIncluded(List<Pattern> includes, String name)
+ private boolean isIncluded( List<Pattern> includes, String name )
{
- if(includes==null || includes.isEmpty())
+ if ( includes == null || includes.isEmpty() )
+ {
return true;
- for (Pattern pattern : includes)
+ }
+ for ( Pattern pattern : includes )
{
- if(pattern.matcher(name).matches())
+ if ( pattern.matcher( name ).matches() )
+ {
return true;
+ }
}
return false;
}
@@ -1020,9 +1042,8 @@ public class ChangeLogReport
{
if ( dates == null )
{
- throw new MavenReportException(
- "The dates parameter is required when type=\"date\"."
- + " The value should be the absolute date for the start of the log." );
+ throw new MavenReportException( "The dates parameter is required when type=\"date\"."
+ + " The value should be the absolute date for the start of the log." );
}
}
else if ( "tag".equals( type ) )
@@ -1035,7 +1056,7 @@ public class ChangeLogReport
else
{
throw new MavenReportException( "The type parameter has an invalid value: " + type
- + ". The value should be \"range\", \"date\", or \"tag\"." );
+ + ". The value should be \"range\", \"date\", or \"tag\"." );
}
}
@@ -1176,11 +1197,12 @@ public class ChangeLogReport
else
{
sink.text( bundle.getString( "report.SetTagBetween" ) );
- sink.text( " '" + set.getStartVersion() + "' " + bundle.getString( "report.And" ) + " '"
- + set.getEndVersion() + "'" );
+ sink.text(
+ " '" + set.getStartVersion() + "' " + bundle.getString( "report.And" ) + " '" + set.getEndVersion()
+ + "'" );
}
}
- else if ( set.getStartDate() == null )
+ else if ( set.getStartDate() == null )
{
sink.text( bundle.getString( "report.SetRangeUnknown" ) );
}
@@ -1192,9 +1214,9 @@ public class ChangeLogReport
else
{
sink.text( bundle.getString( "report.SetRangeBetween" ) );
- sink.text( " " + headingDateFormater.format( set.getStartDate() )
- + " " + bundle.getString( "report.And" ) + " "
- + headingDateFormater.format( set.getEndDate() ) );
+ sink.text(
+ " " + headingDateFormater.format( set.getStartDate() ) + " " + bundle.getString( "report.And" ) + " "
+ + headingDateFormater.format( set.getEndDate() ) );
}
sink.sectionTitle2_();
}
@@ -1334,8 +1356,8 @@ public class ChangeLogReport
String line;
try
{
- if ( ( issueIDRegexPattern != null && issueIDRegexPattern.length() > 0 )
- && ( issueLinkUrl != null && issueLinkUrl.length() > 0 ) )
+ if ( ( issueIDRegexPattern != null && issueIDRegexPattern.length() > 0 ) && ( issueLinkUrl != null
+ && issueLinkUrl.length() > 0 ) )
{
Pattern pattern = Pattern.compile( issueIDRegexPattern );
@@ -1441,7 +1463,7 @@ public class ChangeLogReport
* link to the team members report, or alternatively, if the supplied
* author is unknown, outputs the author's name as plain text.
*
- * @param sink Sink to use for outputting
+ * @param sink Sink to use for outputting
* @param author The author's name.
*/
protected void sinkAuthorDetails( Sink sink, String author )
@@ -1576,13 +1598,13 @@ public class ChangeLogReport
if ( !linkFile.equals( scmUrl ) )
{
String linkName = name;
- if(encodeFileUri)
+ if ( encodeFileUri )
{
try
{
- linkName = URLEncoder.encode(linkName, "UTF-8");
+ linkName = URLEncoder.encode( linkName, "UTF-8" );
}
- catch (UnsupportedEncodingException e)
+ catch ( UnsupportedEncodingException e )
{
// UTF-8 is always supported
}
@@ -1604,7 +1626,7 @@ public class ChangeLogReport
// Use the given URL to create links to the files
- if ( revision != null && linkFile.indexOf( REV_TOKEN ) > 0 )
+ if ( revision != null && linkFile.indexOf( REV_TOKEN ) > 0 )
{
linkFile = linkFile.replaceAll( REV_TOKEN, revision );
}
@@ -1753,13 +1775,17 @@ public class ChangeLogReport
return absPath + newTarget;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected MavenProject getProject()
{
return project;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected String getOutputDirectory()
{
if ( !outputDirectory.isAbsolute() )
@@ -1780,25 +1806,33 @@ public class ChangeLogReport
return ( outputEncoding != null ) ? outputEncoding : ReaderFactory.UTF_8;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected Renderer getSiteRenderer()
{
return siteRenderer;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( "report.changelog.description" );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getName( Locale locale )
{
return getBundle( locale ).getString( "report.changelog.name" );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getOutputName()
{
return "changelog";
@@ -1813,7 +1847,9 @@ public class ChangeLogReport
return ResourceBundle.getBundle( "scm-activity", locale, this.getClass().getClassLoader() );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean canGenerateReport()
{
if ( offline && !outputXML.exists() )
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,15 +19,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <artifactId>maven-changes-plugin-test1</artifactId>
+ <artifactId>maven-changes-plugin-test1</artifactId>
<version>99.0</version>
<name>Module1</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,15 +19,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <artifactId>maven-changes-plugin-test2</artifactId>
+ <artifactId>maven-changes-plugin-test2</artifactId>
<version>99.0</version>
<name>Module2</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,15 +19,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <artifactId>maven-changes-plugin-test3</artifactId>
+ <artifactId>maven-changes-plugin-test3</artifactId>
<version>99.0</version>
<name>Module3</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java Tue Aug 27 14:16:42 2013
@@ -265,27 +265,30 @@ public class AnnouncementMailMojo
mailMsg.setContentType( this.mailContentType );
mailMsg.setFrom( fromAddress, fromName );
- for (Object o1 : getToAddresses()) {
+ for ( Object o1 : getToAddresses() )
+ {
email = o1.toString();
- getLog().info("Sending mail to " + email + "...");
- mailMsg.addTo(email, "");
+ getLog().info( "Sending mail to " + email + "..." );
+ mailMsg.addTo( email, "" );
}
if ( getCcAddresses() != null )
{
- for (Object o : getCcAddresses()) {
+ for ( Object o : getCcAddresses() )
+ {
email = o.toString();
- getLog().info("Sending cc mail to " + email + "...");
- mailMsg.addCc(email, "");
+ getLog().info( "Sending cc mail to " + email + "..." );
+ mailMsg.addCc( email, "" );
}
}
if ( getBccAddresses() != null )
{
- for (Object o : getBccAddresses()) {
+ for ( Object o : getBccAddresses() )
+ {
email = o.toString();
- getLog().info("Sending bcc mail to " + email + "...");
- mailMsg.addBcc(email, "");
+ getLog().info( "Sending bcc mail to " + email + "..." );
+ mailMsg.addBcc( email, "" );
}
}
@@ -368,11 +371,13 @@ public class AnnouncementMailMojo
}
else
{
- for (Object aFrom : from) {
+ for ( Object aFrom : from )
+ {
Developer developer = (Developer) aFrom;
- if (fromDeveloperId.equals(developer.getId())) {
- return new MailSender(developer.getName(), developer.getEmail());
+ if ( fromDeveloperId.equals( developer.getId() ) )
+ {
+ return new MailSender( developer.getName(), developer.getEmail() );
}
}
throw new MojoExecutionException(
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java Tue Aug 27 14:16:42 2013
@@ -395,18 +395,18 @@ public class AnnouncementMojo
/**
* The scheme of your github api domain. Only use if using github enterprise.
- *
+ *
* @since 2.9
*/
- @Parameter( defaultValue = "http", property = "changes.githubAPIScheme")
+ @Parameter( defaultValue = "http", property = "changes.githubAPIScheme" )
private String githubAPIScheme;
/**
* The port of your github api domain. Only use if using github enterprise.
- *
+ *
* @since 2.9
*/
- @Parameter( defaultValue = "80", property = "changes.githubAPIPort")
+ @Parameter( defaultValue = "80", property = "changes.githubAPIPort" )
private int githubAPIPort;
private ReleaseUtils releaseUtils = new ReleaseUtils( getLog() );
@@ -454,7 +454,7 @@ public class AnnouncementMojo
issueManagementSystems.add( CHANGES_XML );
}
}
-
+
// Fetch releases from the configured issue management systems
List<Release> releases = null;
if ( issueManagementSystems.contains( CHANGES_XML ) )
@@ -504,7 +504,8 @@ public class AnnouncementMojo
if ( issueManagementSystems.contains( GIT_HUB ) )
{
- if ( ProjectUtils.validateIfIssueManagementComplete( project, GIT_HUB, "GitHub announcement", getLog() ) )
+ if ( ProjectUtils.validateIfIssueManagementComplete( project, GIT_HUB, "GitHub announcement",
+ getLog() ) )
{
List<Release> gitHubReleases = getGitHubReleases();
releases = releaseUtils.mergeReleases( releases, gitHubReleases );
@@ -513,7 +514,7 @@ public class AnnouncementMojo
else
{
throw new MojoExecutionException(
- "Something is wrong with the Issue Management section. See previous error messages." );
+ "Something is wrong with the Issue Management section. See previous error messages." );
}
}
@@ -550,8 +551,9 @@ public class AnnouncementMojo
{
String version = ( versionPrefix == null ? "" : versionPrefix ) + getVersion();
- getLog().debug( "Generating announcement for version [" + version + "]. Found these releases: "
- + ReleaseUtils.toString( releases ) );
+ getLog().debug(
+ "Generating announcement for version [" + version + "]. Found these releases: " + ReleaseUtils.toString(
+ releases ) );
doGenerate( releases, releaseUtils.getLatestRelease( releases, version ) );
}
@@ -603,7 +605,6 @@ public class AnnouncementMojo
context.put( "announceParameters", announceParameters );
}
-
processTemplate( context, getOutputDirectory(), template, announcementFile );
}
catch ( ResourceNotFoundException rnfe )
@@ -619,9 +620,9 @@ public class AnnouncementMojo
/**
* Create the velocity template
*
- * @param context velocity context that has the parameter values
- * @param outputDirectory directory where the file will be generated
- * @param template velocity template which will the context be merged
+ * @param context velocity context that has the parameter values
+ * @param outputDirectory directory where the file will be generated
+ * @param template velocity template which will the context be merged
* @param announcementFile The file name of the generated announcement
* @throws ResourceNotFoundException, VelocityException, IOException
*/
@@ -651,9 +652,8 @@ public class AnnouncementMojo
if ( StringUtils.isEmpty( templateEncoding ) )
{
- templateEncoding = ReaderFactory.FILE_ENCODING;
- getLog().warn(
- "File encoding has not been set, using platform encoding " + templateEncoding
+ templateEncoding = ReaderFactory.FILE_ENCODING;
+ getLog().warn( "File encoding has not been set, using platform encoding " + templateEncoding
+ ", i.e. build is platform dependent!" );
}
@@ -731,7 +731,7 @@ public class AnnouncementMojo
int originalNumberOfIssues = issueList.size();
issueList = IssueUtils.filterIssuesWithVersionPrefix( issueList, versionPrefix );
getLog().debug( "Filtered out " + issueList.size() + " issues of " + originalNumberOfIssues
- + " that matched the versionPrefix '" + versionPrefix + "'." );
+ + " that matched the versionPrefix '" + versionPrefix + "'." );
}
return getReleases( issueList, new JIRAIssueManagmentSystem() );
@@ -745,7 +745,7 @@ public class AnnouncementMojo
private List<Release> getReleases( List<Issue> issues, IssueManagementSystem ims )
throws MojoExecutionException
{
- if ( issueTypes != null )
+ if ( issueTypes != null )
{
ims.applyConfiguration( issueTypes );
}
@@ -851,16 +851,16 @@ public class AnnouncementMojo
{
this.introduction = introduction;
}
-
+
public void setIssueTypes( Map<String, String> issueTypes )
{
- this.issueTypes = issueTypes;
- }
+ this.issueTypes = issueTypes;
+ }
public Map<String, String> getIssueTypes()
{
- return issueTypes;
- }
+ return issueTypes;
+ }
public File getOutputDirectory()
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java Tue Aug 27 14:16:42 2013
@@ -105,12 +105,13 @@ public class ProjectJavamailMailSender
}
if ( userProperties != null )
{
- for (Object o : userProperties.keySet()) {
+ for ( Object o : userProperties.keySet() )
+ {
String key = (String) o;
- String value = userProperties.getProperty(key);
+ String value = userProperties.getProperty( key );
- props.put(key, value);
+ props.put( key, value );
}
}
}
@@ -151,9 +152,10 @@ public class ProjectJavamailMailSender
{
InternetAddress[] addressTo = new InternetAddress[mail.getToAddresses().size()];
int count = 0;
- for (Object o : mail.getToAddresses()) {
- String address = ((MailMessage.Address) o).getRfc2822Address();
- addressTo[count++] = new InternetAddress(address);
+ for ( Object o : mail.getToAddresses() )
+ {
+ String address = ( (MailMessage.Address) o ).getRfc2822Address();
+ addressTo[count++] = new InternetAddress( address );
}
msg.setRecipients( Message.RecipientType.TO, addressTo );
}
@@ -162,9 +164,10 @@ public class ProjectJavamailMailSender
{
InternetAddress[] addressCc = new InternetAddress[mail.getCcAddresses().size()];
int count = 0;
- for (Object o : mail.getCcAddresses()) {
- String address = ((MailMessage.Address) o).getRfc2822Address();
- addressCc[count++] = new InternetAddress(address);
+ for ( Object o : mail.getCcAddresses() )
+ {
+ String address = ( (MailMessage.Address) o ).getRfc2822Address();
+ addressCc[count++] = new InternetAddress( address );
}
msg.setRecipients( Message.RecipientType.CC, addressCc );
}
@@ -173,9 +176,10 @@ public class ProjectJavamailMailSender
{
InternetAddress[] addressBcc = new InternetAddress[mail.getBccAddresses().size()];
int count = 0;
- for (Object o : mail.getBccAddresses()) {
- String address = ((MailMessage.Address) o).getRfc2822Address();
- addressBcc[count++] = new InternetAddress(address);
+ for ( Object o : mail.getBccAddresses() )
+ {
+ String address = ( (MailMessage.Address) o ).getRfc2822Address();
+ addressBcc[count++] = new InternetAddress( address );
}
msg.setRecipients( Message.RecipientType.BCC, addressBcc );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java Tue Aug 27 14:16:42 2013
@@ -69,7 +69,7 @@ public abstract class AbstractChangesMoj
{
getLog().debug( "Root Folder:" + mavenSession.getExecutionRootDirectory() );
getLog().debug( "Current Folder:" + basedir );
- boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase(basedir);
+ boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase( basedir );
if ( result )
{
getLog().debug( "This is the execution root." );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java Tue Aug 27 14:16:42 2013
@@ -113,7 +113,7 @@ public class ChangesCheckMojo
/**
* Use the pattern to try to parse a Date from the given string.
*
- * @param string A date as text
+ * @param string A date as text
* @param pattern A pattern that can be used by {@link SimpleDateFormat}
* @return <code>true</code> if the string can be parsed as a date using the pattern, otherwise <code>false</code>
*/
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java Tue Aug 27 14:16:42 2013
@@ -208,13 +208,13 @@ public class ChangesMojo
/**
* The type of the feed to generate.
- *
+ * <p/>
* <p>
* Supported values are:
* <code>"rss_0.9", "rss_0.91N" (RSS 0.91 Netscape), "rss_0.91U" (RSS 0.91 Userland),
* "rss_0.92", "rss_0.93", "rss_0.94", "rss_1.0", "rss_2.0", "atom_0.3", "atom_1.0"</code>.
* </p>
- *
+ * <p/>
* <p>If not specified, no feed is generated.</p>
*
* @since 2.9
@@ -245,13 +245,15 @@ public class ChangesMojo
throws MavenReportException
{
Date now = new Date();
- SimpleDateFormat simpleDateFormat =
- new SimpleDateFormat(publishDateFormat, new Locale(publishDateLocale));
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat( publishDateFormat, new Locale( publishDateLocale ) );
Properties additionalProperties = new Properties();
- additionalProperties.put("publishDate", simpleDateFormat.format(now));
+ additionalProperties.put( "publishDate", simpleDateFormat.format( now ) );
- ChangesXML changesXml = getChangesFromFile( xmlPath, project, additionalProperties);
- if ( changesXml == null ) return;
+ ChangesXML changesXml = getChangesFromFile( xmlPath, project, additionalProperties );
+ if ( changesXml == null )
+ {
+ return;
+ }
if ( aggregated )
{
@@ -265,12 +267,15 @@ public class ChangesMojo
final String relativePath = absolutePath.substring( basePath.length() );
List releaseList = changesXml.getReleaseList();
- for (Object o : project.getCollectedProjects()) {
+ for ( Object o : project.getCollectedProjects() )
+ {
final MavenProject childProject = (MavenProject) o;
- final File changesFile = new File(childProject.getBasedir(), relativePath);
- final ChangesXML childXml = getChangesFromFile(changesFile, childProject, additionalProperties);
- if (childXml != null) {
- releaseList = releaseUtils.mergeReleases(releaseList, childProject.getName(), childXml.getReleaseList());
+ final File changesFile = new File( childProject.getBasedir(), relativePath );
+ final ChangesXML childXml = getChangesFromFile( changesFile, childProject, additionalProperties );
+ if ( childXml != null )
+ {
+ releaseList =
+ releaseUtils.mergeReleases( releaseList, childProject.getName(), childXml.getReleaseList() );
}
}
changesXml.setReleaseList( releaseList );
@@ -281,7 +286,7 @@ public class ChangesMojo
report.setAuthor( changesXml.getAuthor() );
report.setTitle( changesXml.getTitle() );
- report.setEscapeHTML ( escapeHTML );
+ report.setEscapeHTML( escapeHTML );
// Create a case insensitive version of issueLinkTemplatePerSystem
// We need something case insensitive to maintain backward compatibility
@@ -321,7 +326,7 @@ public class ChangesMojo
report.setSystem( system );
- report.setTeamlist ( teamlist );
+ report.setTeamlist( teamlist );
report.setUrl( url );
@@ -370,8 +375,8 @@ public class ChangesMojo
* Parses specified changes.xml file. It also makes filtering if needed. If specified file doesn't exist
* it will log warning and return <code>null</code>.
*
- * @param changesXml changes xml file to parse
- * @param project maven project to parse changes for
+ * @param changesXml changes xml file to parse
+ * @param project maven project to parse changes for
* @param additionalProperties additional properties used for filtering
* @return parsed <code>ChangesXML</code> instance or null if file doesn't exist
* @throws MavenReportException if any errors occurs while parsing
@@ -397,11 +402,12 @@ public class ChangesMojo
// so we get encoding from the file itself
xmlStreamReader = new XmlStreamReader( changesXml );
String encoding = xmlStreamReader.getEncoding();
- File resultFile = new File( filteredOutputDirectory, project.getGroupId() + "." + project.getArtifactId() + "-changes.xml" );
+ File resultFile = new File( filteredOutputDirectory,
+ project.getGroupId() + "." + project.getArtifactId() + "-changes.xml" );
final MavenFileFilterRequest mavenFileFilterRequest =
- new MavenFileFilterRequest( changesXml, resultFile, true, project, Collections.EMPTY_LIST, false,
- encoding, session, additionalProperties );
+ new MavenFileFilterRequest( changesXml, resultFile, true, project, Collections.EMPTY_LIST, false,
+ encoding, session, additionalProperties );
mavenFileFilter.copyFile( mavenFileFilterRequest );
changesXml = resultFile;
}
@@ -429,7 +435,7 @@ public class ChangesMojo
* Add the issue link template for the given issue management system,
* but only if it has not already been configured.
*
- * @param system The issue management system
+ * @param system The issue management system
* @param issueLinkTemplate The issue link template to use
* @since 2.4
*/
@@ -449,19 +455,16 @@ public class ChangesMojo
throws MavenReportException
{
final String pluginResourcesBase = "org/apache/maven/plugin/changes";
- String resourceNames[] = {
- "images/add.gif",
- "images/fix.gif",
- "images/icon_help_sml.gif",
- "images/remove.gif",
- "images/rss.png",
- "images/update.gif" };
+ String resourceNames[] =
+ { "images/add.gif", "images/fix.gif", "images/icon_help_sml.gif", "images/remove.gif", "images/rss.png",
+ "images/update.gif" };
try
{
getLog().debug( "Copying static resources." );
- for (String resourceName : resourceNames) {
- URL url = this.getClass().getClassLoader().getResource(pluginResourcesBase + "/" + resourceName);
- FileUtils.copyURLToFile(url, new File(getReportOutputDirectory(), resourceName));
+ for ( String resourceName : resourceNames )
+ {
+ URL url = this.getClass().getClassLoader().getResource( pluginResourcesBase + "/" + resourceName );
+ FileUtils.copyURLToFile( url, new File( getReportOutputDirectory(), resourceName ) );
}
}
catch ( IOException e )
@@ -490,9 +493,10 @@ public class ChangesMojo
}
else
{
- for (Object o : issueLinkTemplatePerSystem.entrySet()) {
+ for ( Object o : issueLinkTemplatePerSystem.entrySet() )
+ {
Map.Entry entry = (Map.Entry) o;
- getLog().debug("issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue());
+ getLog().debug( "issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue() );
}
}
}