You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2012/10/28 17:29:33 UTC
svn commit: r1403035 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/functional-tests/plugin-configs/directory-inline/
src/functional-tests/plugin-configs/directory/
src/it/projects/basic-features/local-repo-interp/
src/it/projects/basic-featur...
Author: dennisl
Date: Sun Oct 28 16:29:31 2012
New Revision: 1403035
URL: http://svn.apache.org/viewvc?rev=1403035&view=rev
Log:
Replace tab characters with spaces.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-285/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-375/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun Oct 28 16:29:31 2012
@@ -228,8 +228,8 @@ under the License.
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
- <id>descriptors</id>
- <goals>
+ <id>descriptors</id>
+ <goals>
<goal>generate-metadata</goal>
<goal>generate-test-metadata</goal>
</goals>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml Sun Oct 28 16:29:31 2012
@@ -20,13 +20,13 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
- <basedir>${basedir}</basedir>
+ <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
+ <basedir>${basedir}</basedir>
<project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
<outputDirectory>${basedir}/target/test-harness/directory-inlince/dependency-set/target</outputDirectory>
<finalName>directory-dependency-set</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml Sun Oct 28 16:29:31 2012
@@ -19,13 +19,13 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <basedir>${basedir}</basedir>
+ <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+ <basedir>${basedir}</basedir>
<project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
<outputDirectory>${basedir}/target/test-harness/directory-inline/min/target</outputDirectory>
<finalName>directory-inline-min</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml Sun Oct 28 16:29:31 2012
@@ -19,15 +19,15 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
- <basedir>${basedir}</basedir>
+ <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
+ <basedir>${basedir}</basedir>
<project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
<outputDirectory>${basedir}/target/test-harness/directory/appendAssemblyId-false/target</outputDirectory>
<finalName>directory-appendAssemblyId-false</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>false</appendAssemblyId>
- <classifier>classifier</classifier>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>false</appendAssemblyId>
+ <classifier>classifier</classifier>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml Sun Oct 28 16:29:31 2012
@@ -19,14 +19,14 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
- <basedir>${basedir}</basedir>
+ <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
+ <basedir>${basedir}</basedir>
<project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
<outputDirectory>${basedir}/target/test-harness/directory/dependency-set/target</outputDirectory>
<finalName>directory-dependency-set</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml Sun Oct 28 16:29:31 2012
@@ -19,13 +19,13 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <basedir>${basedir}</basedir>
+ <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+ <basedir>${basedir}</basedir>
<project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
<outputDirectory>${basedir}/target/test-harness/directory-inline/min/target</outputDirectory>
<finalName>directory-inline-min</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerWithExceptionStub" />
- <appendAssemblyId>true</appendAssemblyId>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerWithExceptionStub" />
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml Sun Oct 28 16:29:31 2012
@@ -19,14 +19,14 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/fileSet.xml</descriptor>
- <basedir>${basedir}</basedir>
+ <descriptor>${basedir}/src/test/resources/assemblies/fileSet.xml</descriptor>
+ <basedir>${basedir}</basedir>
<project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
<outputDirectory>${basedir}/target/test-harness/directory/min/target</outputDirectory>
<finalName>directory-min</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh Sun Oct 28 16:29:31 2012
@@ -5,14 +5,14 @@ File f2 = new File( basedir, "target/tes
if ( !f.exists() || !f.isFile() )
{
- System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
- return false;
+ System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
+ return false;
}
if ( !f2.exists() || !f2.isFile() )
{
- System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
- return false;
+ System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
+ return false;
}
return true;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh Sun Oct 28 16:29:31 2012
@@ -7,19 +7,19 @@ File f3 = new File( basedir, "target/mas
boolean fOK = f.exists() && f.isFile();
if ( !fOK )
{
- System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
+ System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
}
boolean f2OK = f2.exists() && f2.isFile();
if ( !f2OK )
{
- System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
+ System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
}
boolean f3OK = f3.exists() && f3.isFile();
if ( !f3OK )
{
- System.out.println( "File: " + f3 + " doesn't exist, or isn't a file." );
+ System.out.println( "File: " + f3 + " doesn't exist, or isn't a file." );
}
return fOK && f2OK;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh Sun Oct 28 16:29:31 2012
@@ -7,19 +7,19 @@ File f3 = new File( basedir, "target/pro
boolean fOK = f.exists() && f.isFile();
if ( !fOK )
{
- System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
+ System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
}
boolean f2OK = f2.exists() && f2.isFile();
if ( !f2OK )
{
- System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
+ System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
}
boolean f3OK = f3.exists() && f3.isFile();
if ( !f3OK )
{
- System.out.println( "File: " + f3 + " doesn't exist, or isn't a file." );
+ System.out.println( "File: " + f3 + " doesn't exist, or isn't a file." );
}
return fOK && f2OK;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/verify.bsh Sun Oct 28 16:29:31 2012
@@ -6,21 +6,21 @@ boolean result = true;
try
{
- File f = new File( basedir, "target/relative-project-paths-1.0-src.jar" );
- if ( !f.exists() )
- {
- System.out.println( "jar is missing" );
- return false;
- }
-
- JarFile jf = new JarFile( f );
- JarEntry je = jf.getEntry( "pom.xml" );
-
- if ( je == null )
- {
- System.out.println( "pom.xml entry in jar is missing" );
- return false;
- }
+ File f = new File( basedir, "target/relative-project-paths-1.0-src.jar" );
+ if ( !f.exists() )
+ {
+ System.out.println( "jar is missing" );
+ return false;
+ }
+
+ JarFile jf = new JarFile( f );
+ JarEntry je = jf.getEntry( "pom.xml" );
+
+ if ( je == null )
+ {
+ System.out.println( "pom.xml entry in jar is missing" );
+ return false;
+ }
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh Sun Oct 28 16:29:31 2012
@@ -5,12 +5,12 @@ File child2Codec = new File( basedir, "t
if ( !child1Codec.exists() )
{
- System.out.println( "commons-codec dependency in child-1 module is either missing or is the wrong version. File missing: " + child1Codec );
+ System.out.println( "commons-codec dependency in child-1 module is either missing or is the wrong version. File missing: " + child1Codec );
}
if ( !child2Codec.exists() )
{
- System.out.println( "commons-codec dependency in child-2 module is either missing or is the wrong version. File missing: " + child2Codec );
+ System.out.println( "commons-codec dependency in child-2 module is either missing or is the wrong version. File missing: " + child2Codec );
}
return child1Codec.exists() && child2Codec.exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-285/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-285/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-285/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-285/verify.bsh Sun Oct 28 16:29:31 2012
@@ -13,15 +13,15 @@ int jarCount = 0;
Enumeration e = jf.entries();
while( e.hasMoreElements() )
{
- if ( testPath.equals( String.valueOf( e.nextElement() ) ) )
- {
- jarCount++;
- }
+ if ( testPath.equals( String.valueOf( e.nextElement() ) ) )
+ {
+ jarCount++;
+ }
}
if ( jarCount != 1 )
{
- System.out.println( "ERROR! Test path: " + testPath + " was found " + jarCount + " times (should have been 1).\nArchive: " + f );
+ System.out.println( "ERROR! Test path: " + testPath + " was found " + jarCount + " times (should have been 1).\nArchive: " + f );
}
f = new File( basedir, "massembly-285-assembly/target/massembly-285-assembly-1-bin.zip" );
@@ -34,15 +34,15 @@ int zipCount = 0;
e = zf.entries();
while( e.hasMoreElements() )
{
- if ( testPath.equals( String.valueOf( e.nextElement() ) ) )
- {
- zipCount++;
- }
+ if ( testPath.equals( String.valueOf( e.nextElement() ) ) )
+ {
+ zipCount++;
+ }
}
if ( zipCount != 1 )
{
- System.out.println( "ERROR! Test path: " + testPath + " was found " + zipCount + " times (should have been 1).\nArchive: " + f );
+ System.out.println( "ERROR! Test path: " + testPath + " was found " + zipCount + " times (should have been 1).\nArchive: " + f );
}
return jarCount == 1;
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-375/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-375/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-375/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-375/verify.bsh Sun Oct 28 16:29:31 2012
@@ -3,43 +3,43 @@ import java.util.jar.*;
try
{
- File f = new File( basedir, "target/massembly-375-1-test.jar" );
-
- System.out.println( "Examining assembly file: " + f );
- System.out.flush();
-
- if ( !f.isFile() )
- {
- System.out.println( "Target file: " + f + " doesn't exist!" );
- System.out.flush();
- return false;
- }
-
- JarFile jf = new JarFile( f );
-
- JarEntry je = jf.getEntry( "/test.txt" );
- if ( je != null )
- {
- System.out.println( "Entry: /test.txt should NOT exist." );
- System.out.flush();
- return false;
- }
-
- je = jf.getEntry( "test.txt" );
- if ( je == null )
- {
- System.out.println( "Entry: test.txt SHOULD exist." );
- System.out.flush();
- return false;
- }
-
- System.out.println( "VERIFICATION PASSED." );
- System.out.flush();
- return true;
+ File f = new File( basedir, "target/massembly-375-1-test.jar" );
+
+ System.out.println( "Examining assembly file: " + f );
+ System.out.flush();
+
+ if ( !f.isFile() )
+ {
+ System.out.println( "Target file: " + f + " doesn't exist!" );
+ System.out.flush();
+ return false;
+ }
+
+ JarFile jf = new JarFile( f );
+
+ JarEntry je = jf.getEntry( "/test.txt" );
+ if ( je != null )
+ {
+ System.out.println( "Entry: /test.txt should NOT exist." );
+ System.out.flush();
+ return false;
+ }
+
+ je = jf.getEntry( "test.txt" );
+ if ( je == null )
+ {
+ System.out.println( "Entry: test.txt SHOULD exist." );
+ System.out.flush();
+ return false;
+ }
+
+ System.out.println( "VERIFICATION PASSED." );
+ System.out.flush();
+ return true;
}
catch ( Throwable t )
{
- t.printStackTrace( System.out );
- System.out.flush();
- return false;
+ t.printStackTrace( System.out );
+ System.out.flush();
+ return false;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml Sun Oct 28 16:29:31 2012
@@ -18,14 +18,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-4</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0-beta-4</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>2.0.4</version>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0.4</version>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml Sun Oct 28 16:29:31 2012
@@ -17,14 +17,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-4</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0-beta-4</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4.1</version>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>2.0.4.1</version>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh Sun Oct 28 16:29:31 2012
@@ -5,12 +5,12 @@ File xercesMinimalJar = new File( basedi
if ( !wagonJackrabbitJar.exists() )
{
- System.out.println( "Wagon provider jar is missing (should be included via include wildcard pattern)." );
+ System.out.println( "Wagon provider jar is missing (should be included via include wildcard pattern)." );
}
if ( !xercesMinimalJar.exists() )
{
- System.out.println( "Xerces minimal jar (from nekohtml, brought in by wagon jackrabbit provider) is missing (should be included via include wildcard pattern)." );
+ System.out.println( "Xerces minimal jar (from nekohtml, brought in by wagon jackrabbit provider) is missing (should be included via include wildcard pattern)." );
}
return wagonJackrabbitJar.exists() && xercesMinimalJar.exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java Sun Oct 28 16:29:31 2012
@@ -1,7 +1,7 @@
package foo;
public class Foo {
- public static void main(String[] args) {
- System.out.println("Hello, World!");
- }
+ public static void main(String[] args) {
+ System.out.println("Hello, World!");
+ }
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh Sun Oct 28 16:29:31 2012
@@ -6,17 +6,17 @@ File javadocs = new File( basedir, "targ
if ( !main.exists() )
{
- System.out.println( "Main (unclassified) dependency jar is missing: " + main );
+ System.out.println( "Main (unclassified) dependency jar is missing: " + main );
}
if ( !sources.exists() )
{
- System.out.println( "Sources dependency jar is missing: " + sources );
+ System.out.println( "Sources dependency jar is missing: " + sources );
}
if ( !javadocs.exists() )
{
- System.out.println( "JavaDocs dependency jar is missing: " + javadocs );
+ System.out.println( "JavaDocs dependency jar is missing: " + javadocs );
}
return main.exists() && sources.exists() && javadocs.exists();
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml Sun Oct 28 16:29:31 2012
@@ -1,62 +1,62 @@
<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">
- <modelVersion>4.0.0</modelVersion>
-
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>it-project-parent</artifactId>
<version>1</version>
</parent>
-
- <name>Test for Assembly Bug</name>
- <groupId>test</groupId>
- <artifactId>massembly235-test</artifactId>
- <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>xmlwriter</groupId>
- <artifactId>xmlwriter</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <!-- xmlwriter 2.2 will use unavailable version 0.39 -->
- <dependency>
- <groupId>xmlenc</groupId>
- <artifactId>xmlenc</artifactId>
- <version>0.52</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <name>Test for Assembly Bug</name>
+ <groupId>test</groupId>
+ <artifactId>massembly235-test</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>xmlwriter</groupId>
+ <artifactId>xmlwriter</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- xmlwriter 2.2 will use unavailable version 0.39 -->
+ <dependency>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ <version>0.52</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/release.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml Sun Oct 28 16:29:31 2012
@@ -1,23 +1,23 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>release</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- </dependencySet>
- </dependencySets>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>release</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java Sun Oct 28 16:29:31 2012
@@ -1,7 +1,7 @@
public class HelloWorld
{
- public static String sayHello(String name)
- {
- return "Hello " + name + "!";
- }
+ public static String sayHello(String name)
+ {
+ return "Hello " + name + "!";
+ }
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java Sun Oct 28 16:29:31 2012
@@ -2,8 +2,8 @@ import junit.framework.TestCase;
public class HelloWorldTest extends TestCase
{
- public static final void testSayHello()
- {
- assertEquals("Hello World!", HelloWorld.sayHello("World"));
- }
+ public static final void testSayHello()
+ {
+ assertEquals("Hello World!", HelloWorld.sayHello("World"));
+ }
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml Sun Oct 28 16:29:31 2012
@@ -17,14 +17,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml Sun Oct 28 16:29:31 2012
@@ -17,24 +17,24 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version> 1.0-beta-4</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version> 1.0-beta-4</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-4</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0-beta-4</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4.1</version>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>2.0.4.1</version>
</dependency>
<dependency>
- <groupId>commons-vfs</groupId>
- <artifactId>commons-vfs</artifactId>
- <version> 1.0</version>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <version> 1.0</version>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh Sun Oct 28 16:29:31 2012
@@ -5,12 +5,12 @@ File reportingImplJar = new File( basedi
if ( !wagonProviderJar.exists() )
{
- System.out.println( "Wagon provider jar is missing (should be included via include wildcard pattern)." );
+ System.out.println( "Wagon provider jar is missing (should be included via include wildcard pattern)." );
}
if ( !reportingImplJar.exists() )
{
- System.out.println( "Reporting implementation jar is missing (should be included via include wildcard pattern)." );
+ System.out.println( "Reporting implementation jar is missing (should be included via include wildcard pattern)." );
}
return wagonProviderJar.exists() && reportingImplJar.exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh Sun Oct 28 16:29:31 2012
@@ -5,16 +5,16 @@ File dirWithMapping = new File( basedir,
if ( dirWithMapping.exists() )
{
- System.out.println( "<outputFileNameMapping> should NOT be used when unpack == true." );
- return false;
+ System.out.println( "<outputFileNameMapping> should NOT be used when unpack == true." );
+ return false;
}
File dir = new File( basedir, "target/project-1-bin/some_directory/junit/framework/TestCase.class" );
if ( !dir.exists() )
{
- System.out.println( "Expected unpacked class does not exist in the appropriate outputDirectory within the assembly." );
- return false;
+ System.out.println( "Expected unpacked class does not exist in the appropriate outputDirectory within the assembly." );
+ return false;
}
return true;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh Sun Oct 28 16:29:31 2012
@@ -6,61 +6,61 @@ boolean result = true;
try
{
- File f = new File( basedir, "target/parent-1.0-src.jar" );
- if ( !f.exists() )
- {
- System.out.println( "jar is missing" );
- return false;
- }
-
- JarFile jf = new JarFile( f );
- JarEntry je = jf.getEntry( "parent-1.0/src/main/java/org/test/target/file.properties" );
-
- if ( je == null )
- {
- System.out.println( "sources for org.test.target package in parent project are missing from jar" );
- return false;
- }
-
- je = jf.getEntry( "parent-1.0/child/src/main/resources/target/file.txt" );
-
- if ( je == null )
- {
- System.out.println( "target/file.txt in child resources is missing from the jar." );
- return false;
- }
-
- je = jf.getEntry( "parent-1.0/target/omit.txt" );
-
- if ( je != null )
- {
- System.out.println( "target/omit.txt in parent project was included the jar." );
- return false;
- }
-
- je = jf.getEntry( "parent-1.0/child/target/omit.txt" );
-
- if ( je != null )
- {
- System.out.println( "target/omit.txt in child project was included the jar." );
- return false;
- }
-
- je = jf.getEntry( "parent-1.0/target/classes/src/omit.txt" );
-
- if ( je != null )
- {
- System.out.println( "target/classes/src/omit.txt in parent project was included the jar." );
- return false;
- }
-
- je = jf.getEntry( "parent-1.0/child/target/classes/src/omit.txt" );
-
- if ( je != null )
- {
- System.out.println( "target/classes/src/omit.txt in child project was included the jar." );
- return false;
- }
+ File f = new File( basedir, "target/parent-1.0-src.jar" );
+ if ( !f.exists() )
+ {
+ System.out.println( "jar is missing" );
+ return false;
+ }
+
+ JarFile jf = new JarFile( f );
+ JarEntry je = jf.getEntry( "parent-1.0/src/main/java/org/test/target/file.properties" );
+
+ if ( je == null )
+ {
+ System.out.println( "sources for org.test.target package in parent project are missing from jar" );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/child/src/main/resources/target/file.txt" );
+
+ if ( je == null )
+ {
+ System.out.println( "target/file.txt in child resources is missing from the jar." );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/target/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/omit.txt in parent project was included the jar." );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/child/target/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/omit.txt in child project was included the jar." );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/target/classes/src/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/classes/src/omit.txt in parent project was included the jar." );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/child/target/classes/src/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/classes/src/omit.txt in child project was included the jar." );
+ return false;
+ }
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh Sun Oct 28 16:29:31 2012
@@ -4,8 +4,8 @@ File f = new File( basedir, "target/pare
if ( !f.exists() )
{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
+ System.out.println( "Filtered file from file-set: " + f + " is missing." );
+ return false;
}
String line = null;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh Sun Oct 28 16:29:31 2012
@@ -4,8 +4,8 @@ File f = new File( basedir, "child/targe
if ( !f.exists() )
{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
+ System.out.println( "Filtered file from file-set: " + f + " is missing." );
+ return false;
}
String line = null;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh Sun Oct 28 16:29:31 2012
@@ -4,8 +4,8 @@ File f = new File( basedir, "child/targe
if ( !f.exists() )
{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
+ System.out.println( "Filtered file from file-set: " + f + " is missing." );
+ return false;
}
StringBuffer sb = new StringBuffer();
@@ -15,7 +15,7 @@ char[] cbuf = new char[16];
int read = -1;
while( ( read = reader.read( cbuf ) ) > -1 )
{
- sb.append( cbuf, 0, read );
+ sb.append( cbuf, 0, read );
}
reader.close();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh Sun Oct 28 16:29:31 2012
@@ -4,8 +4,8 @@ File f = new File( basedir, "child/targe
if ( !f.exists() )
{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
+ System.out.println( "Filtered file from file-set: " + f + " is missing." );
+ return false;
}
StringBuffer sb = new StringBuffer();
@@ -15,7 +15,7 @@ char[] cbuf = new char[16];
int read = -1;
while( ( read = reader.read( cbuf ) ) > -1 )
{
- sb.append( cbuf, 0, read );
+ sb.append( cbuf, 0, read );
}
reader.close();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml Sun Oct 28 16:29:31 2012
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
- <modelVersion>4.0.0</modelVersion>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>it-project-parent</artifactId>
<version>1</version>
</parent>
- <groupId>org.test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- <name>Parent</name>
-
-
- <!-- Purpose of this integration test: verify that filters can be defined within the plugin configuration -->
- <!-- (see MASSEMBLY-226 for further information)-->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- <filters>
- <filter>filter.properties</filter>
- </filters>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <groupId>org.test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <name>Parent</name>
+
+
+ <!-- Purpose of this integration test: verify that filters can be defined within the plugin configuration -->
+ <!-- (see MASSEMBLY-226 for further information)-->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ <filters>
+ <filter>filter.properties</filter>
+ </filters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml Sun Oct 28 16:29:31 2012
@@ -3,16 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<formats>
- <format>zip</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
+ <moduleSet>
+ <binaries>
+ <outputDirectory>modules</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
</moduleSets>
</assembly>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml Sun Oct 28 16:29:31 2012
@@ -3,16 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<formats>
- <format>zip</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
+ <moduleSet>
+ <binaries>
+ <outputDirectory>modules</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
</moduleSets>
</assembly>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh Sun Oct 28 16:29:31 2012
@@ -4,21 +4,21 @@ File src = new File( basedir, "target/ig
File src2 = new File( basedir, "target/ignoreDirFormatExtensions-1-src2.dir/pom.xml" );
{
- File f = src;
-
- if ( !f.exists() )
- {
- System.out.println( "Project assembly directory is missing. Check-file was: " + f );
- }
+ File f = src;
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project assembly directory is missing. Check-file was: " + f );
+ }
}
{
- File f = src2;
-
- if ( !f.exists() )
- {
- System.out.println( "Project assembly directory is missing. Check-file was: " + f );
- }
+ File f = src2;
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project assembly directory is missing. Check-file was: " + f );
+ }
}
return src.exists() && src2.exists();
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/verify.bsh Sun Oct 28 16:29:31 2012
@@ -6,33 +6,33 @@ File zip = new File( basedir, base + ".z
File tgz = new File( basedir, base + ".tar.gz" );
{
- File f = pom;
- String type = "POM";
-
- if ( !f.exists() )
- {
- System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
- }
+ File f = pom;
+ String type = "POM";
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
+ }
}
{
- File f = zip;
- String type = "sources zip";
-
- if ( !f.exists() )
- {
- System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
- }
+ File f = zip;
+ String type = "sources zip";
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
+ }
}
{
- File f = tgz;
- String type = "sources tar.gz";
-
- if ( !f.exists() )
- {
- System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
- }
+ File f = tgz;
+ String type = "sources tar.gz";
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
+ }
}
return pom.exists() && zip.exists() && tgz.exists();
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/verify.bsh Sun Oct 28 16:29:31 2012
@@ -6,33 +6,33 @@ File zip = new File( basedir, base + ".z
File tgz = new File( basedir, base + ".tar.gz" );
{
- File f = jar;
- String type = "main jar";
-
- if ( !f.exists() )
- {
- System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
- }
+ File f = jar;
+ String type = "main jar";
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
+ }
}
{
- File f = zip;
- String type = "sources zip";
-
- if ( !f.exists() )
- {
- System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
- }
+ File f = zip;
+ String type = "sources zip";
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
+ }
}
{
- File f = tgz;
- String type = "sources tar.gz";
-
- if ( !f.exists() )
- {
- System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
- }
+ File f = tgz;
+ String type = "sources tar.gz";
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project " + type + " is missing in deployment repository. File was: " + f );
+ }
}
return jar.exists() && zip.exists() && tgz.exists();
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml Sun Oct 28 16:29:31 2012
@@ -24,9 +24,9 @@
<goal>single</goal>
</goals>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh Sun Oct 28 16:29:31 2012
@@ -7,32 +7,32 @@ ZipEntry child1InclEntry = zf.getEntry(
if ( child1InclEntry == null )
{
- System.out.println( "Included file from child1 not found." );
- return false;
+ System.out.println( "Included file from child1 not found." );
+ return false;
}
ZipEntry child1ExclEntry = zf.getEntry( "child1/org/test/child1/App.class" );
if ( child1ExclEntry != null )
{
- System.out.println( "Non-included file from child1 should not be present, but was found." );
- return false;
+ System.out.println( "Non-included file from child1 should not be present, but was found." );
+ return false;
}
ZipEntry child2InclEntry = zf.getEntry( "child2/org/test/child2/App.class" );
if ( child2InclEntry == null )
{
- System.out.println( "Included file from child2 not found." );
- return false;
+ System.out.println( "Included file from child2 not found." );
+ return false;
}
ZipEntry child2ExclEntry = zf.getEntry( "child2/org/test/other/App.class" );
if ( child2ExclEntry != null )
{
- System.out.println( "Non-included file from child2 should not be present, but was found." );
- return false;
+ System.out.println( "Non-included file from child2 should not be present, but was found." );
+ return false;
}
return true;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh Sun Oct 28 16:29:31 2012
@@ -4,20 +4,20 @@ boolean result = true;
if ( !new File( basedir, "child4/target/child4-1.0-bin/lib/child1.jar" ).exists() )
{
- System.out.println( "Child-1 jar is NOT in output!" );
- result = false;
+ System.out.println( "Child-1 jar is NOT in output!" );
+ result = false;
}
if ( !new File( basedir, "child4/target/child4-1.0-bin/lib/child3.jar" ).exists() )
{
- System.out.println( "Child-3 jar is NOT in output!" );
- result = false;
+ System.out.println( "Child-3 jar is NOT in output!" );
+ result = false;
}
if ( new File( basedir, "child4/target/child4-1.0-bin/lib/child2.jar" ).exists() )
{
- System.out.println( "Child-2 jar SHOULD NOT BE in output!" );
- result = false;
+ System.out.println( "Child-2 jar SHOULD NOT BE in output!" );
+ result = false;
}
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml Sun Oct 28 16:29:31 2012
@@ -18,14 +18,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh Sun Oct 28 16:29:31 2012
@@ -5,14 +5,14 @@ File surefirePlugin = new File( basedir,
if ( !jarPlugin.exists() )
{
- System.out.println( "Cannot find jar plugin at: " + jarPlugin );
- System.out.println( "jar plugin should have been relocated to version 2.0" );
+ System.out.println( "Cannot find jar plugin at: " + jarPlugin );
+ System.out.println( "jar plugin should have been relocated to version 2.0" );
}
if ( !surefirePlugin.exists() )
{
- System.out.println( "Cannot find surefire plugin at: " + surefirePlugin );
- System.out.println( "surefire plugin should NOT have been relocated to 2.0" );
+ System.out.println( "Cannot find surefire plugin at: " + surefirePlugin );
+ System.out.println( "surefire plugin should NOT have been relocated to 2.0" );
}
return jarPlugin.exists() && surefirePlugin.exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt?rev=1403035&r1=1403034&r2=1403035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt Sun Oct 28 16:29:31 2012
@@ -75,7 +75,7 @@ Including and Excluding Artifacts
* What about your Project's Artifacts?
- {{{http://jira.codehaus.org/browse/MASSEMBLY-197}MASSEMBLY-197}} added <<<useProjectArtifact>>>
- and <<<useProjectAttachments>>> to the <<<dependencySet>>> configuration.
-
- See {{{../../assembly.html#class_dependencySet}Assembly Descriptor Format}} for the default values and how to configure them.
\ No newline at end of file
+ {{{http://jira.codehaus.org/browse/MASSEMBLY-197}MASSEMBLY-197}} added <<<useProjectArtifact>>>
+ and <<<useProjectAttachments>>> to the <<<dependencySet>>> configuration.
+
+ See {{{../../assembly.html#class_dependencySet}Assembly Descriptor Format}} for the default values and how to configure them.
\ No newline at end of file