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 20:25:11 UTC
svn commit: r1517906 [23/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-antr...
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java Tue Aug 27 18:25:03 2013
@@ -35,9 +35,8 @@ public final class RelativizePath
}
/**
- * relativize a pathname.
- *
- * @param thing Absolute File of something. (e.g., a parent pom)
+ * relativize a pathname.
+ * @param thing Absolute File of something. (e.g., a parent pom)
* @param relativeTo base to relativize it do. (e.g., a pom into which a relative pathname to the 'thing' is to be installed).
* @return
*/
@@ -49,20 +48,18 @@ public final class RelativizePath
{
return thing.getName(); // a very simple relative path.
}
-
+
List<String> thingDirectories = RelativizePath.parentDirs( thing );
List<String> relativeToDirectories = RelativizePath.parentDirs( relativeTo );
-
+
//Get the shortest of the two paths
- int length = thingDirectories.size() < relativeToDirectories.size()
- ? thingDirectories.size()
- : relativeToDirectories.size();
-
+ int length = thingDirectories.size() < relativeToDirectories.size() ? thingDirectories.size() : relativeToDirectories.size();
+
int lastCommonRoot = -1; // index of the lowest directory down from the root that the two have in common.
int index;
-
+
//Find common root
- for ( index = 0; index < length; index++ )
+ for ( index = 0; index < length; index++ )
{
if ( thingDirectories.get( index ).equals( relativeToDirectories.get( index ) ) )
{
@@ -78,15 +75,15 @@ public final class RelativizePath
// Build up the relative path
relativePath = new StringBuilder();
// add ..'s to get from the base up to the common point
- for ( index = lastCommonRoot + 1; index < relativeToDirectories.size(); index++ )
+ for ( index = lastCommonRoot + 1; index < relativeToDirectories.size(); index++ )
{
relativePath.append( "../" );
}
-
+
// now add down from the common point to the actual 'thing' item.
- for ( index = lastCommonRoot + 1; index < thingDirectories.size(); index++ )
+ for ( index = lastCommonRoot + 1; index < thingDirectories.size(); index++ )
{
- relativePath.append( thingDirectories.get( index ) ).append( '/' );
+ relativePath.append(thingDirectories.get(index)).append('/');
}
relativePath.append( thing.getName() );
return relativePath.toString();
@@ -97,14 +94,14 @@ public final class RelativizePath
static List<String> parentDirs( File of )
{
List<String> results = new ArrayList<String>();
- for ( File p = of.getParentFile(); p != null; p = p.getParentFile() )
+ for ( File p = of.getParentFile() ; p != null ; p = p.getParentFile() )
{
if ( !"".equals( p.getName() ) )
{
results.add( p.getName() );
}
}
-
+
Collections.reverse( results );
return results;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java Tue Aug 27 18:25:03 2013
@@ -1133,40 +1133,33 @@ public class MavenJDOMWriter
{
Xpp3Dom[] childs = parentDom.getChildren();
Collection domChilds = new ArrayList();
- Collections.addAll( domChilds, childs );
+ Collections.addAll(domChilds, childs);
// int domIndex = 0;
- for ( Object o : parent.getChildren() )
- {
+ for (Object o : parent.getChildren()) {
Element elem = (Element) o;
Iterator it2 = domChilds.iterator();
Xpp3Dom corrDom = null;
- while ( it2.hasNext() )
- {
+ while (it2.hasNext()) {
Xpp3Dom dm = (Xpp3Dom) it2.next();
- if ( dm.getName().equals( elem.getName() ) )
- {
+ if (dm.getName().equals(elem.getName())) {
corrDom = dm;
break;
}
}
- if ( corrDom != null )
- {
- domChilds.remove( corrDom );
- replaceXpp3DOM( elem, corrDom, new Counter( counter.getDepth() + 1 ) );
+ if (corrDom != null) {
+ domChilds.remove(corrDom);
+ replaceXpp3DOM(elem, corrDom, new Counter(counter.getDepth() + 1));
counter.increaseCount();
- }
- else
- {
- parent.removeContent( elem );
+ } else {
+ parent.removeContent(elem);
}
}
- for ( Object domChild : domChilds )
- {
+ for (Object domChild : domChilds) {
Xpp3Dom dm = (Xpp3Dom) domChild;
- Element elem = factory.element( dm.getName(), parent.getNamespace() );
- insertAtPreferredLocation( parent, elem, counter );
+ Element elem = factory.element(dm.getName(), parent.getNamespace());
+ insertAtPreferredLocation(parent, elem, counter);
counter.increaseCount();
- replaceXpp3DOM( elem, dm, new Counter( counter.getDepth() + 1 ) );
+ replaceXpp3DOM(elem, dm, new Counter(counter.getDepth() + 1));
}
}
else if ( parentDom.getValue() != null )
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java Tue Aug 27 18:25:03 2013
@@ -140,8 +140,8 @@ public class ApacheNoticeResourceTransfo
if ( trimedLine.startsWith( "- " ) )
{
//resource-bundle 1.3 mode
- if ( lineCount == 1 && sb.toString().contains(
- "This product includes/uses software(s) developed by" ) )
+ if ( lineCount == 1
+ && sb.toString().contains("This product includes/uses software(s) developed by"))
{
currentOrg = organizationEntries.get( sb.toString().trim() );
if ( currentOrg == null )
@@ -164,7 +164,7 @@ public class ApacheNoticeResourceTransfo
else
{
String ent = sb.toString();
- if ( ent.startsWith( projectName ) && ent.contains( "Copyright " ) )
+ if ( ent.startsWith( projectName ) && ent.contains("Copyright "))
{
copyright = ent;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java Tue Aug 27 18:25:03 2013
@@ -87,45 +87,40 @@ public class ComponentsXmlResourceTransf
Xpp3Dom[] children = newDom.getChild( "components" ).getChildren( "component" );
- for ( Xpp3Dom component : children )
- {
- String role = getValue( component, "role" );
- role = getRelocatedClass( role, relocators );
- setValue( component, "role", role );
-
- String roleHint = getValue( component, "role-hint" );
-
- String impl = getValue( component, "implementation" );
- impl = getRelocatedClass( impl, relocators );
- setValue( component, "implementation", impl );
+ for (Xpp3Dom component : children) {
+ String role = getValue(component, "role");
+ role = getRelocatedClass(role, relocators);
+ setValue(component, "role", role);
+
+ String roleHint = getValue(component, "role-hint");
+
+ String impl = getValue(component, "implementation");
+ impl = getRelocatedClass(impl, relocators);
+ setValue(component, "implementation", impl);
String key = role + ':' + roleHint;
- if ( components.containsKey( key ) )
- {
+ if (components.containsKey(key)) {
// TODO: use the tools in Plexus to merge these properly. For now, I just need an all-or-nothing
// configuration carry over
- Xpp3Dom dom = components.get( key );
- if ( dom.getChild( "configuration" ) != null )
- {
- component.addChild( dom.getChild( "configuration" ) );
+ Xpp3Dom dom = components.get(key);
+ if (dom.getChild("configuration") != null) {
+ component.addChild(dom.getChild("configuration"));
}
}
- Xpp3Dom requirements = component.getChild( "requirements" );
- if ( requirements != null && requirements.getChildCount() > 0 )
- {
- for ( int r = requirements.getChildCount() - 1; r >= 0; r-- )
- {
- Xpp3Dom requirement = requirements.getChild( r );
-
- String requiredRole = getValue( requirement, "role" );
- requiredRole = getRelocatedClass( requiredRole, relocators );
- setValue( requirement, "role", requiredRole );
+ Xpp3Dom requirements = component.getChild("requirements");
+ if (requirements != null && requirements.getChildCount() > 0) {
+ for (int r = requirements.getChildCount() - 1; r >= 0; r--) {
+ Xpp3Dom requirement = requirements.getChild(r);
+
+ String requiredRole = getValue(requirement, "role");
+ requiredRole = getRelocatedClass(requiredRole, relocators);
+ setValue(requirement, "role", requiredRole);
}
}
- components.put( key, component );
+ components.put(key, component);
}
}
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -80,9 +80,8 @@ public class ShadeMojoTest
set.add( new File( getBasedir(), "src/test/jars/test-artifact-1.0-SNAPSHOT.jar" ) );
List<Relocator> relocators = new ArrayList<Relocator>();
- relocators.add( new SimpleRelocator( "org.codehaus.plexus.util", "hidden", null,
- Arrays.asList( "org.codehaus.plexus.util.xml.Xpp3Dom",
- "org.codehaus.plexus.util.xml.pull.*" ) ) );
+ relocators.add( new SimpleRelocator( "org.codehaus.plexus.util", "hidden", null, Arrays.asList(
+ "org.codehaus.plexus.util.xml.Xpp3Dom", "org.codehaus.plexus.util.xml.pull.*") ) );
List<ResourceTransformer> resourceTransformers = new ArrayList<ResourceTransformer>();
@@ -175,7 +174,7 @@ public class ShadeMojoTest
// invoke getFilters()
Method getFilters = ShadeMojo.class.getDeclaredMethod( "getFilters", new Class[0] );
getFilters.setAccessible( true );
- List<Filter> filters = (List<Filter>) getFilters.invoke( mojo );
+ List<Filter> filters = (List<Filter>) getFilters.invoke( mojo);
// assertions - there must be one filter
assertEquals( 1, filters.size() );
@@ -199,9 +198,8 @@ public class ShadeMojoTest
List<Relocator> relocators = new ArrayList<Relocator>();
- relocators.add( new SimpleRelocator( "org/codehaus/plexus/util", shadedPattern, null,
- Arrays.asList( "org/codehaus/plexus/util/xml/Xpp3Dom",
- "org/codehaus/plexus/util/xml/pull.*" ) ) );
+ relocators.add( new SimpleRelocator( "org/codehaus/plexus/util", shadedPattern, null, Arrays.asList(
+ "org/codehaus/plexus/util/xml/Xpp3Dom", "org/codehaus/plexus/util/xml/pull.*") ) );
List<ResourceTransformer> resourceTransformers = new ArrayList<ResourceTransformer>();
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java Tue Aug 27 18:25:03 2013
@@ -28,8 +28,8 @@ public class SimpleRelocatorTest
assertEquals( false, relocator.canRelocatePath( "org/Foo/Class" ) );
assertEquals( false, relocator.canRelocatePath( "org/Foo/Class.class" ) );
- relocator = new SimpleRelocator( "org.foo", null, null, Arrays.asList( "org.foo.Excluded", "org.foo.public.*",
- "org.foo.Public*Stuff" ) );
+ relocator = new SimpleRelocator( "org.foo", null, null, Arrays.asList(
+ "org.foo.Excluded", "org.foo.public.*", "org.foo.Public*Stuff") );
assertEquals( true, relocator.canRelocatePath( "org/foo/Class" ) );
assertEquals( true, relocator.canRelocatePath( "org/foo/Class.class" ) );
assertEquals( true, relocator.canRelocatePath( "org/foo/excluded" ) );
@@ -57,8 +57,8 @@ public class SimpleRelocatorTest
assertEquals( false, relocator.canRelocateClass( "com.foo.bar.Class" ) );
assertEquals( false, relocator.canRelocateClass( "org.Foo.Class" ) );
- relocator = new SimpleRelocator( "org.foo", null, null, Arrays.asList( "org.foo.Excluded", "org.foo.public.*",
- "org.foo.Public*Stuff" ) );
+ relocator = new SimpleRelocator( "org.foo", null, null, Arrays.asList(
+ "org.foo.Excluded", "org.foo.public.*", "org.foo.Public*Stuff") );
assertEquals( true, relocator.canRelocateClass( "org.foo.Class" ) );
assertEquals( true, relocator.canRelocateClass( "org.foo.excluded" ) );
assertEquals( false, relocator.canRelocateClass( "org.foo.Excluded" ) );
@@ -76,18 +76,17 @@ public class SimpleRelocatorTest
relocator = new SimpleRelocator( "org/foo", null, null, null, true );
assertEquals( true, relocator.canRelocatePath( "(I)org/foo/bar/Class;" ) );
-
+
relocator = new SimpleRelocator( "^META-INF/org.foo.xml$", null, null, null, true );
assertEquals( true, relocator.canRelocatePath( "META-INF/org.foo.xml" ) );
}
-
+
//MSHADE-119, make sure that the easy part of this works.
- public void testCanRelocateAbsClassPath()
+ public void testCanRelocateAbsClassPath()
{
SimpleRelocator relocator = new SimpleRelocator( "org.apache.velocity", "org.apache.momentum", null, null );
- assertEquals( "/org/apache/momentum/mass.properties",
- relocator.relocatePath( "/org/apache/velocity/mass.properties" ) );
-
+ assertEquals("/org/apache/momentum/mass.properties", relocator.relocatePath( "/org/apache/velocity/mass.properties" ) );
+
}
public void testRelocatePath()
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>projects-parent</artifactId>
<groupId>org.apache.maven.plugins.shade</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -19,18 +19,17 @@ specific language governing permissions
under the License.
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugins.its.differentparentsite</groupId>
<artifactId>root</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>root/pom.xml</relativePath>
+ <relativePath>root/pom.xml</relativePath>
</parent>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -19,18 +19,17 @@ specific language governing permissions
under the License.
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugins.its.noparentsite</groupId>
<artifactId>root</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>root/pom.xml</relativePath>
+ <relativePath>root/pom.xml</relativePath>
</parent>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -246,8 +246,7 @@ public abstract class AbstractDeployMojo
protected String getDeployModuleDirectory()
throws MojoExecutionException
{
- String relative =
- siteTool.getRelativePath( getSite( project ).getUrl(), getTopDistributionManagementSiteUrl() );
+ String relative = siteTool.getRelativePath( getSite( project ).getUrl(), getTopDistributionManagementSiteUrl() );
// SiteTool.getRelativePath() uses File.separatorChar,
// so we need to convert '\' to '/' in order for the URL to be valid for Windows users
@@ -396,9 +395,8 @@ public abstract class AbstractDeployMojo
throws MojoExecutionException
{
AuthenticationInfo authenticationInfo = wagonManager.getAuthenticationInfo( repository.getId() );
- getLog().debug( "authenticationInfo with id '" + repository.getId() + "': " + ( ( authenticationInfo == null )
- ? "-"
- : authenticationInfo.getUserName() ) );
+ getLog().debug( "authenticationInfo with id '" + repository.getId() + "': "
+ + ( ( authenticationInfo == null ) ? "-" : authenticationInfo.getUserName() ) );
try
{
@@ -622,9 +620,7 @@ public abstract class AbstractDeployMojo
proxyInfo.setUserName( proxy.getUsername() );
proxyInfo.setPassword( proxy.getPassword() );
- getLog().debug(
- "found proxyInfo " + ( "host:port " + proxyInfo.getHost() + ":" + proxyInfo.getPort()
- + ", " + proxyInfo.getUserName() ) );
+ getLog().debug("found proxyInfo " + ("host:port " + proxyInfo.getHost() + ":" + proxyInfo.getPort() + ", " + proxyInfo.getUserName()));
return proxyInfo;
}
@@ -672,7 +668,8 @@ public abstract class AbstractDeployMojo
(ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, "basic" );
if ( isMaven3OrMore() )
{
- componentConfigurator.configureComponent( wagon, plexusConf, container.getContainerRealm() );
+ componentConfigurator.configureComponent( wagon, plexusConf,
+ container.getContainerRealm() );
}
else
{
@@ -687,9 +684,8 @@ public abstract class AbstractDeployMojo
}
catch ( ComponentConfigurationException e )
{
- throw new TransferFailedException(
- "While configuring wagon for \'" + repositoryId + "\': Unable to apply wagon configuration.",
- e );
+ throw new TransferFailedException( "While configuring wagon for \'" + repositoryId
+ + "\': Unable to apply wagon configuration.", e );
}
finally
{
@@ -767,14 +763,14 @@ public abstract class AbstractDeployMojo
if ( site == null )
{
- throw new MojoExecutionException(
- "Missing site information in the distribution management of the project " + getFullName( project ) );
+ throw new MojoExecutionException( "Missing site information in the distribution management of the project "
+ + getFullName( project ) );
}
if ( site.getUrl() == null || site.getId() == null )
{
- throw new MojoExecutionException(
- "Missing site data: specify url and id for project " + getFullName( project ) );
+ throw new MojoExecutionException( "Missing site data: specify url and id for project "
+ + getFullName( project ) );
}
return site;
@@ -838,7 +834,6 @@ public abstract class AbstractDeployMojo
private static class URIEncoder
{
private static final String MARK = "-_.!~*'()";
-
private static final String RESERVED = ";/?:@&=+$,";
public static String encodeURI( final String uriString )
@@ -849,7 +844,7 @@ public abstract class AbstractDeployMojo
for ( char c : chars )
{
if ( ( c >= '0' && c <= '9' ) || ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' )
- || MARK.indexOf( c ) != -1 || RESERVED.indexOf( c ) != -1 )
+ || MARK.indexOf( c ) != -1 || RESERVED.indexOf( c ) != -1 )
{
uri.append( c );
}
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/AuthAsyncProxyServlet.java Tue Aug 27 18:25:03 2013
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
/**
* @author Olivier Lamy
+ * @since
* @version $Id$
*/
public class AuthAsyncProxyServlet
@@ -68,7 +69,7 @@ public class AuthAsyncProxyServlet
/**
* Constructor for authentication servlet.
- *
+ *
* @param authentications a map of user/password
*/
public AuthAsyncProxyServlet( Map<String, String> authentications, File siteTargetPath )
@@ -80,9 +81,9 @@ public class AuthAsyncProxyServlet
/**
* Constructor for authentication servlet.
- *
+ *
* @param authentications a map of user/password
- * @param sleepTime a positive time to sleep the service thread (for timeout)
+ * @param sleepTime a positive time to sleep the service thread (for timeout)
*/
public AuthAsyncProxyServlet( Map<String, String> authentications, long sleepTime, File siteTargetPath )
{
@@ -92,9 +93,7 @@ public class AuthAsyncProxyServlet
this.sleepTime = sleepTime;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void service( ServletRequest req, ServletResponse res )
throws ServletException, IOException
{
@@ -130,7 +129,7 @@ public class AuthAsyncProxyServlet
// nop
}
}
- String authPass = this.authentications.get( user );
+ String authPass = this.authentications.get(user);
if ( password.equals( authPass ) )
{
String targetPath = request.getServletPath();
@@ -139,7 +138,8 @@ public class AuthAsyncProxyServlet
rq.method = request.getMethod();
rq.path = targetPath;
- @SuppressWarnings( "rawtypes" ) Enumeration headerNames = request.getHeaderNames();
+ @SuppressWarnings( "rawtypes" )
+ Enumeration headerNames = request.getHeaderNames();
while ( headerNames.hasMoreElements() )
{
String name = (String) headerNames.nextElement();
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java Tue Aug 27 18:25:03 2013
@@ -34,18 +34,18 @@ import org.junit.runners.JUnit4;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
-@RunWith( JUnit4.class )
+@RunWith(JUnit4.class)
public class SiteMojoTest
extends AbstractMojoTestCase
{
-
+
@Before
public void setup()
throws Exception
{
super.setUp();
}
-
+
/**
* Test method for 'org.apache.maven.plugins.site.AbstractSiteMojo.getInterpolatedSiteDescriptorContent(Map, MavenProject, String)'
*
@@ -69,13 +69,13 @@ public class SiteMojoTest
String siteDescriptorContent = FileUtils.fileRead( descriptorFile );
assertNotNull( siteDescriptorContent );
- assertTrue( siteDescriptorContent.contains( "${project.name}" ) );
+ assertTrue(siteDescriptorContent.contains("${project.name}"));
SiteTool siteTool = (SiteTool) lookup( SiteTool.ROLE );
siteDescriptorContent =
siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, String>(), siteMojo.project,
siteDescriptorContent, "UTF-8", "UTF-8" );
assertNotNull( siteDescriptorContent );
- assertTrue( !siteDescriptorContent.contains( "${project.name}" ) );
+ assertTrue(!siteDescriptorContent.contains("${project.name}"));
}
}
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java Tue Aug 27 18:25:03 2013
@@ -37,22 +37,20 @@ public class SiteMavenProjectStub
extends MavenProjectStub
{
DistributionManagement distributionManagement = new DistributionManagement();
-
+
public SiteMavenProjectStub()
{
this( null );
- }
-
- public SiteMavenProjectStub( String pomFilePath )
+ }
+
+ public SiteMavenProjectStub(String pomFilePath)
{
MavenXpp3Reader pomReader = new MavenXpp3Reader();
Model model;
try
{
- File pomFile = new File( getBasedir(), pomFilePath == null
- ? "/src/test/resources/unit/interpolated-site/pom.xml"
- : pomFilePath );
+ File pomFile = new File( getBasedir(),pomFilePath == null ? "/src/test/resources/unit/interpolated-site/pom.xml" : pomFilePath );
model = pomReader.read( ReaderFactory.newXmlReader( pomFile ) );
setModel( model );
}
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework111</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework11</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework111</artifactId>
+ <artifactId>site-framework111</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework111</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework1/framework11/framework111</url>
-
+
<modules>
<module>framework1111</module>
</modules>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework11</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework1</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework11</artifactId>
+ <artifactId>site-framework11</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework11</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework1/framework11</url>
-
+
<reporting>
<plugins>
<plugin>
@@ -44,7 +44,7 @@ under the License.
</plugin>
</plugins>
</reporting>
-
+
<modules>
<module>framework111</module>
<module>framework112</module>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework1</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework1</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework1411</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework1411</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework141</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework1411</artifactId>
+ <artifactId>site-framework1411</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework1411</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework1/framework14/framework141/framework1411</url>
-
+
<modules>
<module>framework14111</module>
<module>framework14112</module>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework141</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework14</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework1</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework14</artifactId>
+ <artifactId>site-framework14</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework14</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework1/framework14</url>
-
+
<modules>
<module>framework141</module>
</modules>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-multiproject</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework2</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework2211</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework221</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework2211</artifactId>
+ <artifactId>site-framework2211</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2211</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework2/framework22/framework221/framework2211</url>
-
+
<modules>
<module>framework22111</module>
</modules>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework221</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework22</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework221</artifactId>
+ <artifactId>site-framework221</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework221</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework2/framework22/framework221</url>
-
+
<modules>
<module>framework2211</module>
<module>framework2212</module>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework2221</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework222</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework2221</artifactId>
+ <artifactId>site-framework2221</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework2221</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework2/framework22/framework222/framework2221</url>
-
+
<modules>
<module>framework22211</module>
</modules>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework222</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,22 +20,22 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework22</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <artifactId>site-framework222</artifactId>
+ <artifactId>site-framework222</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Framework222</name>
<description>Test the MNG-661 issue</description>
<inceptionYear>2005</inceptionYear>
<url>http://maven.apache.org/framework2/framework22/framework222</url>
-
+
<modules>
<module>framework2221</module>
<module>framework2222</module>
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework2</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-framework2</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,15 +20,15 @@ under the License.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.plugin.site.multiproject</groupId>
<artifactId>site-multiproject</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,14 +20,14 @@ under the License.
-->
<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">
+ 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.plugin.site.test11</groupId>
<artifactId>site-plugin-test11</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -20,14 +20,14 @@ under the License.
-->
<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">
+ 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.plugin.site.test11</groupId>
<artifactId>site-plugin-test11</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>framework2</artifactId>
+ <artifactId>framework2</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear>
Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml Tue Aug 27 18:25:03 2013
@@ -20,14 +20,14 @@ under the License.
-->
<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">
+ 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.plugin.site.test8</groupId>
<artifactId>site-plugin-test8</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <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-test8/framework2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml Tue Aug 27 18:25:03 2013
@@ -20,14 +20,14 @@ under the License.
-->
<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">
+ 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.plugin.site.test8</groupId>
<artifactId>site-plugin-test8</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>framework2</artifactId>
+ <artifactId>framework2</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear>
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java Tue Aug 27 18:25:03 2013
@@ -48,8 +48,8 @@ public class Project001Stub
try
{
- model = pomReader.read( ReaderFactory.newXmlReader(
- new File( getBasedir(), "target/test-classes/unit/project-001/pom.xml" ) ) );
+ model = pomReader.read(
+ ReaderFactory.newXmlReader( new File( getBasedir(), "target/test-classes/unit/project-001/pom.xml" ) ) );
setModel( model );
setGroupId( model.getGroupId() );
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java Tue Aug 27 18:25:03 2013
@@ -48,8 +48,8 @@ public class Project003Stub
try
{
- model = pomReader.read( ReaderFactory.newXmlReader(
- new File( getBasedir(), "target/test-classes/unit/project-003/pom.xml" ) ) );
+ model = pomReader.read(
+ ReaderFactory.newXmlReader( new File( getBasedir(), "target/test-classes/unit/project-003/pom.xml" ) ) );
setModel( model );
setGroupId( model.getGroupId() );
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java Tue Aug 27 18:25:03 2013
@@ -47,8 +47,8 @@ public class Project005Stub
try
{
- model = pomReader.read( ReaderFactory.newXmlReader(
- new File( getBasedir(), "target/test-classes/unit/project-005/pom.xml" ) ) );
+ model = pomReader.read(
+ ReaderFactory.newXmlReader( new File( getBasedir(), "target/test-classes/unit/project-005/pom.xml" ) ) );
setModel( model );
setGroupId( model.getGroupId() );
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java Tue Aug 27 18:25:03 2013
@@ -48,8 +48,8 @@ public class Project007Stub
try
{
- model = pomReader.read( ReaderFactory.newXmlReader(
- new File( getBasedir(), "target/test-classes/unit/project-007/pom.xml" ) ) );
+ model = pomReader.read(
+ ReaderFactory.newXmlReader( new File( getBasedir(), "target/test-classes/unit/project-007/pom.xml" ) ) );
setModel( model );
setGroupId( model.getGroupId() );