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/26 19:57:05 UTC
svn commit: r1517623 [3/4] - in /maven/plugins/trunk:
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/
maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/child...
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java Mon Aug 26 17:57:00 2013
@@ -274,14 +274,14 @@ public class AttachedSignedArtifact
delegate.setOptional( optional );
}
- public Collection getMetadataList()
+ public Collection<ArtifactMetadata> getMetadataList()
{
- List result = new ArrayList( delegate.getMetadataList() );
+ List<ArtifactMetadata> result = new ArrayList<ArtifactMetadata>( delegate.getMetadataList() );
boolean alreadySigned = false;
for ( Iterator i = result.iterator(); i.hasNext() && !alreadySigned; )
{
ArtifactMetadata metadata = (ArtifactMetadata) i.next();
- alreadySigned = alreadySigned | signature.getKey().equals( metadata.getKey() );
+ alreadySigned = signature.getKey().equals(metadata.getKey());
}
if ( !alreadySigned )
{
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java Mon Aug 26 17:57:00 2013
@@ -938,8 +938,8 @@ public class DescribeMojo
Integer.TYPE } );
m.setAccessible( true );
List<String> output = (List<String>) m.invoke( HelpMojo.class,
- new Object[]{ text, indent, indentSize,
- lineLength} );
+ text, indent, indentSize,
+ lineLength);
if ( output == null )
{
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java Mon Aug 26 17:57:00 2013
@@ -97,8 +97,8 @@ public class SystemMojo
if ( output != null )
{
StringBuilder sb = new StringBuilder();
- sb.append( "Created by: " + getClass().getName() ).append( "\n" );
- sb.append( "Created on: " + new Date() ).append( "\n" ).append( "\n" );
+ sb.append("Created by: ").append(getClass().getName()).append("\n");
+ sb.append("Created on: ").append(new Date()).append("\n").append( "\n" );
sb.append( message.toString() );
try
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>../mod1-parent</relativePath>
</parent>
- <groupId>test</groupId>
- <artifactId>mod1</artifactId>
+ <artifactId>mod1</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>test</groupId>
- <artifactId>mod2</artifactId>
+ <artifactId>mod2</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>../mod1-parent</relativePath>
</parent>
- <groupId>test</groupId>
- <artifactId>mod3</artifactId>
+ <artifactId>mod3</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>../parent</relativePath>
</parent>
- <groupId>test</groupId>
- <artifactId>module-a</artifactId>
+ <artifactId>module-a</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>../parent</relativePath>
</parent>
- <groupId>test</groupId>
- <artifactId>module-b</artifactId>
+ <artifactId>module-b</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<artifactId>parent-b</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>minvoker-70</artifactId>
+ <artifactId>minvoker-70</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
</project>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<artifactId>parent-a</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>parent-b</artifactId>
+ <artifactId>parent-b</artifactId>
<packaging>pom</packaging>
<version>0.1-SNAPSHOT</version>
</project>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>../mod1-parent</relativePath>
</parent>
- <groupId>test</groupId>
- <artifactId>mod1</artifactId>
+ <artifactId>mod1</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>test</groupId>
- <artifactId>mod2</artifactId>
+ <artifactId>mod2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java Mon Aug 26 17:57:00 2013
@@ -169,7 +169,7 @@ class CompositeMap
*/
public boolean isEmpty()
{
- return this.mavenProject == null && this.mavenProject.getProperties().isEmpty() && this.properties.isEmpty();
+ return this.mavenProject.getProperties().isEmpty() && this.properties.isEmpty();
}
/**
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java Mon Aug 26 17:57:00 2013
@@ -306,12 +306,10 @@ public class JarSignMojo
getLog().info( line );
}
};
- final StringBuilder errBuffer = new StringBuilder();
StreamConsumer errConsumer = new StreamConsumer()
{
public void consumeLine( String line )
{
- errBuffer.append( line );
getLog().warn( line );
}
};
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java Mon Aug 26 17:57:00 2013
@@ -143,12 +143,10 @@ public class JarSignVerifyMojo
LineMatcherStreamConsumer outConsumer = new LineMatcherStreamConsumer( "jar verified." );
- final StringBuilder errBuffer = new StringBuilder();
StreamConsumer errConsumer = new StreamConsumer()
{
public void consumeLine(String line)
{
- errBuffer.append( line );
getLog().warn( line );
}
};
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>0.1</version>
</parent>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-a</artifactId>
+ <artifactId>MJAVADOC-275-mod-a</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>0.1</version>
</parent>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-b</artifactId>
+ <artifactId>MJAVADOC-275-mod-b</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>0.1</version>
</parent>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-c</artifactId>
+ <artifactId>MJAVADOC-275-mod-c</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Mon Aug 26 17:57:00 2013
@@ -611,7 +611,7 @@ public abstract class AbstractFixJavadoc
getLog().info( "OK, let's proceed..." );
break;
}
- if ( userExpression == null || JavadocUtil.equalsIgnoreCase( userExpression, "N", "No" ) )
+ if (JavadocUtil.equalsIgnoreCase( userExpression, "N", "No" ))
{
getLog().info( "No changes in your sources occur." );
return false;
@@ -932,7 +932,7 @@ public abstract class AbstractFixJavadoc
}
}
- projectClassLoader = new URLClassLoader( (URL[]) urls.toArray( new URL[urls.size()] ), null );
+ projectClassLoader = new URLClassLoader(urls.toArray( new URL[urls.size()] ), null );
}
return projectClassLoader;
@@ -2219,7 +2219,7 @@ public abstract class AbstractFixJavadoc
}
else
{
- if ( sinceClasses != null && !sinceClassesContains( ( (JavaMethod) entity ).getParentClass() ) )
+ if ( sinceClasses != null && !sinceClassesContains( entity.getParentClass() ) )
{
appendDefaultSinceTag( sb, indent );
}
@@ -3468,7 +3468,7 @@ public abstract class AbstractFixJavadoc
line = reader.readLine();
}
- return (String[]) lines.toArray(new String[lines.size()]);
+ return lines.toArray(new String[lines.size()]);
}
/**
@@ -3541,7 +3541,7 @@ public abstract class AbstractFixJavadoc
l.remove( 0 );
l.remove( 1 );
- return (String[]) l.toArray(new String[l.size()]);
+ return l.toArray(new String[l.size()]);
}
return params;
@@ -3623,7 +3623,7 @@ public abstract class AbstractFixJavadoc
public String getJavadocParamTag( String paramName, boolean nullable )
{
- String originalJavadocTag = (String) tagParams.get( paramName );
+ String originalJavadocTag = tagParams.get( paramName );
if ( !nullable && originalJavadocTag == null && getLog().isWarnEnabled() )
{
getLog().warn( getMessage( paramName, "javaEntityTags.tagParams" ) );
@@ -3644,7 +3644,7 @@ public abstract class AbstractFixJavadoc
public String getJavadocThrowsTag( String paramName, boolean nullable )
{
- String originalJavadocTag = (String) tagThrows.get( paramName );
+ String originalJavadocTag = tagThrows.get( paramName );
if ( !nullable && originalJavadocTag == null && getLog().isWarnEnabled() )
{
getLog().warn( getMessage( paramName, "javaEntityTags.tagThrows" ) );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Mon Aug 26 17:57:00 2013
@@ -3680,7 +3680,7 @@ public abstract class AbstractJavadocMoj
{
if ( isJavaDocVersionAtLeast( requiredJavaVersion ) )
{
- addArgIf( arguments, b, value );
+ addArgIf( arguments, true, value );
}
else
{
@@ -5263,7 +5263,7 @@ public abstract class AbstractJavadocMoj
}
}
- ClassLoader javadocClassLoader = new URLClassLoader( (URL[]) urls.toArray( new URL[urls.size()] ), null );
+ ClassLoader javadocClassLoader = new URLClassLoader(urls.toArray( new URL[urls.size()] ), null );
return javadocClassLoader.getResource( resource );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Mon Aug 26 17:57:00 2013
@@ -553,8 +553,7 @@ public class JavadocUtil
* @see #parseJavadocVersion(String)
*/
protected static float getJavadocVersion( File javadocExe )
- throws IOException, CommandLineException, IllegalArgumentException, PatternSyntaxException
- {
+ throws IOException, CommandLineException, IllegalArgumentException {
if ( ( javadocExe == null ) || ( !javadocExe.exists() ) || ( !javadocExe.isFile() ) )
{
throw new IOException( "The javadoc executable '" + javadocExe + "' doesn't exist or is not a file. " );
@@ -632,8 +631,7 @@ public class JavadocUtil
* @throws IllegalArgumentException if the output is null
*/
protected static float parseJavadocVersion( String output )
- throws IllegalArgumentException, PatternSyntaxException
- {
+ throws IllegalArgumentException {
if ( StringUtils.isEmpty( output ) )
{
throw new IllegalArgumentException( "The output could not be null." );
@@ -862,11 +860,11 @@ public class JavadocUtil
{
if ( file == null )
{
- throw new IOException( "The file " + file + " can't be null." );
+ throw new IOException( "The file can't be null." );
}
if ( url == null )
{
- throw new IOException( "The url " + url + " could not be null." );
+ throw new IOException( "The url could not be null." );
}
InputStream is = url.openStream();
@@ -1173,6 +1171,7 @@ public class JavadocUtil
{
if ( !invokerLog.exists() )
{
+ //noinspection ResultOfMethodCallIgnored
invokerLog.getParentFile().mkdirs();
}
os = new FileOutputStream( invokerLog );
@@ -1230,7 +1229,6 @@ public class JavadocUtil
finally
{
IOUtil.close( os );
- ps = null;
}
}
@@ -1432,12 +1430,8 @@ public class JavadocUtil
*/
public boolean hasMoreTokens()
{
- if ( lookahead != null )
- {
- return true;
- }
+ return lookahead != null || tokenizer.hasMoreTokens();
- return tokenizer.hasMoreTokens();
}
/**
Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java Mon Aug 26 17:57:00 2013
@@ -734,7 +734,7 @@ public class PdfMojo
private DocumentModel getDocumentModelFromDescriptor( Locale locale )
throws MojoExecutionException
{
- DocumentModel model = null;
+ DocumentModel model;
try
{
@@ -793,7 +793,7 @@ public class PdfMojo
{
if ( this.defaultLocale == null )
{
- this.defaultLocale = (Locale) getAvailableLocales().get( 0 );
+ this.defaultLocale = getAvailableLocales().get( 0 );
}
return this.defaultLocale;
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java Mon Aug 26 17:57:00 2013
@@ -118,7 +118,6 @@ public abstract class AbstractPmdViolati
if ( outputFile.exists() )
{
- final Reader reader = null;
try
{
final ViolationDetails<D> violations = getViolations( outputFile, failurePriority );
@@ -155,10 +154,6 @@ public abstract class AbstractPmdViolati
throw new MojoExecutionException( "Unable to read PMD results xml: " + outputFile.getAbsolutePath(),
e );
}
- finally
- {
- IOUtil.close( reader );
- }
}
else
{
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java Mon Aug 26 17:57:00 2013
@@ -87,7 +87,7 @@ public class App
}
}
- if ( "".equals( tmp ) || tmp == null )
+ if ("".equals( tmp ))
{
tmp = "EMPTY";
}
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java Mon Aug 26 17:57:00 2013
@@ -65,7 +65,7 @@ public class AppSample
}
}
- if ( "".equals( tmp ) || tmp == null )
+ if ("".equals( tmp ))
{
tmp = "EMPTY";
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java Mon Aug 26 17:57:00 2013
@@ -41,8 +41,8 @@ public class MakeDependentsMojo
visited.add(v);
out.add(ps.getProjectMap().get(v.getLabel()));
List parents = v.getParents();
- for (int i = 0; i < parents.size(); i++) {
- Vertex parent = (Vertex) parents.get(i);
+ for (Object parent1 : parents) {
+ Vertex parent = (Vertex) parent1;
if (visited.contains(parent)) continue;
gatherProjects(parent, ps, visited, out);
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java Mon Aug 26 17:57:00 2013
@@ -135,14 +135,14 @@ public class MakeMojo
String[] artifacts = StringUtils.split( artifactList, "," );
Set visited = new HashSet();
Set out = new HashSet();
- for (int i = 0; i < artifacts.length; i++) {
- String project = artifacts[i];
- if ( project.indexOf(':') == -1 ) {
+ for (String artifact : artifacts) {
+ String project = artifact;
+ if (project.indexOf(':') == -1) {
project = defaultGroup + ":" + project;
}
- Vertex projectVertex = dag.getVertex( project );
- if ( projectVertex == null ) throw new MissingProjectException(project);
- gatherProjects( projectVertex, ps, visited, out );
+ Vertex projectVertex = dag.getVertex(project);
+ if (projectVertex == null) throw new MissingProjectException(project);
+ gatherProjects(projectVertex, ps, visited, out);
}
// sort them again
@@ -190,29 +190,24 @@ public class MakeMojo
return;
String[] folders = StringUtils.split( folderList, "," );
Set pathSet = new HashSet();
- for ( int i = 0; i < folders.length; i++ )
- {
- File file = new File( baseDir, folders[i] );
- if ( !file.exists() )
- {
- throw new MojoFailureException("Folder doesn't exist: " + file.getAbsolutePath() );
+ for (String folder : folders) {
+ File file = new File(baseDir, folder);
+ if (!file.exists()) {
+ throw new MojoFailureException("Folder doesn't exist: " + file.getAbsolutePath());
}
String path = file.getAbsolutePath();
- pathSet.add( path );
+ pathSet.add(path);
}
if (artifactList == null) artifactList = "";
StringBuilder artifactBuffer = new StringBuilder(artifactList);
- for ( int i = 0; i < collectedProjects.size(); i++ )
- {
- MavenProject mp = (MavenProject) collectedProjects.get( i );
- if ( pathSet.contains( mp.getFile().getParentFile().getAbsolutePath() ) )
- {
- if ( artifactBuffer.length() > 0 )
- {
- artifactBuffer.append( ',' );
+ for (Object collectedProject : collectedProjects) {
+ MavenProject mp = (MavenProject) collectedProject;
+ if (pathSet.contains(mp.getFile().getParentFile().getAbsolutePath())) {
+ if (artifactBuffer.length() > 0) {
+ artifactBuffer.append(',');
}
- String id = ArtifactUtils.versionlessKey( mp.getGroupId(), mp.getArtifactId() );
- artifactBuffer.append( id );
+ String id = ArtifactUtils.versionlessKey(mp.getGroupId(), mp.getArtifactId());
+ artifactBuffer.append(id);
}
}
if ( artifactBuffer.length() == 0 )
@@ -227,12 +222,11 @@ public class MakeMojo
visited.add( v );
out.add( ps.getProjectMap().get( v.getLabel() ) );
List children = v.getChildren();
- for ( int i = 0; i < children.size(); i++ )
- {
- Vertex child = (Vertex) children.get( i );
- if ( visited.contains( child ) )
+ for (Object aChildren : children) {
+ Vertex child = (Vertex) aChildren;
+ if (visited.contains(child))
continue;
- gatherProjects( child, ps, visited, out );
+ gatherProjects(child, ps, visited, out);
}
return out;
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java Mon Aug 26 17:57:00 2013
@@ -77,7 +77,7 @@ public class MakeScmChanges
{
throw new MojoFailureException("No SCM connection specified. You must specify an SCM connection by adding a <connection> element to your <scm> element in your POM");
}
- StatusScmResult result = null;
+ StatusScmResult result;
try
{
ScmRepository repository = scmManager.makeScmRepository( scmConnection );
@@ -92,43 +92,36 @@ public class MakeScmChanges
List projectDirectories = getProjectDirectories();
Set changedDirectories = new HashSet();
- for ( int i = 0; i < changedFiles.size(); i++ )
- {
- ScmFile changedScmFile = (ScmFile) changedFiles.get( i );
- getLog().debug( changedScmFile.toString() );
+ for (Object changedFile1 : changedFiles) {
+ ScmFile changedScmFile = (ScmFile) changedFile1;
+ getLog().debug(changedScmFile.toString());
ScmFileStatus status = changedScmFile.getStatus();
- if ( !status.isStatus() )
- {
- getLog().debug( "Not a diff: " + status );
+ if (!status.isStatus()) {
+ getLog().debug("Not a diff: " + status);
continue;
}
- if ( ignoreUnknown && ScmFileStatus.UNKNOWN.equals( status ) )
- {
- getLog().debug( "Ignoring unknown" );
+ if (ignoreUnknown && ScmFileStatus.UNKNOWN.equals(status)) {
+ getLog().debug("Ignoring unknown");
continue;
}
- File changedFile = new File( changedScmFile.getPath() );
+ File changedFile = new File(changedScmFile.getPath());
boolean found = false;
// TODO There's a cleverer/faster way to code this, right? This is O(n^2)
- for ( int j = 0; j < projectDirectories.size(); j++ )
- {
- File projectDirectory = (File) projectDirectories.get( j );
- if ( changedFile.getAbsolutePath().startsWith( projectDirectory.getAbsolutePath() + File.separator ) )
- {
- String path = RelativePather.getRelativePath( baseDir, projectDirectory );
- if ( !changedDirectories.contains( path ) )
- {
- getLog().debug( "Including " + path );
+ for (Object projectDirectory1 : projectDirectories) {
+ File projectDirectory = (File) projectDirectory1;
+ if (changedFile.getAbsolutePath().startsWith(projectDirectory.getAbsolutePath() + File.separator)) {
+ String path = RelativePather.getRelativePath(baseDir, projectDirectory);
+ if (!changedDirectories.contains(path)) {
+ getLog().debug("Including " + path);
}
- changedDirectories.add( path );
+ changedDirectories.add(path);
found = true;
break;
}
}
- if ( !found )
- {
- getLog().debug( "Couldn't find file in any reactor root: " + changedFile.getAbsolutePath() );
+ if (!found) {
+ getLog().debug("Couldn't find file in any reactor root: " + changedFile.getAbsolutePath());
}
}
folderList = StringUtils.join( changedDirectories.iterator(), "," );
@@ -140,10 +133,9 @@ public class MakeScmChanges
private List getProjectDirectories()
{
List dirs = new ArrayList( collectedProjects.size() );
- for ( int i = 0; i < collectedProjects.size(); i++ )
- {
- MavenProject mp = (MavenProject) collectedProjects.get( i );
- dirs.add( mp.getFile().getParentFile() );
+ for (Object collectedProject : collectedProjects) {
+ MavenProject mp = (MavenProject) collectedProject;
+ dirs.add(mp.getFile().getParentFile());
}
return dirs;
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java Mon Aug 26 17:57:00 2013
@@ -42,7 +42,8 @@ class RelativePather {
int count = 0;
Iterator contextChunker = contextChunks.iterator();
Iterator destChunker = destChunks.iterator();
- String contextChunk = (String) contextChunker.next();
+ String contextChunk;
+ contextChunker.next();
String destChunk = (String) destChunker.next();
boolean pathsDiffer = false;
while (true) {
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java Mon Aug 26 17:57:00 2013
@@ -74,104 +74,85 @@ public class SuperProjectSorter
projectMap = new HashMap();
- for ( Iterator i = projects.iterator(); i.hasNext(); )
- {
- MavenProject project = (MavenProject) i.next();
+ for (Object project2 : projects) {
+ MavenProject project = (MavenProject) project2;
- String id = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ String id = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
- if ( dag.getVertex( id ) != null )
- {
- throw new DuplicateProjectException( "Project '" + id + "' is duplicated in the reactor" );
+ if (dag.getVertex(id) != null) {
+ throw new DuplicateProjectException("Project '" + id + "' is duplicated in the reactor");
}
- dag.addVertex( id );
+ dag.addVertex(id);
- projectMap.put( id, project );
+ projectMap.put(id, project);
}
- for ( Iterator i = projects.iterator(); i.hasNext(); )
- {
- MavenProject project = (MavenProject) i.next();
+ for (Object project1 : projects) {
+ MavenProject project = (MavenProject) project1;
- String id = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ String id = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
- for ( Iterator j = project.getDependencies().iterator(); j.hasNext(); )
- {
- Dependency dependency = (Dependency) j.next();
+ for (Object o1 : project.getDependencies()) {
+ Dependency dependency = (Dependency) o1;
String dependencyId = ArtifactUtils
- .versionlessKey( dependency.getGroupId(), dependency.getArtifactId() );
+ .versionlessKey(dependency.getGroupId(), dependency.getArtifactId());
- if ( dag.getVertex( dependencyId ) != null )
- {
- project.addProjectReference( (MavenProject) projectMap.get( dependencyId ) );
+ if (dag.getVertex(dependencyId) != null) {
+ project.addProjectReference((MavenProject) projectMap.get(dependencyId));
- dag.addEdge( id, dependencyId );
+ dag.addEdge(id, dependencyId);
}
}
MavenProject parent = project.getParent();
- if ( parent != null )
- {
- String parentId = ArtifactUtils.versionlessKey( parent.getGroupId(), parent.getArtifactId() );
- if ( dag.getVertex( parentId ) != null )
- {
+ if (parent != null) {
+ String parentId = ArtifactUtils.versionlessKey(parent.getGroupId(), parent.getArtifactId());
+ if (dag.getVertex(parentId) != null) {
// Parent is added as an edge, but must not cause a cycle - so we remove any other edges it has in conflict
- if ( dag.hasEdge( parentId, id ) )
- {
- dag.removeEdge( parentId, id );
+ if (dag.hasEdge(parentId, id)) {
+ dag.removeEdge(parentId, id);
}
- dag.addEdge( id, parentId );
+ dag.addEdge(id, parentId);
}
}
List buildPlugins = project.getBuildPlugins();
- if ( buildPlugins != null )
- {
- for ( Iterator j = buildPlugins.iterator(); j.hasNext(); )
- {
- Plugin plugin = (Plugin) j.next();
- String pluginId = ArtifactUtils.versionlessKey( plugin.getGroupId(), plugin.getArtifactId() );
- if ( dag.getVertex( pluginId ) != null && !pluginId.equals( id ) )
- {
- addEdgeWithParentCheck( projectMap, pluginId, project, id );
+ if (buildPlugins != null) {
+ for (Object buildPlugin : buildPlugins) {
+ Plugin plugin = (Plugin) buildPlugin;
+ String pluginId = ArtifactUtils.versionlessKey(plugin.getGroupId(), plugin.getArtifactId());
+ if (dag.getVertex(pluginId) != null && !pluginId.equals(id)) {
+ addEdgeWithParentCheck(projectMap, pluginId, project, id);
}
}
}
List reportPlugins = project.getReportPlugins();
- if ( reportPlugins != null )
- {
- for ( Iterator j = reportPlugins.iterator(); j.hasNext(); )
- {
- ReportPlugin plugin = (ReportPlugin) j.next();
- String pluginId = ArtifactUtils.versionlessKey( plugin.getGroupId(), plugin.getArtifactId() );
- if ( dag.getVertex( pluginId ) != null && !pluginId.equals( id ) )
- {
- addEdgeWithParentCheck( projectMap, pluginId, project, id );
+ if (reportPlugins != null) {
+ for (Object reportPlugin : reportPlugins) {
+ ReportPlugin plugin = (ReportPlugin) reportPlugin;
+ String pluginId = ArtifactUtils.versionlessKey(plugin.getGroupId(), plugin.getArtifactId());
+ if (dag.getVertex(pluginId) != null && !pluginId.equals(id)) {
+ addEdgeWithParentCheck(projectMap, pluginId, project, id);
}
}
}
- for ( Iterator j = project.getBuildExtensions().iterator(); j.hasNext(); )
- {
- Extension extension = (Extension) j.next();
- String extensionId = ArtifactUtils.versionlessKey( extension.getGroupId(), extension.getArtifactId() );
- if ( dag.getVertex( extensionId ) != null )
- {
- addEdgeWithParentCheck( projectMap, extensionId, project, id );
+ for (Object o : project.getBuildExtensions()) {
+ Extension extension = (Extension) o;
+ String extensionId = ArtifactUtils.versionlessKey(extension.getGroupId(), extension.getArtifactId());
+ if (dag.getVertex(extensionId) != null) {
+ addEdgeWithParentCheck(projectMap, extensionId, project, id);
}
}
}
List sortedProjects = new ArrayList();
- for ( Iterator i = TopologicalSorter.sort( dag ).iterator(); i.hasNext(); )
- {
- String id = (String) i.next();
-
- sortedProjects.add( projectMap.get( id ) );
+ for (String id : TopologicalSorter.sort(dag)) {
+ sortedProjects.add(projectMap.get(id));
}
this.sortedProjects = Collections.unmodifiableList( sortedProjects );
Modified: maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java Mon Aug 26 17:57:00 2013
@@ -67,7 +67,7 @@ public class MakeMojoTest
configureProject( businessLogic, "businessLogic", "reactortest", "1.0" );
configureProject( ui, "ui", "reactortest", "1.0" );
- configuredProjects = Arrays.asList( new MavenProject[] { dataAccess, businessLogic, ui } );
+ configuredProjects = Arrays.asList(dataAccess, businessLogic, ui);
// ui depends on businessLogic
// businessLogic depends on dataAccess
@@ -141,7 +141,7 @@ public class MakeMojoTest
m.simpleInvoker = fi;
ScmFile sf = new ScmFile( businessLogic.getFile().getAbsolutePath(), ScmFileStatus.MODIFIED );
- m.scmManager = new FakeScmManager( Arrays.asList( new ScmFile[] { sf } ) );
+ m.scmManager = new FakeScmManager( Arrays.asList(sf) );
m.scmConnection = "";
m.execute();
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.maven.plugin.rresource.it</groupId>
- <artifactId>test</artifactId>
+ <artifactId>test</artifactId>
<version>1.0</version>
<repositories>
Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target-no-scm/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target-no-scm/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target-no-scm/pom.xml (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target-no-scm/pom.xml Mon Aug 26 17:57:00 2013
@@ -9,9 +9,8 @@
<version>1.0</version>
<relativePath>../../it-parent/pom.xml</relativePath>
</parent>
-
- <groupId>org.apache.maven.its.repository</groupId>
- <artifactId>bundle-pack-target-no-scm</artifactId>
+
+ <artifactId>bundle-pack-target-no-scm</artifactId>
<version>1.0</version>
<name>bundle-pack Target without SCM</name>
Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target/pom.xml (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/it/bootstrap/bundle-pack-target/pom.xml Mon Aug 26 17:57:00 2013
@@ -9,9 +9,8 @@
<version>1.0</version>
<relativePath>../../it-parent/pom.xml</relativePath>
</parent>
-
- <groupId>org.apache.maven.its.repository</groupId>
- <artifactId>bundle-pack-target</artifactId>
+
+ <artifactId>bundle-pack-target</artifactId>
<version>1.0</version>
<name>bundle-pack Target</name>
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java Mon Aug 26 17:57:00 2013
@@ -600,7 +600,6 @@ public class BundleCreateMojoTest
{
System.out.println( "Target directory not created." );
- return;
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-relocated-result/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-relocated-result/child/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-relocated-result/child/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-relocated-result/child/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>1.0</version>
</parent>
- <groupId>org.apache.maven.its.shade.drpwlp</groupId>
- <artifactId>child</artifactId>
+ <artifactId>child</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-with-local-parent/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-with-local-parent/child/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-with-local-parent/child/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-with-local-parent/child/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
<version>1.0</version>
</parent>
- <groupId>org.apache.maven.its.shade.drpwlp</groupId>
- <artifactId>child</artifactId>
+ <artifactId>child</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java Mon Aug 26 17:57:00 2013
@@ -180,7 +180,7 @@ public class ShadeMojoTest
assertEquals( 1, filters.size() );
// the filter must be able to filter the binary and the sources jar
- Filter filter = (Filter) filters.get( 0 );
+ Filter filter = filters.get( 0 );
assertTrue( filter.canFilter( new File( "myfaces-impl-2.0.1-SNAPSHOT.jar" ) ) ); // binary jar
assertTrue( filter.canFilter( new File( "myfaces-impl-2.0.1-SNAPSHOT-sources.jar" ) ) ); // sources jar
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/projects/test-artifact/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.shade</groupId>
- <artifactId>test-artifact</artifactId>
+ <artifactId>test-artifact</artifactId>
<name>test-artifact</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>root/pom.xml</relativePath>
</parent>
- <groupId>org.apache.maven.plugins.its.differentparentsite</groupId>
- <artifactId>main</artifactId>
+ <artifactId>main</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/pom.xml Mon Aug 26 17:57:00 2013
@@ -29,8 +29,7 @@ under the License.
<relativePath>root/pom.xml</relativePath>
</parent>
- <groupId>org.apache.maven.plugins.its.noparentsite</groupId>
- <artifactId>main</artifactId>
+ <artifactId>main</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Mon Aug 26 17:57:00 2013
@@ -620,10 +620,7 @@ public abstract class AbstractDeployMojo
proxyInfo.setUserName( proxy.getUsername() );
proxyInfo.setPassword( proxy.getPassword() );
- getLog().debug( "found proxyInfo " + ( proxyInfo == null
- ? "null"
- : "host:port " + proxyInfo.getHost() + ":" + proxyInfo.getPort() + ", "
- + proxyInfo.getUserName() ) );
+ getLog().debug("found proxyInfo " + ("host:port " + proxyInfo.getHost() + ":" + proxyInfo.getPort() + ", " + proxyInfo.getUserName()));
return proxyInfo;
}
@@ -719,7 +716,7 @@ public abstract class AbstractDeployMojo
try
{
Method methodContainerRealm = container.getClass().getMethod( "getContainerRealm" );
- ClassRealm realm = (ClassRealm) methodContainerRealm.invoke( container, null );
+ ClassRealm realm = (ClassRealm) methodContainerRealm.invoke( container );
Method methodConfigure = componentConfigurator.getClass().getMethod( "configureComponent",
new Class[]{ Object.class,
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework1111</artifactId>
+ <artifactId>site-framework1111</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework1111</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework111</artifactId>
+ <artifactId>site-framework111</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework111</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework112</artifactId>
+ <artifactId>site-framework112</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework112</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework11</artifactId>
+ <artifactId>site-framework11</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework11</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework12</artifactId>
+ <artifactId>site-framework12</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework12</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework13</artifactId>
+ <artifactId>site-framework13</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework13</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework14111</artifactId>
+ <artifactId>site-framework14111</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework14111</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework14112</artifactId>
+ <artifactId>site-framework14112</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework14112</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework1411</artifactId>
+ <artifactId>site-framework1411</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework1411</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework1412</artifactId>
+ <artifactId>site-framework1412</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework1412</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework141</artifactId>
+ <artifactId>site-framework141</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework141</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework14</artifactId>
+ <artifactId>site-framework14</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework14</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework1</artifactId>
+ <artifactId>site-framework1</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework1</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework21</artifactId>
+ <artifactId>site-framework21</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework21</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework22111</artifactId>
+ <artifactId>site-framework22111</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework22111</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework2211</artifactId>
+ <artifactId>site-framework2211</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2211</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework2212</artifactId>
+ <artifactId>site-framework2212</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2212</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework221</artifactId>
+ <artifactId>site-framework221</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework221</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework22211</artifactId>
+ <artifactId>site-framework22211</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework22211</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework2221</artifactId>
+ <artifactId>site-framework2221</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2221</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework2222</artifactId>
+ <artifactId>site-framework2222</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2222</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework222</artifactId>
+ <artifactId>site-framework222</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework222</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework22</artifactId>
+ <artifactId>site-framework22</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework22</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework23</artifactId>
+ <artifactId>site-framework23</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework23</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml Mon Aug 26 17:57:00 2013
@@ -28,8 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.site.multiproject</groupId>
- <artifactId>site-framework2</artifactId>
+ <artifactId>site-framework2</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml Mon Aug 26 17:57:00 2013
@@ -27,8 +27,7 @@ under the License.
<artifactId>site-plugin-test11</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugin.site.test11</groupId>
- <artifactId>framework</artifactId>
+ <artifactId>framework</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml Mon Aug 26 17:57:00 2013
@@ -27,8 +27,7 @@ under the License.
<artifactId>site-plugin-test11</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugin.site.test11</groupId>
- <artifactId>framework2</artifactId>
+ <artifactId>framework2</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear>