[maven-release-plugin] copy for tag maven-assembly-plugin-2.6
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6@1707032 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-assembly-plugin-2.x/.gitignore b/maven-assembly-plugin-2.x/.gitignore
deleted file mode 100644
index 5db0b83..0000000
--- a/maven-assembly-plugin-2.x/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.classpath
-.project
-target
-.settings
-.idea
-*.iml
diff --git a/maven-assembly-plugin-2.x/deploySite.sh b/maven-assembly-plugin-2.x/deploySite.sh
deleted file mode 100755
index f6c265d..0000000
--- a/maven-assembly-plugin-2.x/deploySite.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-mvn -Preporting site site:stage $@
-mvn scm-publish:publish-scm $@
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/pom.xml b/maven-assembly-plugin-2.x/integration-test-archetype/pom.xml
deleted file mode 100644
index 5d6a75d..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.archetypes</groupId>
- <artifactId>assembly-plugin-it-archetype</artifactId>
- <packaging>maven-archetype</packaging>
- <name>Maven Assembly Plugin Integration Test Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-2</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-2</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
- <distributionManagement>
- <repository>
- <id>integration.test.repo</id>
- <url>${test.remote.repo.url}</url>
- </repository>
- </distributionManagement>
-</project>
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 57fdf71..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<archetype-descriptor name="assembly-integration-test">
- <fileSets>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/assembly</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory></directory>
- <includes>
- <include>goals.txt</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory></directory>
- <includes>
- <include>verify.bsh</include>
- </includes>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 3fa2200..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<archetype>
- <id>assembly-integration-test</id>
- <sources>
- <source>src/main/java/App.java</source>
- </sources>
- <testSources>
- <source>src/java/AppTest.java</source>
- </testSources>
- <resources>
- <resource>goals.txt</resource>
- <resource>src/assemble/bin.xml</resource>
- <resource>verify.bsh</resource>
- </resources>
-</archetype>
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/invoker.properties b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/invoker.properties
deleted file mode 100644
index c25c58c..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=# Specify the goals to be run here, one per line. Lines beginning with a hash '#' will be ignored. clean package
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/pom.xml b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 648a8bc..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>${artifactId}</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java
deleted file mode 100644
index 41aa147..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package ${package};
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit ${package} for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the ${package} case
- *
- * @param ${package}Name name of the ${package} case
- */
- public AppTest( String ${package}Name )
- {
- super( ${package}Name );
- }
-
- /**
- * @return the suite of ${package}s being ${package}ed
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void ${package}App()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml
deleted file mode 100644
index 7e9b952..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>${test}</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java
deleted file mode 100644
index d517f70..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package ${package};
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh b/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh
deleted file mode 100644
index 01f07f7..0000000
--- a/maven-assembly-plugin-2.x/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-/*
- This is where you verify the results of the assembly build. You may need to check the existence of a file,
- or even peek within a jar file to determine whether the assembly did the right thing.
- */
-return new File( basedir, "target/${artifactId}-${version}-bin.dir/lib/junit.jar" ).exists();
diff --git a/maven-assembly-plugin-2.x/pom.xml b/maven-assembly-plugin-2.x/pom.xml
deleted file mode 100644
index 6aada28..0000000
--- a/maven-assembly-plugin-2.x/pom.xml
+++ /dev/null
@@ -1,438 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>maven-plugins</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>27</version>
- <relativePath>../maven-plugins/pom.xml</relativePath>
- </parent>
-
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
- <packaging>maven-plugin</packaging>
-
- <name>Apache Maven Assembly Plugin</name>
- <description>A Maven plugin to create archives of your project's sources, classes, dependencies etc. from flexible assembly descriptors.</description>
-
- <prerequisites>
- <maven>${mavenVersion}</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/MASSEMBLY</url>
- </issueManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
- </site>
- </distributionManagement>
-
- <properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
-
- <mdoVersion>1.1.3</mdoVersion>
- <mavenArchiverVersion>2.5</mavenArchiverVersion>
- <mavenFilteringVersion>1.3</mavenFilteringVersion>
- <mavenVersion>2.2.1</mavenVersion>
- <testOutputToFile>true</testOutputToFile>
- <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod</checkstyle.violation.ignore>
- </properties>
-
- <contributors>
- <contributor>
- <name>Stephen Colebourne</name>
- </contributor>
- <contributor>
- <name>Tony Jewell</name>
- </contributor>
- </contributors>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-common-artifact-filters</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- <version>1.22</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>file-management</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-io</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <version>${mavenFilteringVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-io</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>${mavenArchiverVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.21</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-repository-builder</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-tools</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-test-tools</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.0-FCS</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>saxpath</groupId>
- <artifactId>saxpath</artifactId>
- <version>1.0-FCS</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}/generated-resources/plexus</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>descriptors</id>
- <goals>
- <goal>generate-metadata</goal>
- <goal>generate-test-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.8.3</version>
- <configuration>
- <version>${mdoVersion}</version>
- <models>
- <model>src/main/mdo/descriptor.mdo</model>
- <model>src/main/mdo/component.mdo</model>
- </models>
- </configuration>
- <executions>
- <execution>
- <id>mdo</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- <execution>
- <id>mdo-site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <escapeString>\</escapeString>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>${testOutputToFile}</redirectTestOutputToFile>
- <systemPropertyVariables>
- <!-- NOTE: Ensure the tmp dir configured for Surefire exists or some JREs (e.g. 1.5) will fail to create temp files -->
- <java.io.tmpdir>${project.build.testOutputDirectory}</java.io.tmpdir>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <!--
- These files contain real repository artifacts.
- -->
- <exclude>src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/**</exclude>
- <exclude>src/functional-tests/remote-repo/assembly/dependency-artifact/**</exclude>
- <!-- These files are only resources for integration tests. -->
- <exclude>src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom</exclude>
- <exclude>src/it/projects/container-descriptors/metaInf-services-aggregation/**/*</exclude>
- <exclude>src/it/projects/container-descriptors/metaInf-spring-aggregation/**/*</exclude>
- <!-- The following is used to exclude only txt files which don't have a license header -->
- <exclude>src/it/**/*.txt</exclude>
- <!-- The following is used to exclude files with the extension *.file -->
- <exclude>src/it/**/*.file</exclude>
- <exclude>src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/**</exclude>
- <exclude>src/it/projects/bugs/massembly-731/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>run-its</id>
- <properties>
- <invokerPluginVersion>1.9</invokerPluginVersion>
- <itParent>${project.build.directory}/it/it-project-parent</itParent>
- <itProjects>${project.build.directory}/it/projects</itProjects>
- <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
- <test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
- <it.pomIncludes>**/pom.xml</it.pomIncludes>
- <it.streamLogs>false</it.streamLogs>
- <it.debug>true</it.debug>
- <testVersion>${project.version}</testVersion>
- <useJvmChmod>false</useJvmChmod>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>${invokerPluginVersion}</version>
- <configuration>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <properties>
- <useJvmChmod>${useJvmChmod}</useJvmChmod>
- <testVersion>${testVersion}</testVersion>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <invokerPluginVersion>${invokerPluginVersion}</invokerPluginVersion>
- </properties>
- <showVersion>true</showVersion>
- </configuration>
- <executions>
- <execution>
- <id>setup-integration-test-env</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <goals>
- <goal>install</goal>
- </goals>
- <projectsDirectory>src/it/it-project-parent</projectsDirectory>
- <cloneProjectsTo>${itParent}</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>pom.xml</pomInclude>
- </pomIncludes>
- <streamLogs>${it.streamLogs}</streamLogs>
- </configuration>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <configuration>
- <projectsDirectory>src/it/projects</projectsDirectory>
- <cloneClean>true</cloneClean>
- <cloneProjectsTo>${itProjects}</cloneProjectsTo>
- <testPropertiesFile>test.properties</testPropertiesFile>
- <properties>
- <useJvmChmod>${useJvmChmod}</useJvmChmod>
- </properties>
- <debug>${it.debug}</debug>
- <settingsFile>src/it/settings.xml</settingsFile>
- <pomIncludes>
- <pomInclude>${it.pomIncludes}</pomInclude>
- </pomIncludes>
- <streamLogs>${it.streamLogs}</streamLogs>
- <pomExcludes>
- <pomExclude>repositories/repo-with-snapshot-parents/pom.xml</pomExclude>
-
- <!-- This will be handled by the parent in the bugs/massembly-285 dir. -->
- <pomExclude>bugs/massembly-285/massembly-285-*/pom.xml</pomExclude>
-
- <pomExclude>dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml</pomExclude>
- <pomExclude>dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml</pomExclude>
-
- <pomExclude>**/my-app*/pom.xml</pomExclude>
- <pomExclude>**/child*/pom.xml</pomExclude>
- <pomExclude>**/module*/pom.xml</pomExclude>
- <pomExclude>**/descriptor/pom.xml</pomExclude>
- <pomExclude>**/handler-def/pom.xml</pomExclude>
- <pomExclude>**/assembly/pom.xml</pomExclude>
- <pomExclude>dependency-sets/depSet-transFromProfile/pom.xml</pomExclude>
- </pomExcludes>
- <postBuildHookScript>verify</postBuildHookScript>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.9</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
deleted file mode 100644
index 959e5ae..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
+++ /dev/null
@@ -1,1582 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.assembly.mojos.AssemblyMojo;
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.assembly.stubs.JarArchiverStub;
-import org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub;
-import org.apache.maven.plugin.assembly.stubs.WarArchiverStub;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.archiver.jar.Manifest;
-import org.codehaus.plexus.archiver.tar.TarArchiver;
-import org.codehaus.plexus.archiver.tar.TarLongFileMode;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Edwin Punzalan
- */
-public class AssemblyMojoTest
- extends AbstractMojoTestCase
-{
- private String basedir = PlexusTestCase.getBasedir();
-
- public void testMinConfiguration()
- throws Exception
- {
- executeMojo( "min-plugin-config.xml" );
- }
-
- public void testProjectWithClassifier()
- throws Exception
- {
- executeMojo( "classifier-plugin-config.xml" );
-
- File assemblyJar = ArchiverManagerStub.archiverStub.getDestFile();
-
- assertTrue( "Test if archive ends with the classifier", assemblyJar.getName().endsWith( "test-harness.zip" ) );
- }
-
- public void testDescriptorSourceDirectory()
- throws Exception
- {
- executeMojo( "descriptorSourceDirectory-plugin-config.xml" );
- }
-
- public void testPackedDependencySet()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-default-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- mojo.execute();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- assertEquals( "Test number of files in archive", artifactSet.size() + 1, archivedFiles.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact expected = (Artifact) artifacts.next();
-
- assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- public void testPackedDependencySetWithFilenameMapping()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-filename-mapping-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- mojo.execute();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- assertEquals( "Test number of files in archive", artifactSet.size() + 1, archivedFiles.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact expected = (Artifact) artifacts.next();
-
- assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile = (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
- String archivePath = archiveFile.getOutputName();
- String expectedName =
- "libs/" + expected.getVersion() + "-" + expected.getArtifactId() + "-" + expected.getGroupId();
- assertTrue( "Test filename mapping was used", archivePath.equals( expectedName ) );
- assertFalse( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
- String archivePath = archiveFile.getOutputName();
- assertFalse( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- public void testPackedDependencySetWithFilenameMappingAndClassifier()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-filename-mapping-and-classifier-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- mojo.execute();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- assertEquals( "Test number of files in archive", artifactSet.size() + 1, archivedFiles.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact expected = (Artifact) artifacts.next();
-
- assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile = (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
- String archivePath = archiveFile.getOutputName();
- String expectedName;
- if ( StringUtils.isEmpty( expected.getClassifier() ) )
- {
- expectedName =
- "libs/" + expected.getVersion() + "." + expected.getArtifactId() + "." +
- expected.getGroupId();
- }
- else
- {
- expectedName =
- "libs/" + expected.getVersion() + "." + expected.getArtifactId() +
- "-classifier" + "." + expected.getGroupId();
-
- }
- assertEquals( "Test filename mapping was used", archivePath, expectedName );
- assertFalse( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
- String archivePath = archiveFile.getOutputName();
- assertFalse( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- public void testPackedDependencySetWithScope()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-scoped-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- mojo.execute();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact expected = (Artifact) artifacts.next();
-
- if ( !expected.getScope().equals( Artifact.SCOPE_TEST ) )
- {
- assertTrue( "Test expected dependency artifacts in archive",
- archivedFiles.contains( expected.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked",
- expected.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
- else
- {
- assertFalse( "Test unexpected dependency artifacts in archive",
- archivedFiles.contains( expected.getFile() ) );
- }
- }
-
- assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- public void testPackedDependencySetIncludes()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-includes-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- mojo.execute();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- assertEquals( "Test number of files in archive", 1, archivedFiles.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact depArtifact = (Artifact) artifacts.next();
-
- if ( depArtifact.getArtifactId().equals( "dependency-artifact1" ) )
- {
- assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( depArtifact.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked", depArtifact.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( depArtifact.getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
- else
- {
- assertFalse( "Test dependency artifacts is NOT in archive", archivedFiles.contains( depArtifact.getFile() ) );
- }
- }
-
- assertFalse( "Test project is NOT in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- }
-
- public void testPackedDependencySetExcludes()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-excludes-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- mojo.execute();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- assertEquals( "Test number of files in archive", artifactSet.size(), archivedFiles.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact depArtifact = (Artifact) artifacts.next();
-
- if ( !depArtifact.getArtifactId().equals( "dependency-artifact1" ) )
- {
- assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( depArtifact.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked", depArtifact.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( depArtifact.getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
- else
- {
- assertFalse( "Test dependency artifacts is NOT in archive", archivedFiles.contains( depArtifact.getFile() ) );
- }
- }
-
- assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- public void testUnpackedDependencySet()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "depSet-unpack-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
- Set artifactSet = project.getArtifacts();
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- mojo.execute();
-
- Collection archivedFileSet = ArchiverManagerStub.archiverStub.getFiles().keySet();
-
- assertEquals( "Test number of files in archive", artifactSet.size() + 1, archivedFileSet.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact dependency = (Artifact) artifacts.next();
-
- String name = dependency.getArtifactId() + "-" + dependency.getVersion() + "." + dependency.getType();
- File workPath = new File( workDir, name );
-
- assertTrue( "Test if expected dependency is unpacked", workPath.exists() && workPath.isDirectory() );
- assertTrue( "Test if expected dependency is in the archive", archivedFileSet.contains( workPath ) );
- }
-
- String name = project.getArtifact().getArtifactId() + "-" + project.getArtifact().getVersion() + "." +
- project.getArtifact().getType();
- File workPath = new File( workDir, name );
-
- assertTrue( "Test if project is unpacked", workPath.exists() && workPath.isDirectory() );
- assertTrue( "Test if project is in the archive", archivedFileSet.contains( workPath ) );
- }
-
- public void testFileSet()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
-
- assertNotNull( "Test expected FileSet", file );
- assertNull( "Test includes", file.getIncludes() );
- assertTrue( "Test excludes",
- assertEquals( FileUtils.getDefaultExcludesAsList().toArray( new String[0] ), file.getExcludes() ) );
- }
-
- public void testFileSetWithArchiveBaseDir()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-archiveBaseDir-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
-
- assertNotNull( "Test expected FileSet", file );
- assertNull( "Test includes", file.getIncludes() );
- assertTrue( "Test excludes",
- assertEquals( FileUtils.getDefaultExcludesAsList().toArray( new String[0] ), file.getExcludes() ) );
- }
-
- public void testFileSetIncludesExcludes()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-includes-excludes-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
-
- assertNotNull( "Test expected FileSet", file );
- assertTrue( "Test includes", assertEquals( new String[]{"**/*.txt"}, file.getIncludes() ) );
-
- List excludesList = new ArrayList();
- excludesList.add( "**/*.xml" );
- excludesList.addAll( FileUtils.getDefaultExcludesAsList() );
-
- assertTrue( "Test excludes", assertEquals( excludesList.toArray( new String[0] ), file.getExcludes() ) );
- }
-
- public void testFileSetUnixLineEndings()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-unix-lineEndings-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
- assertNull( "Test original FileSet is not in archive", file );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
- File tempDir = (File) archiverFiles.keySet().iterator().next();
- assertTrue( "Test if dir is in tempRoot", tempDir.getAbsolutePath().startsWith( tempRoot.getAbsolutePath() ) );
-
- String newFile = tempDir.getAbsolutePath() + "/hibernate.hbm.xml";
- String unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
-
- newFile = tempDir.getAbsolutePath() + "/LICENSE.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
-
- newFile = tempDir.getAbsolutePath() + "/README.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
-
- newFile = tempDir.getAbsolutePath() + "/configs/config.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
- }
-
- public void testFileSetLFLineEndings()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-lf-lineEndings-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
- assertNull( "Test original FileSet is not in archive", file );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
- File tempDir = (File) archiverFiles.keySet().iterator().next();
- assertTrue( "Test if dir is in tempRoot", tempDir.getAbsolutePath().startsWith( tempRoot.getAbsolutePath() ) );
-
- String newFile = tempDir.getAbsolutePath() + "/hibernate.hbm.xml";
- String unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
-
- newFile = tempDir.getAbsolutePath() + "/LICENSE.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
-
- newFile = tempDir.getAbsolutePath() + "/README.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
-
- newFile = tempDir.getAbsolutePath() + "/configs/config.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) < 0 );
- }
-
- public void testFileSetDOSLineEndings()
- throws Exception
- {
- generateTestFileSets( "\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-dos-lineEndings-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
- assertNull( "Test original FileSet is not in archive", file );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
- File tempDir = (File) archiverFiles.keySet().iterator().next();
- assertTrue( "Test if dir is in tempRoot", tempDir.getAbsolutePath().startsWith( tempRoot.getAbsolutePath() ) );
-
- String newFile = tempDir.getAbsolutePath() + "/hibernate.hbm.xml";
- String unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
-
- newFile = tempDir.getAbsolutePath() + "/LICENSE.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
-
- newFile = tempDir.getAbsolutePath() + "/README.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
-
- newFile = tempDir.getAbsolutePath() + "/configs/config.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
- }
-
- public void testFileSetCRLFLineEndings()
- throws Exception
- {
- generateTestFileSets( "\n" );
-
- AssemblyMojo mojo = executeMojo( "fileSet-crlf-lineEndings-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive adds", archiverFiles.size(), 1 );
-
- File key = new File( basedir, "target/test-classes/fileSet" );
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( key );
- assertNull( "Test original FileSet is not in archive", file );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
- File tempDir = (File) archiverFiles.keySet().iterator().next();
- assertTrue( "Test if dir is in tempRoot", tempDir.getAbsolutePath().startsWith( tempRoot.getAbsolutePath() ) );
-
- String newFile = tempDir.getAbsolutePath() + "/hibernate.hbm.xml";
- String unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
-
- newFile = tempDir.getAbsolutePath() + "/LICENSE.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
-
- newFile = tempDir.getAbsolutePath() + "/README.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
-
- newFile = tempDir.getAbsolutePath() + "/configs/config.txt";
- unixContents = FileUtils.fileRead( newFile );
- assertTrue( "Test if modified file exists in tempRoot", FileUtils.fileExists( newFile ) );
- assertTrue( "Test if all \\r\\n are replaced", unixContents.indexOf( "\r\n" ) >= 0 );
- }
-
- public void testFileSetInvalidLineEndings()
- throws Exception
- {
- try
- {
- executeMojo( "fileSet-lineEndings-exception-plugin-config.xml" );
-
- fail( "Expected exception not thrown" );
- }
- catch ( MojoFailureException e )
- {
- // expected
- }
- }
-
- public void testFileSetDirectoryDoesntExist()
- throws Exception
- {
- executeMojo( "fileSet-doesnt-exist-plugin-config.xml" );
- assertTrue( true );
- }
-
- public void testFileSetWithNoDirectoryInAssemblyXml()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "fileSet-no-directory-plugin-config.xml" );
-
- File basedir = (File) getVariableValueFromObject( mojo, "basedir" );
-
- Map archivedFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertNotNull( "Test if basedir is used when <fileSet><directory> is not given", archivedFiles.remove( basedir ) );
-
- assertTrue( "Test that there are no other files added", archivedFiles.isEmpty() );
- }
-
- public void testFileItem()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- AssemblyMojo mojo = executeMojo( "fileItem-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive files", 2, archiverFiles.size() );
-
- Iterator files = archiverFiles.keySet().iterator();
-
- File archivedFile = (File) files.next();
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- if ( "README.txt".equals( archivedFile.getName() ) )
- {
- String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-
- assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
- }
-
- archivedFile = (File) files.next();
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- if ( "README.txt".equals( archivedFile.getName() ) )
- {
- String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-
- assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
- }
- }
-
- public void testFileItemWithOutputName()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- executeMojo( "fileItem-output-name-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive files", 1, archiverFiles.size() );
-
- File archivedFile = (File) archiverFiles.keySet().iterator().next();
-
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
-
- assertEquals( "Test archive file path", "assembly/output/READTHIS.txt", file.getOutputName() );
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-
- assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
- }
-
- public void testFileItemWithFiltering()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- executeMojo( "fileItem-filtered-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive files", 1, archiverFiles.size() );
-
- File archivedFile = (File) archiverFiles.keySet().iterator().next();
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-
- assertTrue( "Test if file filtering is enabled", contents.indexOf( "${project.artifactId}" ) < 0 );
- }
-
- public void testFileItemFilteringWithFilterFile()
- throws Exception
- {
- generateTestFileSets( "\n" );
-
- File filterFile = new File( basedir, "target/test-classes/fileSet/filterFile.properties" );
-
- String fileContents = "sentence=This sentence came from a filter file.";
-
- FileUtils.fileWrite( filterFile.getAbsolutePath(), fileContents );
-
- executeMojo( "fileItem-filter-file-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive files", 1, archiverFiles.size() );
-
- File archivedFile = (File) archiverFiles.keySet().iterator().next();
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-
- assertTrue( "Test if file filtering for ${project} is enabled", contents.indexOf( "${project.artifactId}" ) < 0 );
-
- assertTrue( "Test if file filtering for ${sentence} is enabled", contents.indexOf( "${sentence}" ) < 0 );
- }
-
- public void testFileItemLineEndings()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- executeMojo( "fileItem-lineEndings-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive files", 1, archiverFiles.size() );
-
- File archivedFile = (File) archiverFiles.keySet().iterator().next();
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
-
- assertTrue( "Test file line endings", contents.indexOf( "\r\n" ) < 0 );
- }
-
- public void testFileItemFileMode()
- throws Exception
- {
- generateTestFileSets( "\r\n" );
-
- executeMojo( "fileItem-fileMode-plugin-config.xml" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- assertEquals( "Test archive files", 1, archiverFiles.size() );
-
- File archivedFile = (File) archiverFiles.keySet().iterator().next();
-
- assertTrue( "Test if archived file exists", archivedFile.exists() );
-
- JarArchiverStub.ArchiverFile file = (JarArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
-
- assertEquals( "Test file mode", 777, file.getFileMode() );
- }
-
- public void testModuleSet()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "moduleSet-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- File unpacked = new File( workDir, reactorProject.getBuild().getFinalName() );
- assertTrue( "Test if reactor project was unpacked in work directory", unpacked.exists() );
- assertTrue( "Test if unpacked directory is in the archive", archiverFiles.containsKey( unpacked ) );
- archiverFiles.remove( unpacked );
-
- File metaInf = new File( unpacked, "META-INF" );
- if ( metaInf.exists() && metaInf.listFiles().length > 0 )
- {
- testSignatureFiles( metaInf );
- }
-
- File srcDir = reactorProject.getBasedir();
- assertTrue( "Test if reactor sources is in the archive", archiverFiles.containsKey( srcDir ) );
- archiverFiles.remove( srcDir );
- }
-
- assertEquals( "Test that there are no other archive files added", 0, archiverFiles.size() );
- }
-
- public void testModuleSetIncludes()
- throws Exception
- {
- ReactorMavenProjectStub.reactorProjects.clear();
-
- AssemblyMojo mojo = getMojo( "moduleSet-includes-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- File unpacked = new File( workDir, "reactor-project-1-1.0.jar" );
-
- assertTrue( "Test if reactor project was unpacked in work directory", unpacked.exists() );
- assertTrue( "Test if unpacked directory is in the archive", archiverFiles.containsKey( unpacked ) );
- archiverFiles.remove( unpacked );
-
- File metaInf = new File( unpacked, "META-INF" );
- if ( metaInf.exists() && metaInf.listFiles().length > 0 )
- {
- testSignatureFiles( metaInf );
- }
-
- File srcDir = new File( workDir.getParentFile(), "reactor-project-1" );
- assertTrue( "Test if reactor project sources is in the archive", archiverFiles.containsKey( srcDir ) );
- archiverFiles.remove( srcDir );
-
- assertEquals( "Test that there are no other archive files added", 0, archiverFiles.size() );
- }
-
- public void testModuleSetExcludes()
- throws Exception
- {
- ReactorMavenProjectStub.reactorProjects.clear();
-
- AssemblyMojo mojo = getMojo( "moduleSet-excludes-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- File unpacked = new File( workDir, "reactor-project-2-1.0.jar" );
-
- assertTrue( "Test if reactor project was unpacked in work directory", unpacked.exists() );
- assertTrue( "Test if unpacked directory is in the archive", archiverFiles.containsKey( unpacked ) );
- archiverFiles.remove( unpacked );
-
- File metaInf = new File( unpacked, "META-INF" );
- if ( metaInf.exists() && metaInf.listFiles().length > 0 )
- {
- testSignatureFiles( metaInf );
- }
-
- File srcDir = new File( workDir.getParentFile(), "reactor-project-2" );
- assertTrue( "Test if reactor project sources is in the archive", archiverFiles.containsKey( srcDir ) );
- archiverFiles.remove( srcDir );
-
- assertEquals( "Test that there are no other archive files added", 0, archiverFiles.size() );
- }
-
- public void testModuleSetIncludeDependencies()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "moduleSet-include-dependencies-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- File unpacked = new File( workDir, reactorProject.getBuild().getFinalName() );
- assertTrue( "Test if reactor project is unpacked in work directory", unpacked.exists() );
- File dependency = new File( unpacked, "reactor-dependency-1.0.jar.extracted" );
- assertTrue( "Test if reactor dependency is also unpacked", dependency.exists() );
- assertTrue( "Test if unpacked directory is in the archive", archiverFiles.containsKey( unpacked ) );
- archiverFiles.remove( unpacked );
-
- File metaInf = new File( unpacked, "META-INF" );
- if ( metaInf.exists() && metaInf.listFiles().length > 0 )
- {
- testSignatureFiles( metaInf );
- }
-
- File srcDir = reactorProject.getBasedir();
- assertTrue( "Test if reactor sources is in the archive", archiverFiles.containsKey( srcDir ) );
- archiverFiles.remove( srcDir );
- }
-
- assertEquals( "Test that there are no other archive files added", 0, archiverFiles.size() );
- }
-
- public void testModuleSetPacked()
- throws Exception
- {
- ReactorMavenProjectStub.reactorProjects.clear();
-
- AssemblyMojo mojo = getMojo( "moduleSet-packed-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- assertFalse( "Test if work directory is used", workDir.exists() );
- File reactorProjectFile = reactorProject.getArtifact().getFile();
- assertNotNull( "Test if reactor project is in the archive", archiverFiles.remove( reactorProjectFile ) );
- Artifact artifact = (Artifact) reactorProject.getArtifacts().iterator().next();
- File depFile = artifact.getFile();
- assertNull( "Test if reactor dependency is not in the archive", archiverFiles.remove( depFile ) );
- }
-
- assertTrue( "Test that there are no other archive files added", archiverFiles.isEmpty() );
- }
-
- public void testModuleSetPackedIncludingDependencies()
- throws Exception
- {
- ReactorMavenProjectStub.reactorProjects.clear();
-
- AssemblyMojo mojo = getMojo( "moduleSet-packed-including-dependencies-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- assertFalse( "Test if work directory is used", workDir.exists() );
- File reactorProjectFile = reactorProject.getArtifact().getFile();
- assertNotNull( "Test if reactor project is in the archive", archiverFiles.remove( reactorProjectFile ) );
- Artifact artifact = (Artifact) reactorProject.getArtifacts().iterator().next();
- File depFile = artifact.getFile();
- assertNotNull( "Test if reactor dependency is also in the archive", archiverFiles.remove( depFile ) );
- }
-
- assertTrue( "Test that there are no other archive files added", archiverFiles.isEmpty() );
- }
-
- public void testRepository()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "repository-plugin-config.xml" );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
-
- File tmpRepositoryDir = new File( tempRoot, "repository" );
- assertTrue( "Test if repository output directory is used", tmpRepositoryDir.exists() );
-
- String repoPath = "assembly/dependency-artifact/1.0/dependency-artifact-1.0.";
-
- File tmpArtifactJar = new File( tmpRepositoryDir, repoPath + "jar" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactJar.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "jar.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "jar.sha1" ).exists() );
-
- File tmpArtifactPom = new File( tmpRepositoryDir, repoPath + "pom" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactPom.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "pom.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "pom.sha1" ).exists() );
- }
-
- public void testRepositoryWithMetadata()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "repository-with-metadata-plugin-config.xml" );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
-
- File tmpRepositoryDir = new File( tempRoot, "repository" );
- assertTrue( "Test if repository output directory is used", tmpRepositoryDir.exists() );
-
- String repoPath = "assembly/dependency-artifact/1.0/dependency-artifact-1.0.";
-
- File tmpArtifactJar = new File( tmpRepositoryDir, repoPath + "jar" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactJar.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "jar.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "jar.sha1" ).exists() );
-
- File tmpArtifactPom = new File( tmpRepositoryDir, repoPath + "pom" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactPom.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "pom.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "pom.sha1" ).exists() );
-
- File tmpArtifactMetadatadir = new File( tmpRepositoryDir, "assembly/dependency-artifact" );
- File metadataXml = new File( tmpArtifactMetadatadir, "maven-metadata.xml" );
- assertTrue( "Test if metadata was created", metadataXml.exists() );
- assertTrue( "Test if metadata md5 was generated", new File( tmpArtifactMetadatadir, "maven-metadata.xml.md5" ).exists() );
- assertTrue( "Test if metadata md5 was generated", new File( tmpArtifactMetadatadir, "maven-metadata.xml.sha1" ).exists() );
-
- metadataXml = new File( tmpArtifactMetadatadir, "maven-metadata-central.xml" );
- assertTrue( "Test if metadata was created", metadataXml.exists() );
- assertTrue( "Test if metadata md5 was generated", new File( tmpArtifactMetadatadir, "maven-metadata-central.xml.md5" ).exists() );
- assertTrue( "Test if metadata md5 was generated", new File( tmpArtifactMetadatadir, "maven-metadata-central.xml.sha1" ).exists() );
- }
-
- public void testRepositoryGroupVersionAlignment()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "repository-groupVersionAlignment-plugin-config.xml" );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
-
- File tmpRepositoryDir = new File( tempRoot, "repository" );
- assertTrue( "Test if repository output directory is used", tmpRepositoryDir.exists() );
-
- String repoPath = "assembly/dependency-artifact/1.1/dependency-artifact-1.1.";
-
- File tmpArtifactJar = new File( tmpRepositoryDir, repoPath + "jar" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactJar.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "jar.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "jar.sha1" ).exists() );
-
- File tmpArtifactPom = new File( tmpRepositoryDir, repoPath + "pom" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactPom.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "pom.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "pom.sha1" ).exists() );
- }
-
- public void testRepositoryGroupVersionAlignmentExcludes()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "repository-groupVersionAlignment-excludes-plugin-config.xml" );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
-
- File tmpRepositoryDir = new File( tempRoot, "repository" );
- assertTrue( "Test if repository output directory is used", tmpRepositoryDir.exists() );
-
- String repoPath = "assembly/dependency-artifact/1.0/dependency-artifact-1.0.";
-
- File tmpArtifactJar = new File( tmpRepositoryDir, repoPath + "jar" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactJar.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "jar.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "jar.sha1" ).exists() );
-
- File tmpArtifactPom = new File( tmpRepositoryDir, repoPath + "pom" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactPom.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "pom.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "pom.sha1" ).exists() );
- }
-
- public void testMASSEMBLY98()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "MASSEMBLY-98-plugin-config.xml" );
-
- File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
-
- File tmpRepositoryDir = new File( tempRoot, "repository" );
- assertTrue( "Test if repository output directory is used", tmpRepositoryDir.exists() );
-
- String repoPath = "assembly/dependency-artifact/1.1/dependency-artifact-1.1.";
-
- File tmpArtifactJar = new File( tmpRepositoryDir, repoPath + "jar" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactJar.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "jar.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "jar.sha1" ).exists() );
-
- File tmpArtifactPom = new File( tmpRepositoryDir, repoPath + "pom" );
- assertTrue( "Test if dependency artifact is in repository", tmpArtifactPom.exists() );
- assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir, repoPath + "pom.md5" ).exists() );
- assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir, repoPath + "pom.sha1" ).exists() );
- }
-
- public void testComponents()
- throws Exception
- {
- AssemblyMojo mojo = executeMojo( "component-plugin-config.xml" );
-
- Map archivedFiles = ArchiverManagerStub.archiverStub.getFiles();
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
- assertNotNull( "Test if project jar is in archive", archivedFiles.remove( project.getArtifact().getFile() ) );
-
- File fileSetDir = new File( PlexusTestCase.getBasedir(), "target/test-classes/fileSet" );
- assertNotNull( "Test if FileSet is in the archive", archivedFiles.remove( fileSetDir ) );
-
- File readme = new File( PlexusTestCase.getBasedir(), "target/test-classes/fileSet/README.txt" );
- assertNotNull( "Test if FileItem README.txt is in the archive", archivedFiles.remove( readme ) );
-
- File license = new File( PlexusTestCase.getBasedir(), "target/test-classes/fileSet/LICENSE.txt" );
- assertNotNull( "Test if FileItem LICENSE.txt is in the archive", archivedFiles.remove( license ) );
-
- assertTrue( "Test there are no more files in the archive", archivedFiles.isEmpty() );
- }
-
- public void testPlexusComponents()
- throws Exception
- {
- File plexusDir = new File( basedir + "/target/test-classes/fileSet/META-INF/plexus" );
- plexusDir.mkdirs();
- String fileContents = "<component-set>\n <components>\n <component>\n <role>class.Role</role>" +
- "\n <implementation>class.Implementation</implementation>\n </component>\n </components>" +
- "\n</component-set>";
- FileUtils.fileWrite( new File( plexusDir, "components.xml" ).getAbsolutePath(), fileContents );
-
- AssemblyMojo mojo = executeMojo( "plexus-components-plugin-config.xml" );
-
- Map files = ArchiverManagerStub.archiverStub.getFiles();
-
- File fileSetDir = new File( PlexusTestCase.getBasedir() + "/target/test-classes/fileSet" );
- assertNotNull( "Test if FileSet is in the archive", files.remove( fileSetDir ) );
-
- File componentXml = (File) files.keySet().iterator().next();
- files.remove( componentXml );
- assertTrue( "Test if componentXml tmp file was created", componentXml.exists() );
- FileReader fileReader = new FileReader( componentXml );
- assertNotNull( "Test if componentXml is correctly created", Xpp3DomBuilder.build( fileReader ) );
-
- assertTrue( "Test there are no more files in the archive", files.isEmpty() );
- }
-
- public void testIncludeSiteDirectory()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "includeSite-plugin-config.xml" );
-
- File siteDir = (File) getVariableValueFromObject( mojo, "siteDirectory" );
-
- siteDir.mkdirs();
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- Map files = ArchiverManagerStub.archiverStub.getFiles();
-
- assertTrue( "Test if site directory was added", files.containsKey( siteDir ) );
- }
-
- public void testTarGzipArchive()
- throws Exception
- {
- executeMojo( "tar-gz-plugin-config.xml" );
-
- TarArchiver.TarCompressionMethod method = (TarArchiver.TarCompressionMethod) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "tarCompressionMethod" );
-
- assertEquals( "Test Tar compression method", "gzip", method.getValue() );
-
- TarLongFileMode longFileMode = (TarLongFileMode) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "longFileMode" );
-
- assertTrue( "Test tar long file mode default", longFileMode.isWarnMode() );
- }
-
- public void testTgzArchive()
- throws Exception
- {
- executeMojo( "tgz-plugin-config.xml" );
-
- TarArchiver.TarCompressionMethod method = (TarArchiver.TarCompressionMethod) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "tarCompressionMethod" );
-
- assertEquals( "Test Tar compression method", "gzip", method.getValue() );
-
- TarLongFileMode longFileMode = (TarLongFileMode) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "longFileMode" );
-
- assertTrue( "Test tar long file mode default", longFileMode.isWarnMode() );
- }
-
- public void testTarBzip2Archive()
- throws Exception
- {
- executeMojo( "tar-bz2-plugin-config.xml" );
-
- TarArchiver.TarCompressionMethod method = (TarArchiver.TarCompressionMethod) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "tarCompressionMethod" );
-
- assertEquals( "Test Tar compression method", "bzip2", method.getValue() );
-
- TarLongFileMode longFileMode = (TarLongFileMode) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "longFileMode" );
-
- assertTrue( "Test tar long file mode default", longFileMode.isFailMode() );
- }
-
- public void testTbz2Archive()
- throws Exception
- {
- executeMojo( "tbz2-plugin-config.xml" );
-
- TarArchiver.TarCompressionMethod method = (TarArchiver.TarCompressionMethod) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "tarCompressionMethod" );
-
- assertEquals( "Test Tar compression method", "bzip2", method.getValue() );
-
- TarLongFileMode longFileMode = (TarLongFileMode) getVariableValueFromObject( ArchiverManagerStub.archiverStub, "longFileMode" );
-
- assertTrue( "Test tar long file mode default", longFileMode.isFailMode() );
- }
-
- public void testWarArchive()
- throws Exception
- {
- executeMojo( "war-plugin-config.xml" );
-
- WarArchiverStub archiver = (WarArchiverStub) ArchiverManagerStub.archiverStub;
-
- assertFalse( "Test that web.xml is not ignored", archiver.getIgnoreWebxml() );
- }
-
- public void testManifestFile()
- throws Exception
- {
- String contents = "Manifest-Version: 1.0\n" + "Archiver-Version: Plexus Archiver\n" +
- "Created-By: Apache Maven\n" + "Built-By: User\n" + "Build-Jdk: 1.4.2_10\n" +
- "Extension-Name: maven-assembly-plugin\n" + "Specification-Title: Maven Plugins\n" +
- "Specification-Vendor: Apache Software Foundation\n" +
- "Implementation-Vendor: Apache Software Foundation\n" + "Implementation-Title: maven-assembly-plugin\n" +
- "Implementation-Version: 2.2-SNAPSHOT";
-
- File manifestFile = new File( PlexusTestCase.getBasedir() + "/target/test-harness/assembly/manifestFile/test-manifest.file" );
-
- manifestFile.getParentFile().mkdirs();
-
- FileUtils.fileWrite( manifestFile.getAbsolutePath(), contents );
-
- executeMojo( "manifestFile-plugin-config.xml" );
-
- JarArchiverStub archiver = (JarArchiverStub) ArchiverManagerStub.archiverStub;
-
- assertEquals( "Test if provided manifest is used", new Manifest( new FileReader( manifestFile ) ), archiver.getManifest() );
- }
-
- public void testManifest()
- throws Exception
- {
- executeMojo( "manifest-plugin-config.xml" );
-
- JarArchiverStub archiver = (JarArchiverStub) ArchiverManagerStub.archiverStub;
-
- Manifest manifest = archiver.getManifest();
-
- manifest.write( new PrintWriter( System.out ) );
- }
-
- public void testManifestFileNotFoundException()
- throws Exception
- {
- try
- {
- executeMojo( "manifestFile-FileNotFoundException-plugin-config.xml" );
-
- fail( "Expected exception not thrown" );
- }
- catch ( MojoFailureException e )
- {
- assertTrue( "Test for expected exception", e.getMessage().startsWith( "Manifest not found: " ) );
- }
- }
-
- public void testNoSuchArchiverException()
- throws Exception
- {
- try
- {
- executeMojo( "NoSuchArchiverException-plugin-config.xml" );
-
- fail( "Expected exception not thrown" );
- }
- catch ( MojoFailureException e )
- {
- assertTrue( "Test for expected exception", e.getMessage().startsWith( "Unable to obtain archiver for extension" ) );
- }
- }
-
- public void testArchiverExceptionOnAddDirectoryMethod()
- throws Exception
- {
- generateTestFileSets( "\n" );
-
- AssemblyMojo mojo = getMojo( "fileSet-plugin-config.xml" );
-
- ArchiverManagerStub.archiverStub = new JarArchiverStub()
- {
- public void addDirectory( File file, String string, String[] includes, String[] excludes )
- throws ArchiverException
- {
- throw new ArchiverException( "Intentional exception" );
- }
- };
-
- try
- {
- mojo.execute();
-
- fail( "Expected exception not thrown" );
- }
- catch ( MojoExecutionException e )
- {
- assertTrue( "Test thrown exception", e.getMessage().startsWith( "Error adding directory to archive: ") );
- }
- }
-
- public void testArchiverExceptionInModuleSet()
- throws Exception
- {
- AssemblyMojo mojo = getMojo( "moduleSet-plugin-config.xml" );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "executedProject" );
-
- List reactorProjectsList = (List) getVariableValueFromObject( mojo, "reactorProjects" );
-
- for ( Iterator reactorProjects = reactorProjectsList.iterator(); reactorProjects.hasNext(); )
- {
- MavenProject reactorProject = (MavenProject) reactorProjects.next();
-
- reactorProject.setParent( project );
- }
-
- ArchiverManagerStub.archiverStub = new JarArchiverStub()
- {
- public void addDirectory( File file, String string, String[] includes, String[] excludes )
- throws ArchiverException
- {
- throw new ArchiverException( "Intentional exception" );
- }
- };
-
- try
- {
- mojo.execute();
-
- fail( "Expected exception not thrown" );
- }
- catch ( MojoExecutionException e )
- {
- assertTrue( "Test thrown exception", e.getMessage().startsWith( "Error adding directory to archive: ") );
- }
- }
-
- public void testAttachedMojo()
- throws Exception
- {
- Mojo mojo = lookupMojo( "attached", basedir + "/src/test/plugin-configs/attached/min-plugin-config.xml" );
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
- }
-
- public void testAttachedMojoDependencySet()
- throws Exception
- {
- Mojo mojo = lookupMojo( "attached", basedir + "/src/test/plugin-configs/attached/depSet-plugin-config.xml" );
-
- mojo.execute();
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
- Set artifactSet = project.getArtifacts();
-
- Map archiveMap = ArchiverManagerStub.archiverStub.getFiles();
- Collection archivedFiles = archiveMap.keySet();
-
- assertEquals( "Test number of files in archive", artifactSet.size() + 1, archivedFiles.size() );
-
- for ( Iterator artifacts = artifactSet.iterator(); artifacts.hasNext(); )
- {
- Artifact expected = (Artifact) artifacts.next();
-
- assertTrue( "Test expected dependency artifacts in archive", archivedFiles.contains( expected.getFile() ) );
- assertTrue( "Test expected dependency is not unpacked", expected.getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( expected.getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- assertTrue( "Test project is in archive", archivedFiles.contains( project.getArtifact().getFile() ) );
- assertTrue( "Test project is not unpacked", project.getArtifact().getFile().getName().endsWith( ".jar" ) );
-
- JarArchiverStub.ArchiverFile archiveFile =
- (JarArchiverStub.ArchiverFile) archiveMap.get( project.getArtifact().getFile() );
- String archivePath = archiveFile.getOutputName();
- assertTrue( "Test includeBaseDirectory", archivePath.startsWith( "assembly/" ) );
- }
-
- private AssemblyMojo getMojo( String pluginXml )
- throws Exception
- {
- return (AssemblyMojo) lookupMojo( "assembly", basedir + "/src/test/plugin-configs/assembly/" + pluginXml );
- }
-
- private AssemblyMojo executeMojo( String pluginXml )
- throws Exception
- {
- AssemblyMojo mojo = getMojo( pluginXml );
-
- mojo.execute();
-
- assertTrue( "Test an archive was created", ArchiverManagerStub.archiverStub.getDestFile().exists() );
-
- return mojo;
- }
-
- private boolean assertEquals( Object[] obj1, Object[] obj2 )
- {
- boolean equal = false;
-
- if ( obj1.length == obj2.length )
- {
- for ( int ctr = 0; ctr < obj1.length; ctr++ )
- {
- if ( !obj1[ctr].equals( obj2[ctr] ) )
- {
- break;
- }
- }
-
- equal = true;
- }
-
- return equal;
- }
-
- private void generateTestFileSets( String lineEnding )
- throws Exception
- {
- generateTestFileSets( basedir, lineEnding );
- }
-
- static void generateTestFileSets( String basedir, String lineEnding )
- throws Exception
- {
- String fileSetDir = basedir + "/target/test-classes/fileSet";
-
- /* ensure that we start with a fresh dir, else we get all manner of dross from other tests */
- FileUtils.deleteDirectory(fileSetDir);
-
- FileUtils.mkdir( fileSetDir + "/configs" );
-
- String fileContents = "<hibernate>" + lineEnding + " <hibernate-mapping>" + lineEnding + " <class/>" +
- lineEnding + " </hibernate-mapping>" + lineEnding + "</hibernate>";
- FileUtils.fileWrite( fileSetDir + "/hibernate.hbm.xml", fileContents );
-
- fileContents = "Copyright 2001-2006 The Apache Software Foundation." + lineEnding + lineEnding +
- "Licensed under the Apache License, Version 2.0 (the \"License\");" + lineEnding +
- "you may not use this file except in compliance with the License." + lineEnding +
- "You may obtain a copy of the License at" + lineEnding + lineEnding +
- " http://www.apache.org/licenses/LICENSE-2.0" + lineEnding + lineEnding +
- "Unless required by applicable law or agreed to in writing, software" + lineEnding +
- "distributed under the License is distributed on an \"AS IS\" BASIS," + lineEnding +
- "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." + lineEnding +
- "See the License for the specific language governing permissions and" + lineEnding +
- "limitations under the License.";
- FileUtils.fileWrite( fileSetDir + "/LICENSE.txt", fileContents );
-
- fileContents = "Readme file with only one line for ${project.artifactId}. ${sentence}";
- FileUtils.fileWrite( fileSetDir + "/README.txt", fileContents );
-
- fileContents = "sample configuration file line 1" + lineEnding + "sample configuration file line 2" +
- lineEnding + "sample configuration file line 3" + lineEnding + "sample configuration file line 4";
- FileUtils.fileWrite( fileSetDir + "/configs/config.txt", fileContents );
- }
-
- private void testSignatureFiles( File metaInf )
- {
- File[] metaInfFiles = metaInf.listFiles(
- new FilenameFilter()
- {
- String[] signatureExt = { ".rsa", ".dsa", ".sf" };
-
- public boolean accept( File dir, String name )
- {
- for ( int idx = 0; idx < signatureExt.length; idx++ )
- {
- if ( name.toLowerCase().endsWith( signatureExt[ idx ] ) )
- {
- return true;
- }
- }
-
- return false;
- }
- }
- );
-
- assertEquals( "Test for signature files", 0, metaInfFiles.length );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
deleted file mode 100644
index e8e0fbe..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
+++ /dev/null
@@ -1,642 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.diags.NoOpArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * Test common features of all assembly mojos.
- *
- * @todo Switch to use test-only mojos, once we can generate descriptors for those...
- */
-public class BasicAbstractAssemblyMojoFeaturesTest
- extends AbstractMojoTestCase
-{
-
- public void testOutputFileNameMapping() throws Exception
- {
- String pluginConfig = "outputFileNameMapping-pluginConfig.xml";
-
- List requiredDependencies = new ArrayList();
-
- requiredDependencies.add( "dependencies/test.jar" );
- requiredDependencies.add( "dependencies/test2.jar" );
-
- Mojo mojo = run( pluginConfig, "directory-inline" );
- assertFilesAdded( mojo, requiredDependencies );
- }
-
- public void testModuleSetSourceIncludedBinariesNotIncluded() throws Exception
- {
- String pluginConfig = "moduleSetSourceIncludedBinariesNotIncluded-pluginConfig.xml";
-
- Mojo mojo = run( pluginConfig, "attached" );
-
- List required = Collections.singletonList( "sources/module1/src/main/java/org/test/module1/App.java" );
-
- assertFilesAdded( mojo, required );
- }
-
- private Mojo run( String pluginConfig, String mojoName ) throws Exception
- {
- String pluginConfigResource = "basicAbstractAssemblyMojoFeaturesTest/" + pluginConfig;
-
- File pluginConfigFile = new File( getBasedir(), "src/test/plugin-configs/" + pluginConfigResource );
-
- assertTrue( "Cannot find plugin-configuration: \'" + pluginConfigResource + "\' in context-classloader\'s classpath.", pluginConfigFile.exists() );
-
- // TODO: Need to replace this with test-only mojos...
- Mojo mojo = (Mojo) lookupMojo( mojoName, pluginConfigFile.getAbsolutePath() );
-
- FileLoggingArchiverManagerStub archiverManager = (FileLoggingArchiverManagerStub) getVariableValueFromObject( mojo, "archiverManager" );
- archiverManager.clearArchiver();
-
- mojo.execute();
-
- return mojo;
- }
-
- private void assertFilesAdded( Mojo mojo, List requiredDependencies ) throws Exception
- {
- FileLoggingArchiverManagerStub archiverManager = (FileLoggingArchiverManagerStub) getVariableValueFromObject( mojo, "archiverManager" );
-
- FileLoggingArchiverStub archiver = (FileLoggingArchiverStub) archiverManager.getArchiver( (File)null );
-
- Set addedFiles = archiver.getAddedFiles();
-
- System.out.println( "The following files were added to the test assembly:\n" + addedFiles.toString().replace(',', '\n' ) );
-
- for ( Iterator it = requiredDependencies.iterator(); it.hasNext(); )
- {
- String targetPath = (String) it.next();
-
- assertTrue( "Required dependency path missing: \'" + targetPath + "\'", addedFiles.contains( targetPath ) );
- }
- }
-
- public static final class BasedirSettableMavenProjectStub extends MavenProjectStub
- {
-
- File basedir;
-
- public File getBasedir()
- {
- return basedir;
- }
-
- public void setBasedir( File basedir )
- {
- this.basedir = basedir;
- }
-
-
- }
-
- public static final class FileLoggingArchiverManagerStub
- implements ArchiverManager
- {
- private FileLoggingArchiverStub archiverStub;
-
- public Archiver getArchiver( String string ) throws NoSuchArchiverException
- {
- if ( archiverStub == null )
- {
- archiverStub = new FileLoggingArchiverStub();
- }
-
- return archiverStub;
- }
-
- void clearArchiver()
- {
- archiverStub = null;
- }
-
- public UnArchiver getUnArchiver( String arg0 ) throws NoSuchArchiverException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public UnArchiver getUnArchiver( File arg0 ) throws NoSuchArchiverException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Archiver getArchiver( File arg0 ) throws NoSuchArchiverException
- {
- // TODO Auto-generated method stub
- return null;
- }
- }
-
- public static final class FileLoggingArchiverStub
- extends NoOpArchiver
- {
-
- private Set files = new LinkedHashSet();
- private DirectoryScanner scanner = new DirectoryScanner();
-
- public void addFile( File file, String targetPath, int mode ) throws ArchiverException
- {
- files.add( targetPath );
- }
-
- public void addFile( File file, String targetPath ) throws ArchiverException
- {
- files.add( targetPath );
- }
-
- public Set getAddedFiles()
- {
- return files;
- }
-
- public void addDirectory( File dir ) throws ArchiverException
- {
- System.out.println( "Add dir 1" );
- addDirectory_( dir, null, null, null );
- }
-
- public void addDirectory( File dir, String prefix ) throws ArchiverException
- {
- System.out.println( "Add dir 2" );
- addDirectory_( dir, prefix, null, null );
- }
-
- public void addDirectory( File dir, String[] includes, String[] excludes ) throws ArchiverException
- {
- System.out.println( "Add dir 3" );
- addDirectory_( dir, null, includes, excludes );
- }
-
- public void addDirectory( File dir, String prefix, String[] includes, String[] excludes ) throws ArchiverException
- {
- System.out.println( "Add dir 3" );
- addDirectory_( dir, prefix, includes, excludes );
- }
-
- private void addDirectory_( File dir, String prefix, String[] includes, String[] excludes ) throws ArchiverException
- {
- try
- {
- String include = StringUtils.join( includes, "," );
- String exclude = StringUtils.join( excludes, "," );
-
- String prepend = prefix;
-
- if ( prepend != null && !prepend.endsWith( "/" ) )
- {
- prepend += "/";
- }
-
- System.out.println( "Scanning: " + dir + "\nwith includes: " + include + "\nand excludes: " + exclude + "\nand prepending dir prefix: " + prepend );
-
- List fileNames = FileUtils.getFileNames( dir, include, exclude, false );
-
- for ( Iterator it = fileNames.iterator(); it.hasNext(); )
- {
- String name = (String) it.next();
-
- String fn = prepend + dir.getPath() + "/" + name;
- fn.replace( '\\', '/' );
-
- System.out.println( "Adding: " + fn );
-
- files.add( fn );
- }
- }
- catch ( IOException e )
- {
- throw new ArchiverException( "Error scanning for file names.", e );
- }
- }
- }
-
- public static final class TwoDependencyReactorProjectStub
- extends MavenProjectStub
- {
- private String groupId = "org.test.project";
- private String artifactId = "test-project";
- private String version = "1";
- private String packaging = "jar";
- private String scope = "compile";
-
- private String depOneArtifactId;
- private String depOneGroupId;
- private String depOneVersion;
- private String depOneType = "jar";
- private String depOneScope = "compile";
- private File depOneFile;
-
- private String depTwoArtifactId;
- private String depTwoGroupId;
- private String depTwoVersion;
- private String depTwoType = "jar";
- private String depTwoScope = "compile";
- private File depTwoFile;
- private LinkedHashSet artifacts;
-
- public Set getArtifacts()
- {
- artifacts = new LinkedHashSet();
-
- addArtifact( depOneGroupId, depOneArtifactId, depOneVersion, depOneType, depOneScope, depOneFile );
- addArtifact( depTwoGroupId, depTwoArtifactId, depTwoVersion, depTwoType, depTwoScope, depTwoFile );
-
- return artifacts;
- }
-
- private void addArtifact( String groupId, String artifactId, String version, String type, String scope, File file )
- {
- Artifact artifact = new HandlerEquippedArtifactStub( groupId, artifactId, version, type, scope );
- artifact.setFile( file );
-
- artifacts .add( artifact );
- }
-
- public Artifact getArtifact()
- {
- return new HandlerEquippedArtifactStub( groupId, artifactId, version, packaging, scope );
- }
-
- public TwoDependencyReactorProjectStub()
- {
- Model model = getModel();
- if( model == null )
- {
- model = new Model();
- setModel( model );
- }
-
- Properties props = model.getProperties();
- if ( props == null )
- {
- props = new Properties();
- model.setProperties( props );
- }
- }
- }
-
- public static final class HandlerEquippedArtifactStub implements Artifact
- {
-
- private String type;
- private String artifactId;
- private String groupId;
- private String version;
- private String classifier;
- private String scope;
- private File file;
-
- public HandlerEquippedArtifactStub( String groupId, String artifactId, String version, String type, String scope )
- {
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.version = version;
- this.type = type;
- this.scope = scope;
- }
-
- public HandlerEquippedArtifactStub()
- {
- }
-
- public ArtifactHandler getArtifactHandler()
- {
- ArtifactHandler handler = new ArtifactHandler()
- {
-
- public String getClassifier()
- {
- return classifier;
- }
-
- public String getDirectory()
- {
- return null;
- }
-
- public String getExtension()
- {
- return type;
- }
-
- public String getLanguage()
- {
- return "java";
- }
-
- public String getPackaging()
- {
- return type;
- }
-
- public boolean isAddedToClasspath()
- {
- return true;
- }
-
- public boolean isIncludesDependencies()
- {
- return true;
- }
-
- };
-
- return handler;
- }
-
- public void addMetadata( ArtifactMetadata arg0 )
- {
- // TODO Auto-generated method stub
-
- }
-
- public String getArtifactId()
- {
- return artifactId;
- }
-
- public List getAvailableVersions()
- {
- return Collections.singletonList( version );
- }
-
- public String getBaseVersion()
- {
- return version;
- }
-
- public String getClassifier()
- {
- return classifier;
- }
-
- public String getDependencyConflictId()
- {
- return groupId + ":" + artifactId + ":" + type + ":" + version;
- }
-
- public ArtifactFilter getDependencyFilter()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public List getDependencyTrail()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getDownloadUrl()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public File getFile()
- {
- return file;
- }
-
- public String getGroupId()
- {
- return groupId;
- }
-
- public String getId()
- {
- return getDependencyConflictId() + ":" + scope;
- }
-
- public Collection getMetadataList()
- {
- return null;
- }
-
- public ArtifactRepository getRepository()
- {
- return null;
- }
-
- public String getScope()
- {
- return scope;
- }
-
- public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException
- {
- return null;
- }
-
- public String getType()
- {
- return type;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public VersionRange getVersionRange()
- {
- return VersionRange.createFromVersion( version );
- }
-
- public boolean hasClassifier()
- {
- return classifier != null;
- }
-
- public boolean isOptional()
- {
- return false;
- }
-
- public boolean isRelease()
- {
- return false;
- }
-
- public boolean isResolved()
- {
- return true;
- }
-
- public boolean isSelectedVersionKnown() throws OverConstrainedVersionException
- {
- return true;
- }
-
- public boolean isSnapshot()
- {
- return false;
- }
-
- public void selectVersion( String arg0 )
- {
- }
-
- public void setArtifactHandler( ArtifactHandler arg0 )
- {
- }
-
- public void setArtifactId( String artifactId )
- {
- this.artifactId = artifactId;
- }
-
- public void setAvailableVersions( List arg0 )
- {
- }
-
- public void setBaseVersion( String version )
- {
- this.version = version;
- }
-
- public void setDependencyFilter( ArtifactFilter arg0 )
- {
- }
-
- public void setDependencyTrail( List arg0 )
- {
- }
-
- public void setDownloadUrl( String arg0 )
- {
- }
-
- public void setFile( File file )
- {
- this.file = file;
-
- if ( file.exists() )
- {
- Writer writer = null;
- try
- {
- writer = new FileWriter( file );
- writer.write( "test artifact" );
- }
- catch ( IOException e )
- {
- IllegalArgumentException error = new IllegalArgumentException( "Cannot write test file: " + file + ". Reason: " + e.getMessage() );
- error.initCause( e );
-
- throw error;
- }
- finally
- {
- IOUtil.close( writer );
- }
- }
- }
-
- public void setGroupId( String groupId )
- {
- this.groupId = groupId;
- }
-
- public void setRelease( boolean arg0 )
- {
- }
-
- public void setRepository( ArtifactRepository arg0 )
- {
- }
-
- public void setResolved( boolean arg0 )
- {
- }
-
- public void setResolvedVersion( String version )
- {
- this.version = version;
- }
-
- public void setScope( String scope )
- {
- this.scope = scope;
- }
-
- public void setVersion( String version )
- {
- this.version = version;
- }
-
- public void setVersionRange( VersionRange arg0 )
- {
- }
-
- public void updateVersion( String arg0, ArtifactRepository arg1 )
- {
- }
-
- public int compareTo( Object o )
- {
- return 0;
- }
-
- public void setOptional( boolean optional )
- {
- }
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
deleted file mode 100644
index 9cbb7e6..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-import org.apache.maven.plugin.assembly.mojos.DirectoryInlineMojo;
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
-
-import java.io.File;
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class DirectoryInlineMojoTest
-extends AbstractMojoTestCase
-{
- public void testAssemblyDirectory()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory-inline/min-plugin-config.xml" );
-
- DirectoryInlineMojo mojo = ( DirectoryInlineMojo ) lookupMojo( "directory-inline", testPom );
-
- assertNotNull( mojo );
-
- mojo.execute();
-
- Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
-
- Set files = filesArchived.keySet();
-
- assertEquals( 1, files.size() );
- }
-
- public void testDependencySet()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory-inline/dependency-set-plugin-config.xml" );
-
- DirectoryInlineMojo mojo = ( DirectoryInlineMojo ) lookupMojo( "directory-inline", testPom );
-
- assertNotNull( mojo );
-
- MavenProject project = ( MavenProject ) getVariableValueFromObject( mojo, "project" );
-
- Set artifacts = project.getArtifacts();
-
- mojo.execute();
-
- Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
-
- Set files = filesArchived.keySet();
-
- for( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = ( Artifact ) iter.next();
-
- assertTrue( files.contains( artifact.getFile() ) );
- assertTrue( artifact.getFile().getName().endsWith( ".jar" ) );
- }
-
- assertTrue( "Test project is in archive", files.contains( project.getArtifact().getFile() ) );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
deleted file mode 100644
index 3a71b8e..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.plugin.assembly.mojos.DirectoryMojo;
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
-
-import java.io.File;
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * @author Allan Q. Ramirez
- */
-public class DirectoryMojoTest
- extends AbstractMojoTestCase
-{
- public void testEnvironment()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory/min-plugin-config.xml" );
-
- DirectoryMojo mojo = ( DirectoryMojo ) lookupMojo( "directory", testPom );
-
- assertNotNull( mojo );
- }
-
- public void testAssemblyDirectory()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory/min-plugin-config.xml" );
-
- DirectoryMojo mojo = ( DirectoryMojo ) lookupMojo( "directory", testPom );
-
- assertNotNull( mojo );
-
- AssemblyMojoTest.generateTestFileSets(getBasedir(), "\n");
-
- mojo.execute();
-
- Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
-
- Set files = filesArchived.keySet();
-
- assertEquals( 1, files.size() );
- }
-
- public void testAssemblyDirectoryWithAppendAssemblyIdAsFalse()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml" );
-
- DirectoryMojo mojo = ( DirectoryMojo ) lookupMojo( "directory", testPom );
-
- assertNotNull( mojo );
-
- String classifier = ( String ) getVariableValueFromObject( mojo, "classifier" );
-
- String finalName = ( String ) getVariableValueFromObject( mojo, "finalName" );
-
- File outputDir = ( File ) getVariableValueFromObject( mojo, "outputDirectory" );
-
- MavenProject project = ( MavenProject ) getVariableValueFromObject( mojo, "executedProject" );
-
- Set artifacts = project.getArtifacts();
-
- mojo.execute();
-
- File dir = new File( outputDir, finalName + "-" + classifier );
-
- assertTrue( dir.exists() );
-
- Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
-
- Set files = filesArchived.keySet();
-
- for( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = ( Artifact ) iter.next();
-
- assertTrue( files.contains( artifact.getFile() ) );
- assertTrue( artifact.getFile().getName().endsWith( ".jar" ) );
- }
-
- assertTrue( "Test project is in archive", files.contains( project.getArtifact().getFile() ) );
- }
-
- public void testAssemblyDirectoryWithDependencySet()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory/dependency-set-plugin-config.xml" );
-
- DirectoryMojo mojo = ( DirectoryMojo ) lookupMojo( "directory", testPom );
-
- assertNotNull( mojo );
-
- MavenProject project = ( MavenProject ) getVariableValueFromObject( mojo, "executedProject" );
-
- Set artifacts = project.getArtifacts();
-
- mojo.execute();
-
- Map filesArchived = ArchiverManagerStub.archiverStub.getFiles();
-
- Set files = filesArchived.keySet();
-
- for( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = ( Artifact ) iter.next();
-
- assertTrue( files.contains( artifact.getFile() ) );
- assertTrue( artifact.getFile().getName().endsWith( ".jar" ) );
- }
-
- assertTrue( "Test project is in archive", files.contains( project.getArtifact().getFile() ) );
- }
-
- public void testAssemblyDirectoryToThrowNoSuchArchiverException()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "src/test/plugin-configs/directory/min-plugin-config-with-exceptions.xml" );
-
- DirectoryMojo mojo = ( DirectoryMojo ) lookupMojo( "directory", testPom );
-
- assertNotNull( mojo );
-
- try
- {
- mojo.execute();
-
- fail( "Failure Expected" );
- }
- catch( Exception e )
- {
- //expected
- }
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/UnpackMojoTest.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/UnpackMojoTest.java
deleted file mode 100644
index f5a3f80..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/UnpackMojoTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.assembly.mojos.UnpackMojo;
-import org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub;
-import org.apache.maven.plugin.assembly.stubs.UnArchiverWithException;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-
-import java.io.File;
-
-/**
- * @author Edwin Punzalan
- */
-public class UnpackMojoTest
- extends AbstractMojoTestCase
-{
- public void testMinConfiguration()
- throws Exception
- {
- executeMojo( "min-plugin-config.xml" );
- }
-
- public void testMinConfigurationAgainWithoutClean()
- throws Exception
- {
- executeMojo( "min-plugin-config.xml" );
- }
-
- public void testMinConfigurationWithReactorProjects()
- throws Exception
- {
- executeMojo( "with-reactor-projects-plugin-config.xml" );
- }
-
- public void testArchiverManagerException()
- throws Exception
- {
- try
- {
- UnpackMojo mojo = getMojo( "archiver-manager-exception-plugin-config.xml" );
-
- mojo.execute();
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
- String filename = project.getArtifact().getFile().getName();
- String dir = filename.substring( 0, filename.lastIndexOf( '.' ) );
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
- File unpackDir = new File( workDir, dir );
- File unpacked = new File( unpackDir, filename + ".extracted" );
-
- assertFalse( "Test extracted project artifact", unpacked.exists() );
- }
- catch ( NoSuchArchiverException e )
- {
- fail( "Expected exception in ArchiverManager should not fail the build" );
- }
- }
-
- public void testUnpackException()
- throws Exception
- {
- try
- {
- UnpackMojo mojo = getMojo( "unpack-exception-plugin-config.xml" );
-
- ArchiverManagerStub archiverManager = (ArchiverManagerStub) getVariableValueFromObject( mojo, "archiverManager" );
- archiverManager.setUnArchiver( new UnArchiverWithException() );
-
- mojo.execute();
-
- fail( "Expected exception not thrown" );
- }
- catch ( MojoExecutionException e )
- {
- //expected
- }
- }
-
- public UnpackMojo getMojo( String pluginXml )
- throws Exception
- {
- return (UnpackMojo) lookupMojo( "unpack", PlexusTestCase.getBasedir() +
- "/src/test/plugin-configs/unpack/" + pluginXml );
- }
-
- public void executeMojo( String pluginXml )
- throws Exception
- {
- UnpackMojo mojo = getMojo( pluginXml );
-
- mojo.execute();
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
- String filename = project.getArtifact().getFile().getName();
- String dir = filename.substring( 0, filename.lastIndexOf( '.' ) );
- File workDir = (File) getVariableValueFromObject( mojo, "workDirectory" );
- File unpackDir = new File( workDir, dir );
- File unpacked = new File( unpackDir, filename + ".extracted" );
-
- assertTrue( "Test extracted project artifact", unpacked.exists() );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java
deleted file mode 100644
index cda9572..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.apache.maven.plugin.assembly.interpolation;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.io.DefaultAssemblyReader;
-import org.apache.maven.plugin.assembly.utils.InterpolationConstants;
-import org.apache.maven.plugins.assembly.model.Assembly;
-import org.apache.maven.plugins.assembly.model.DependencySet;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.codehaus.plexus.interpolation.immutable.FixedStringSearchInterpolator;
-
-public class AssemblyInterpolator2Test
- extends TestCase
-{
-
- public void testDependencyOutputFileNameMappingsAreNotInterpolated()
- throws IOException, AssemblyInterpolationException
- {
- AssemblyInterpolator interpolator = new AssemblyInterpolator();
-
- Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
-
- Assembly assembly = new Assembly();
-
- DependencySet set = new DependencySet();
- set.setOutputFileNameMapping( "${artifact.artifactId}.${artifact.extension}" );
-
- assembly.addDependencySet( set );
-
- Assembly outputAssembly = interpolator.interpolate( assembly, model, Collections.EMPTY_MAP,
- DefaultAssemblyReader.create(model));
-
- List outputDependencySets = outputAssembly.getDependencySets();
- assertEquals( 1, outputDependencySets.size() );
-
- DependencySet outputSet = (DependencySet) outputDependencySets.get( 0 );
-
- assertEquals( set.getOutputFileNameMapping(), outputSet.getOutputFileNameMapping() );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
deleted file mode 100644
index ba046ba..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-
-import java.io.File;
-
-/**
- * @author Edwin Punzalan
- */
-public class ArchiverManagerStub
- implements ArchiverManager
-{
- public static Archiver archiverStub;
-
- public static UnArchiverStub unArchiverStub;
-
- public ArchiverManagerStub()
- {
- archiverStub = null;
-
- unArchiverStub = null;
- }
-
- public Archiver getArchiver( String string )
- throws NoSuchArchiverException
- {
- if ( archiverStub == null )
- {
- if( "dir".equals( string ) )
- {
- archiverStub = new DirectoryArchiverStub();
- }
- else if ( "tar".equals( string ) )
- {
- archiverStub = new TarArchiverStub();
- }
- else if ( "war".equals( string ) )
- {
- archiverStub = new WarArchiverStub();
- }
- else if ( "zip".equals( string ) ||
- "jar".equals( string ) )
- {
- archiverStub = new JarArchiverStub();
- }
- else
- {
- throw new NoSuchArchiverException( string );
- }
- }
-
- return archiverStub;
- }
-
- public void setArchiver( JarArchiverStub archiver )
- {
- archiverStub = archiver;
- }
-
- public UnArchiver getUnArchiver( String string )
- throws NoSuchArchiverException
- {
- if ( unArchiverStub == null )
- {
- if ( "jar".equals( string ) )
- {
- unArchiverStub = new SignedUnArchiver();
- }
- else
- {
- unArchiverStub = new UnArchiverStub();
- }
- }
-
- return unArchiverStub;
- }
-
- public UnArchiver getUnArchiver( File file )
- throws NoSuchArchiverException
- {
- if ( unArchiverStub == null )
- {
- String filename = file.getName();
-
- unArchiverStub = (UnArchiverStub) getUnArchiver( filename.substring( filename.lastIndexOf( '.' ) + 1 ) );
- }
-
- return unArchiverStub;
- }
-
- public Archiver getArchiver( File string )
- throws NoSuchArchiverException
- {
- if ( archiverStub == null )
- {
- archiverStub = new JarArchiverStub();
- }
-
- return archiverStub;
- }
- public void setUnArchiver( UnArchiverStub unArchiver )
- {
- unArchiverStub = unArchiver;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java
deleted file mode 100644
index 406c516..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-import java.io.File;
-
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Edwin Punzalan
- */
-public class ArchiverManagerWithExceptionStub
- extends ArchiverManagerStub
-{
- public UnArchiver getUnArchiver( String string )
- throws NoSuchArchiverException
- {
- throw new NoSuchArchiverException( "Expected exception" );
- }
-
- public Archiver getArchiver( String string )
- throws NoSuchArchiverException
- {
- throw new NoSuchArchiverException( "Expected exception" );
- }
-
- public UnArchiver getUnArchiver( File string )
- throws NoSuchArchiverException
- {
- throw new NoSuchArchiverException( "Expected exception" );
- }
-
- public Archiver getArchiver( File string )
- throws NoSuchArchiverException
- {
- throw new NoSuchArchiverException( "Expected exception" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java
deleted file mode 100644
index 78e163c..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.plexus.PlexusTestCase;
-
-import java.io.File;
-
-/**
- * @author Edwin Punzalan
- */
-public class ArtifactStub
- extends DefaultArtifact
-{
- public ArtifactStub( String groupId, String artifactId, String version, String packaging, String scope )
- {
- this( groupId, artifactId, version, packaging, null, scope );
- }
-
- public ArtifactStub( String groupId, String artifactId, String version, String packaging, String classifier, String scope )
- {
- super( groupId, artifactId, VersionRange.createFromVersion( version ), scope, packaging,
- classifier, new DefaultArtifactHandler( packaging ), false );
- }
-
- public File getFile()
- {
- return new File( PlexusTestCase.getBasedir() + "/target/local-repo", getArtifactId() + "-" + getVersion() + "." + getType() )
- {
- public long lastModified()
- {
- return System.currentTimeMillis();
- }
- };
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
deleted file mode 100644
index 637f210..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Build;
-import org.codehaus.plexus.PlexusTestCase;
-
-import java.util.Set;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.List;
-import java.io.File;
-
-/**
- * @author Edwin Punzalan
- */
-public class AssemblyMavenProjectStub
- extends MavenProjectStub
-{
- private String groupId, artifactId, version;
-
- private Artifact artifact;
-
- private Set artifacts;
-
- private Model model;
-
- private File basedir;
-
- public Build getBuild()
- {
- return model.getBuild();
- }
-
- public List getRemoteArtifactRepositories()
- {
- ArtifactRepository repository = new DefaultArtifactRepository( "central",
- "file://" + PlexusTestCase.getBasedir() + "/src/test/remote-repo",
- new DefaultRepositoryLayout() );
-
- return Collections.singletonList( repository );
- }
-
- public AssemblyMavenProjectStub()
- {
- groupId = "assembly";
- artifactId = "test-project";
- version = "1.0";
- }
-
- public Set getDependencyArtifacts()
- {
- return Collections.singleton(
- new DefaultArtifact( "assembly", "dependency-artifact", VersionRange.createFromVersion( "1.0" ),
- Artifact.SCOPE_COMPILE, "jar", null, new DefaultArtifactHandler( "jar" ), false )
- );
- }
-
- public File getBasedir()
- {
- if ( basedir == null )
- {
- basedir = new File( PlexusTestCase.getBasedir() );
- }
-
- return basedir;
- }
-
- public Artifact getArtifact()
- {
- if ( artifact == null )
- {
- artifact = new ArtifactStub( groupId, artifactId, version, "jar", Artifact.SCOPE_COMPILE );
- }
-
- return artifact;
- }
-
- public Model getModel()
- {
- if ( model == null )
- {
- model = new Model();
-
- model.setProperties( new Properties() );
-
- model.setGroupId( getGroupId() );
-
- model.setArtifactId( getArtifactId() );
-
- model.setVersion( getVersion() );
-
- Build build = new Build();
- build.setFinalName( getArtifactId() + "-" + getVersion() );
- model.setBuild( build );
- }
-
- return model;
- }
-
- public Set getArtifacts()
- {
- if ( artifacts == null )
- {
- artifacts = Collections.EMPTY_SET;
- }
-
- return artifacts;
- }
-
- public void setArtifacts( Set artifacts )
- {
- this.artifacts = artifacts;
- }
-
- public Properties getProperties()
- {
- return new Properties();
- }
-
- public String getGroupId()
- {
- return groupId;
- }
-
- public void setGroupId( String groupId )
- {
- this.groupId = groupId;
- }
-
- public String getArtifactId()
- {
- return artifactId;
- }
-
- public void setArtifactId( String artifactId )
- {
- this.artifactId = artifactId;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion( String version )
- {
- this.version = version;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java
deleted file mode 100644
index 47aa10d..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-import org.codehaus.plexus.archiver.ArchiverException;
-
-import java.io.IOException;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Allan Ramirez
- */
-public class DirectoryArchiverStub
- extends JarArchiverStub
-{
- public void createArchive()
- throws ArchiverException, IOException
- {
- getDestFile().mkdirs();
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java
deleted file mode 100644
index b4aa2a2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.archiver.jar.Manifest;
-import org.codehaus.plexus.archiver.jar.ManifestException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Edwin Punzalan
- */
-public class JarArchiverStub
- extends JarArchiver
-{
- private Map files = new HashMap();
-
- private File destFile;
-
- private int fileMode = 0;
-
- private int dirMode = 0;
-
- private boolean includeEmptyDirs = false;
-
- private Manifest manifest;
-
- public void createArchive()
- throws ArchiverException, IOException
- {
- destFile.getParentFile().mkdirs();
- destFile.delete();
-
- if ( !destFile.createNewFile() )
- {
- throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() );
- }
- }
-
- public void addDirectory( File file )
- throws ArchiverException
- {
- addDirectory( file, "" );
- }
-
- public void addDirectory( File file, String string )
- throws ArchiverException
- {
- addDirectory( file, string, null, null );
- }
-
- public void addDirectory( File file, String[] strings, String[] strings1 )
- throws ArchiverException
- {
- addDirectory( file, file.getName(), strings, strings1 );
- }
-
- public void addDirectory( File file, String string, String[] includes, String[] excludes )
- throws ArchiverException
- {
- System.out.println( "Adding dir " + file.getPath() );
-
- files.put( file, new ArchiverFile( file, string, includes, excludes ) );
- }
-
- public void addFile( File file, String string )
- throws ArchiverException
- {
- addFile( file, string, 0 );
- }
-
- public void addFile( File file, String string, int i )
- throws ArchiverException
- {
- System.out.println( "Adding file " + file.getPath() );
-
- ArchiverFile archiverFile = new ArchiverFile( file, string, null, null );
-
- archiverFile.setFileMode( i );
-
- files.put( file, archiverFile );
- }
-
- public File getDestFile()
- {
- return destFile;
- }
-
- public void setDestFile( File file )
- {
- destFile = file;
- }
-
- public void setDefaultFileMode( int i )
- {
- fileMode = i;
- }
-
- public int getDefaultFileMode()
- {
- return fileMode;
- }
-
- public void setDefaultDirectoryMode( int i )
- {
- dirMode = i;
- }
-
- public int getDefaultDirectoryMode()
- {
- return dirMode;
- }
-
- public boolean getIncludeEmptyDirs()
- {
- return includeEmptyDirs;
- }
-
- public void setIncludeEmptyDirs( boolean b )
- {
- includeEmptyDirs = b;
- }
-
- public Map getFiles()
- {
- return files;
- }
-
- public void addConfiguredManifest( Manifest newManifest )
- throws ManifestException
- {
- manifest = newManifest;
- }
-
- public Manifest getManifest()
- {
- return manifest;
- }
-
- public class ArchiverFile
- {
- private File file;
-
- private String outputName;
-
- private String[] includes, excludes;
-
- private int fileMode;
-
- private ArchiverFile( File file, String outputName, String[] includes, String[] excludes )
- {
- this.file = file;
- this.outputName = outputName;
- this.includes = includes;
- this.excludes = excludes;
- }
-
- public File getFile()
- {
- return file;
- }
-
- public void setFile( File file )
- {
- this.file = file;
- }
-
- public String getOutputName()
- {
- return outputName;
- }
-
- public void setOutputName( String outputName )
- {
- this.outputName = outputName;
- }
-
- public String[] getIncludes()
- {
- return includes;
- }
-
- public void setIncludes( String[] includes )
- {
- this.includes = includes;
- }
-
- public String[] getExcludes()
- {
- return excludes;
- }
-
- public void setExcludes( String[] excludes )
- {
- this.excludes = excludes;
- }
-
- public int getFileMode()
- {
- return fileMode;
- }
-
- public void setFileMode( int fileMode )
- {
- this.fileMode = fileMode;
- }
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java
deleted file mode 100644
index 6b3cd92..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-import org.apache.maven.artifact.Artifact;
-
-import java.util.Set;
-import java.util.HashSet;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Edwin Punzalan
- */
-public class MavenProjectWithArtifactsStub
- extends AssemblyMavenProjectStub
-{
- public MavenProjectWithArtifactsStub()
- {
- Set artifacts = new HashSet();
-
- artifacts.add( new ArtifactStub( "assembly", "dependency-artifact1", "1.0", "jar", Artifact.SCOPE_COMPILE ) );
- artifacts.add( new ArtifactStub( "assembly", "dependency-artifact2", "1.0", "jar", Artifact.SCOPE_RUNTIME ) );
- artifacts.add( new ArtifactStub( "assembly", "dependency-artifact3", "1.0", "jar", Artifact.SCOPE_TEST ) );
-
- setArtifacts( artifacts );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithDependencyClassifierStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithDependencyClassifierStub.java
deleted file mode 100644
index 668fdf8..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithDependencyClassifierStub.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-import org.apache.maven.artifact.Artifact;
-
-import java.util.Set;
-import java.util.HashSet;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Edwin Punzalan
- */
-public class MavenProjectWithDependencyClassifierStub
- extends MavenProjectWithArtifactsStub
-{
- public MavenProjectWithDependencyClassifierStub()
- {
- Set artifacts = new HashSet();
-
- artifacts.add( new ArtifactStub( "assembly", "dependency-artifact1", "1.0",
- "jar", "classifier", Artifact.SCOPE_COMPILE ) );
- artifacts.add( new ArtifactStub( "assembly", "dependency-artifact2", "1.0", "jar", Artifact.SCOPE_RUNTIME ) );
- artifacts.add( new ArtifactStub( "assembly", "dependency-artifact3", "1.0", "jar", Artifact.SCOPE_TEST ) );
-
- setArtifacts( artifacts );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java
deleted file mode 100644
index d5c9990..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Reporting;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.FileUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * @author Edwin Punzalan
- */
-public class ReactorMavenProjectStub
- extends MavenProjectStub
-{
- public static List reactorProjects = new ArrayList();
-
- private MavenProject parent;
-
- private Model model;
-
- private File basedir;
-
- public ReactorMavenProjectStub()
- {
- this( "jar" );
- }
-
- public ReactorMavenProjectStub( String packaging )
- {
- super();
-
- reactorProjects.add( this );
-
- setGroupId( "assembly" );
- setArtifactId( "reactor-project-" + reactorProjects.size() );
- setVersion( "1.0" );
- setPackaging( packaging );
-
- setArtifact( new ArtifactStub( getGroupId(), getArtifactId(),
- getVersion(), getPackaging(), Artifact.SCOPE_COMPILE ) );
- }
-
- public String getId()
- {
- return getGroupId() + ":" + getArtifactId() + ":" + getVersion() + ":" + getPackaging();
- }
-
- public Set getArtifacts()
- {
- Set artifacts = new HashSet();
-
- artifacts.add( new ArtifactStub( "assembly", "reactor-dependency", "1.0", "jar", Artifact.SCOPE_COMPILE ) );
-
- return artifacts;
- }
-
- public File getBasedir()
- {
- File basedir = super.getBasedir();
-
- if ( parent != null )
- {
- basedir = parent.getBasedir();
- }
-
- return new File( basedir, getArtifactId() );
- }
-
- public Reporting getReporting()
- {
- return model.getReporting();
- }
-
- public Model getModel()
- {
- if ( model == null )
- {
- model = new Model();
-
- model.setGroupId( getGroupId() );
-
- model.setArtifactId( getArtifactId() );
-
- model.setVersion( getVersion() );
-
- model.setPackaging( getPackaging() );
-
- model.setProperties( new Properties() );
-
- Build build = new Build();
- build.setFinalName( getArtifactId() + "-" + getVersion() + "." + getPackaging() );
-
- if ( parent != null )
- {
- build.setDirectory( parent.getBasedir().getAbsolutePath() + "/" + getArtifactId() + "/target" );
- FileUtils.mkdir( build.getDirectory() );
-
- build.setOutputDirectory( parent.getBasedir().getAbsolutePath() + "/" +
- getArtifactId() + "/target/classes" );
- FileUtils.mkdir( build.getOutputDirectory() );
-
- build.setTestOutputDirectory( parent.getBasedir().getAbsolutePath() + "/" +
- getArtifactId() + "/target/test-classes" );
- FileUtils.mkdir( build.getTestOutputDirectory() );
-
- Reporting reporting = new Reporting();
- reporting.setOutputDirectory( parent.getBasedir().getAbsolutePath() + "/" +
- getArtifactId() + "/target/site" );
- FileUtils.mkdir( reporting.getOutputDirectory() );
-
- model.setReporting( reporting );
- }
-
- model.setBuild( build );
- }
-
- return model;
- }
-
- public Build getBuild()
- {
- return getModel().getBuild();
- }
-
- public void setParent( MavenProject parent )
- {
- this.parent = parent;
- }
-
- public MavenProject getParent()
- {
- return parent;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/SignedUnArchiver.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/SignedUnArchiver.java
deleted file mode 100644
index 18ad86d..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/SignedUnArchiver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-import org.codehaus.plexus.archiver.ArchiverException;
-
-import java.io.IOException;
-import java.io.File;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Edwin Punzalan
- */
-public class SignedUnArchiver
- extends UnArchiverStub
-{
- public void extract()
- throws ArchiverException, IOException
- {
- super.extract();
-
- File signatureDir = new File( getDestDirectory(), "META-INF" );
- signatureDir.mkdirs();
-
- File signatureFile = new File( signatureDir, "security-file.RSA" );
- signatureFile.createNewFile();
-
- signatureFile = new File( signatureDir, "security-file.DSA" );
- signatureFile.createNewFile();
-
- signatureFile = new File( signatureDir, "security-file.SF" );
- signatureFile.createNewFile();
-
- signatureFile = new File( signatureDir, "security-file.rsa" );
- signatureFile.createNewFile();
-
- signatureFile = new File( signatureDir, "security-file.dsa" );
- signatureFile.createNewFile();
-
- signatureFile = new File( signatureDir, "security-file.sf" );
- signatureFile.createNewFile();
-
- signatureFile = new File( signatureDir, "non-security-file" );
- signatureFile.createNewFile();
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java
deleted file mode 100644
index a58ec68..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.codehaus.plexus.archiver.tar.TarArchiver;
-import org.codehaus.plexus.archiver.tar.TarLongFileMode;
-import org.codehaus.plexus.archiver.ArchiverException;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Edwin Punzalan
- */
-public class TarArchiverStub
- extends TarArchiver
-{
- private Map files = new HashMap();
-
- private File destFile;
-
- private int fileMode = 0;
-
- private int dirMode = 0;
-
- private boolean includeEmptyDirs = false;
-
- private TarCompressionMethod tarCompressionMethod;
-
- private TarLongFileMode longFileMode;
-
- public void setLongfile( TarLongFileMode mode )
- {
- this.longFileMode = mode;
- }
-
- public void setCompression( TarCompressionMethod mode )
- {
- tarCompressionMethod = mode;
- }
-
- public void createArchive()
- throws ArchiverException, IOException
- {
- destFile.getParentFile().mkdirs();
- destFile.delete();
-
- if ( !destFile.createNewFile() )
- {
- throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() );
- }
- }
-
- public void addDirectory( File file )
- throws ArchiverException
- {
- addDirectory( file, "" );
- }
-
- public void addDirectory( File file, String string )
- throws ArchiverException
- {
- addDirectory( file, string, null, null );
- }
-
- public void addDirectory( File file, String[] strings, String[] strings1 )
- throws ArchiverException
- {
- addDirectory( file, file.getName(), strings, strings1 );
- }
-
- public void addDirectory( File file, String string, String[] includes, String[] excludes )
- throws ArchiverException
- {
- System.out.println( "Adding dir " + file.getPath() );
-
- files.put( file, new ArchiverFile( file, string, includes, excludes ) );
- }
-
- public void addFile( File file, String string )
- throws ArchiverException
- {
- addFile( file, string, 0 );
- }
-
- public void addFile( File file, String string, int i )
- throws ArchiverException
- {
- System.out.println( "Adding file " + file.getPath() );
-
- ArchiverFile archiverFile = new ArchiverFile( file, string, null, null );
-
- archiverFile.setFileMode( i );
-
- files.put( file, archiverFile );
- }
-
- public File getDestFile()
- {
- return destFile;
- }
-
- public void setDestFile( File file )
- {
- destFile = file;
- }
-
- public void setDefaultFileMode( int i )
- {
- fileMode = i;
- }
-
- public int getDefaultFileMode()
- {
- return fileMode;
- }
-
- public void setDefaultDirectoryMode( int i )
- {
- dirMode = i;
- }
-
- public int getDefaultDirectoryMode()
- {
- return dirMode;
- }
-
- public boolean getIncludeEmptyDirs()
- {
- return includeEmptyDirs;
- }
-
- public void setIncludeEmptyDirs( boolean b )
- {
- includeEmptyDirs = b;
- }
-
- public Map getFiles()
- {
- return files;
- }
-
- public class ArchiverFile
- {
- private File file;
-
- private String outputName;
-
- private String[] includes, excludes;
-
- private int fileMode;
-
- private ArchiverFile( File file, String outputName, String[] includes, String[] excludes )
- {
- this.file = file;
- this.outputName = outputName;
- this.includes = includes;
- this.excludes = excludes;
- }
-
- public File getFile()
- {
- return file;
- }
-
- public void setFile( File file )
- {
- this.file = file;
- }
-
- public String getOutputName()
- {
- return outputName;
- }
-
- public void setOutputName( String outputName )
- {
- this.outputName = outputName;
- }
-
- public String[] getIncludes()
- {
- return includes;
- }
-
- public void setIncludes( String[] includes )
- {
- this.includes = includes;
- }
-
- public String[] getExcludes()
- {
- return excludes;
- }
-
- public void setExcludes( String[] excludes )
- {
- this.excludes = excludes;
- }
-
- public int getFileMode()
- {
- return fileMode;
- }
-
- public void setFileMode( int fileMode )
- {
- this.fileMode = fileMode;
- }
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java
deleted file mode 100644
index 6c0fb5f..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Edwin Punzalan
- */
-public class UnArchiverStub
- implements UnArchiver
-{
- private File sourceFile, destDir;
-
- public void extract()
- throws ArchiverException, IOException
- {
- File extractedFile = new File( getDestDirectory(), getSourceFile().getName() + ".extracted" );
-
- if ( !extractedFile.exists() )
- {
- extractedFile.createNewFile();
- }
- }
-
- public File getDestDirectory()
- {
- return destDir;
- }
-
- public void setDestDirectory( File file )
- {
- destDir = file;
- }
-
- public File getDestFile()
- {
- return null;
- }
-
- public void setDestFile( File file )
- {
- }
-
- public File getSourceFile()
- {
- return sourceFile;
- }
-
- public void setSourceFile( File file )
- {
- this.sourceFile = file;
- }
-
- public void setOverwrite( boolean b )
- {
- }
-//
-// public List getUnpackedFiles()
-// {
-// return unpackedFiles;
-// }
-//
-// public class UnpackedArchive
-// {
-// private File sourceFile, destDirectory;
-//
-// private UnpackedArchive( File sourceFile, File destDirectory )
-// {
-// this.sourceFile = sourceFile;
-// this.destDirectory = destDirectory;
-// }
-//
-// public File getSourceFile()
-// {
-// return sourceFile;
-// }
-//
-// public File getDestDirectory()
-// {
-// return destDirectory;
-// }
-//
-// public boolean equals( Object obj )
-// {
-// boolean equal = false;
-//
-// if ( obj instanceof UnpackedArchive )
-// {
-// UnpackedArchive unpacked = (UnpackedArchive) obj;
-// if ( unpacked.getSourceFile().equals( getSourceFile() ) &&
-// unpacked.getDestDirectory().equals( getDestDirectory() ) )
-// {
-// equal = true;
-// }
-// }
-//
-// return equal;
-// }
-// }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java
deleted file mode 100644
index fd423c3..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-import org.codehaus.plexus.archiver.ArchiverException;
-
-import java.io.IOException;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Edwin Punzalan
- */
-public class UnArchiverWithException
- extends UnArchiverStub
-{
- public void extract()
- throws ArchiverException, IOException
- {
- throw new ArchiverException( "exception explicitly thrown for testing" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java b/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java
deleted file mode 100644
index a968b91..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.apache.maven.plugin.assembly.stubs;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.codehaus.plexus.archiver.war.WarArchiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Edwin Punzalan
- */
-public class WarArchiverStub
- extends WarArchiver
-{
- private Map files = new HashMap();
-
- private File destFile;
-
- private int fileMode = 0;
-
- private int dirMode = 0;
-
- private boolean includeEmptyDirs = false;
-
- private boolean ignoreWebxml = false;
-
- public void createArchive()
- throws ArchiverException, IOException
- {
- destFile.getParentFile().mkdirs();
- destFile.delete();
-
- if ( !destFile.createNewFile() )
- {
- throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() );
- }
- }
-
- public void addDirectory( File file )
- throws ArchiverException
- {
- addDirectory( file, "" );
- }
-
- public void addDirectory( File file, String string )
- throws ArchiverException
- {
- addDirectory( file, string, null, null );
- }
-
- public void addDirectory( File file, String[] strings, String[] strings1 )
- throws ArchiverException
- {
- addDirectory( file, file.getName(), strings, strings1 );
- }
-
- public void addDirectory( File file, String string, String[] includes, String[] excludes )
- throws ArchiverException
- {
- System.out.println( "Adding dir " + file.getPath() );
-
- files.put( file, new ArchiverFile( file, string, includes, excludes ) );
- }
-
- public void addFile( File file, String string )
- throws ArchiverException
- {
- addFile( file, string, 0 );
- }
-
- public void addFile( File file, String string, int i )
- throws ArchiverException
- {
- System.out.println( "Adding file " + file.getPath() );
-
- ArchiverFile archiverFile = new ArchiverFile( file, string, null, null );
-
- archiverFile.setFileMode( i );
-
- files.put( file, archiverFile );
- }
-
- public File getDestFile()
- {
- return destFile;
- }
-
- public void setDestFile( File file )
- {
- destFile = file;
- }
-
- public void setDefaultFileMode( int i )
- {
- fileMode = i;
- }
-
- public int getDefaultFileMode()
- {
- return fileMode;
- }
-
- public void setDefaultDirectoryMode( int i )
- {
- dirMode = i;
- }
-
- public int getDefaultDirectoryMode()
- {
- return dirMode;
- }
-
- public boolean getIncludeEmptyDirs()
- {
- return includeEmptyDirs;
- }
-
- public void setIncludeEmptyDirs( boolean b )
- {
- includeEmptyDirs = b;
- }
-
- public Map getFiles()
- {
- return files;
- }
-
- public void setIgnoreWebxml( boolean ignore )
- {
- this.ignoreWebxml = ignore;
- }
-
- public boolean getIgnoreWebxml()
- {
- return ignoreWebxml;
- }
-
- public class ArchiverFile
- {
- private File file;
-
- private String outputName;
-
- private String[] includes, excludes;
-
- private int fileMode;
-
- private ArchiverFile( File file, String outputName, String[] includes, String[] excludes )
- {
- this.file = file;
- this.outputName = outputName;
- this.includes = includes;
- this.excludes = excludes;
- }
-
- public File getFile()
- {
- return file;
- }
-
- public void setFile( File file )
- {
- this.file = file;
- }
-
- public String getOutputName()
- {
- return outputName;
- }
-
- public void setOutputName( String outputName )
- {
- this.outputName = outputName;
- }
-
- public String[] getIncludes()
- {
- return includes;
- }
-
- public void setIncludes( String[] includes )
- {
- this.includes = includes;
- }
-
- public String[] getExcludes()
- {
- return excludes;
- }
-
- public void setExcludes( String[] excludes )
- {
- this.excludes = excludes;
- }
-
- public int getFileMode()
- {
- return fileMode;
- }
-
- public void setFileMode( int fileMode )
- {
- this.fileMode = fileMode;
- }
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/MASSEMBLY-98-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/MASSEMBLY-98-plugin-config.xml
deleted file mode 100644
index ea3ebf3..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/MASSEMBLY-98-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/MASSEMBLY-98/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/MASSEMBLY-98/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>MASSEMBLY-98</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/MASSEMBLY-98/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/MASSEMBLY-98/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml
deleted file mode 100644
index e547c5f..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/NoSuchArchiverException/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/NoSuchArchiverException/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/NoSuchArchiverException.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/NoSuchArchiverException/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/NoSuchArchiverException/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/classifier-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/classifier-plugin-config.xml
deleted file mode 100644
index 33623a6..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/classifier-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/classifier/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/classifier/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier>test-harness</classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorId>simple</descriptorId>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/classifier/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/classifier/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/component-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/component-plugin-config.xml
deleted file mode 100644
index 3746c94..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/component-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/component/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/component/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>empty</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/component/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/component/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml
deleted file mode 100644
index 2ce10d2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-default/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-default/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-default</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-default/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-default/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-excludes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-excludes-plugin-config.xml
deleted file mode 100644
index 386a240..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-excludes-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-excludes/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-excludes/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-excludes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-excludes/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-excludes/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-and-classifier-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-and-classifier-plugin-config.xml
deleted file mode 100644
index 147b7c3..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-and-classifier-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithDependencyClassifierStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithDependencyClassifierStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-filename-mapping-and-classifier</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml
deleted file mode 100644
index 300237c..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-filename-mapping</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-filename-mapping/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-includes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-includes-plugin-config.xml
deleted file mode 100644
index 53c075a..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-includes-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-includes/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-includes/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-includes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-includes/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-includes/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml
deleted file mode 100644
index 3db2228..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-scoped/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-scoped/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-scoped</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-scoped/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-scoped/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml
deleted file mode 100644
index aa39b89..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/depSet-unpack/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/depSet-unpack/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-unpack</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/depSet-unpack/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/depSet-unpack/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/descriptorSourceDirectory-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/descriptorSourceDirectory-plugin-config.xml
deleted file mode 100644
index c75cbdc..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/descriptorSourceDirectory-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/descriptorSourceDirectory/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/descriptorSourceDirectory/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorSourceDirectory>${basedir}/src/test/resources/assemblies/descriptorSourceDirectory</descriptorSourceDirectory>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/descriptorSourceDirectory/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/descriptorSourceDirectory/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-fileMode-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-fileMode-plugin-config.xml
deleted file mode 100644
index 9740616..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-fileMode-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-fileMode/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileItem-fileMode/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileItem-fileMode</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileItem-fileMode/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-fileMode/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml
deleted file mode 100644
index a926314..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-filter-file/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileItem-filter-file/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileItem-filter-file</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <filters>
- <filter>target/test-classes/fileSet/filterFile.properties</filter>
- </filters>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileItem-filter-file/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-filter-file/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-filtered-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-filtered-plugin-config.xml
deleted file mode 100644
index 1e4f867..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-filtered-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-filtered/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileItem-filtered/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileItem-filtered</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileItem-filtered/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-filtered/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml
deleted file mode 100644
index 6c0f0f4..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-lineEndings/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileItem-lineEndings/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileItem-lineEndings</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileItem-lineEndings/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-lineEndings/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-output-name-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-output-name-plugin-config.xml
deleted file mode 100644
index 950921d..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-output-name-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-output-name/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileItem-output-name/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileItem-output-name</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileItem-output-name/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-output-name/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-plugin-config.xml
deleted file mode 100644
index c41cab1..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileItem-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileItem/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileItem/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileItem</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileItem/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileItem/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml
deleted file mode 100644
index d590ebb..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet-archiveBaseDirectory</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- <archiveBaseDirectory>${basedir}/target/test-classes</archiveBaseDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml
deleted file mode 100644
index b60d074..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2005 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub"/>
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"/>
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"/>
- <descriptorRefs>
- <descriptorRef>fileSet-crlf-lineEndings</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml
deleted file mode 100644
index 7de3f1b..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- ~ Copyright 2001-2005 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub"/>
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"/>
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"/>
- <descriptorRefs>
- <descriptorRef>fileSet-doesnt-exist</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- <archiveBaseDirectory>${basedir}/target/test-classes</archiveBaseDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml
deleted file mode 100644
index c77dfab..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet-dos-lineEndings</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml
deleted file mode 100644
index b60cef4..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-include-exclude/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-include-exclude/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet-includes-excludes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-include-exclude/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-include-exclude/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml
deleted file mode 100644
index 1fdc055..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet-lf-lineEndings</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml
deleted file mode 100644
index d09c350..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- ~ Copyright 2001-2005 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>
- ${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub"/>
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"/>
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"/>
- <descriptorRefs>
- <descriptorRef>fileSet-lineEndings-exception</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-no-directory-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-no-directory-plugin-config.xml
deleted file mode 100644
index c95e87c..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-no-directory-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-no-directory/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-no-directory/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet-no-directory</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-no-directory/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-no-directory/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml
deleted file mode 100644
index 47f28e2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml
deleted file mode 100644
index f1e02a3..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>fileSet-unix-lineEndings</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/includeSite-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/includeSite-plugin-config.xml
deleted file mode 100644
index 6397c58..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/includeSite-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/includeSite/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/includeSite/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/includeSite/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/includeSite/site</siteDirectory>
- <includeSite>true</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifest-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifest-plugin-config.xml
deleted file mode 100644
index 1a1e99c..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifest-plugin-config.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/manifestFile/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/manifestFile/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/manifestFile/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/manifestFile/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- <archive>
- <manifest>
- <mainClass>org.apache.sample.main</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml
deleted file mode 100644
index 4808be2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- <archive>
- <manifestFile>${basedir}/target/test-harness/assembly/manifestFile/no-such-manifest.file</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifestFile-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifestFile-plugin-config.xml
deleted file mode 100644
index ed154f0..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/manifestFile-plugin-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/manifestFile/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/manifestFile/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/manifestFile/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/manifestFile/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- <archive>
- <manifestFile>${basedir}/target/test-harness/assembly/manifestFile/test-manifest.file</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml
deleted file mode 100644
index a65c632..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/min/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/min/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/min/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/min/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
deleted file mode 100644
index f5db522..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-excludes/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/moduleSet-excludes/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
- <basedir>${basedir}/target/test-harness/assembly/moduleSet-excludes</basedir>
- </executedProject>
- <descriptorRefs>
- <descriptorRef>moduleSet-excludes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/moduleSet-excludes/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-excludes/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
deleted file mode 100644
index 92c740c..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
- <basedir>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies</basedir>
- </executedProject>
- <descriptorRefs>
- <descriptorRef>moduleSet-include-dependencies</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-includes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
deleted file mode 100644
index f146ba5..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-includes-plugin-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-includes/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/moduleSet-includes/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
- <basedir>${basedir}/target/test-harness/assembly/moduleSet-includes</basedir>
- </executedProject>
- <descriptorRefs>
- <descriptorRef>moduleSet-includes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/moduleSet-includes/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-includes/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
deleted file mode 100644
index 6d26ca4..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
- <basedir>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies</basedir>
- </executedProject>
- <descriptorRefs>
- <descriptorRef>moduleSet-packed-including-dependencies</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-packed-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
deleted file mode 100644
index 4f572e3..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
- <basedir>${basedir}/target/test-harness/assembly/moduleSet-packed</basedir>
- </executedProject>
- <descriptorRefs>
- <descriptorRef>moduleSet-packed</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/moduleSet-packed/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-plugin-config.xml
deleted file mode 100644
index ef65163..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/moduleSet-plugin-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/moduleSet/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/moduleSet/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
- <basedir>${basedir}/target/test-harness/assembly/moduleSet</basedir>
- </executedProject>
- <descriptorRefs>
- <descriptorRef>moduleSet</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/moduleSet/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/moduleSet/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/plexus-components-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/plexus-components-plugin-config.xml
deleted file mode 100644
index 8c011e9..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/plexus-components-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/plexus-components/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/plexus-components/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/plexus-components.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/plexus-components/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/plexus-components/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-excludes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-excludes-plugin-config.xml
deleted file mode 100644
index b285016..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-excludes-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>repository-groupVersionAlignment-excludes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-includes-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-includes-plugin-config.xml
deleted file mode 100644
index 890dd55..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-includes-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>repository-groupVersionAlignment-includes</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-plugin-config.xml
deleted file mode 100644
index c49e83a..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>repository-groupVersionAlignment</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-plugin-config.xml
deleted file mode 100644
index e64063a..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/repository/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/repository/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptors>
- <descriptor>${basedir}/src/test/resources/assemblies/repository.xml</descriptor>
- </descriptors>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/repository/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/repository/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-with-metadata-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-with-metadata-plugin-config.xml
deleted file mode 100644
index a9d8c80..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/repository-with-metadata-plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/repository-with-metadata/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/repository-with-metadata/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptorRefs>
- <descriptorRef>repository-with-metadata</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/repository-with-metadata/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/repository-with-metadata/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tar-bz2-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tar-bz2-plugin-config.xml
deleted file mode 100644
index c7bb8e2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tar-bz2-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/tar-bz2/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/tar-bz2/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/tar-bz2.xml</descriptor>
- <tarLongFileMode>fail</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/tar-bz2/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/tar-bz2/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tar-gz-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tar-gz-plugin-config.xml
deleted file mode 100644
index bf6bf78..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tar-gz-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/tar-gz/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/tar-gz/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/tar-gz.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/tar-gz/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/tar-gz/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tbz2-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tbz2-plugin-config.xml
deleted file mode 100644
index eb4ca77..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tbz2-plugin-config.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/tbz2/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/tbz2/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/tbz2.xml</descriptor>
- <tarLongFileMode>fail</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/tbz2/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/tbz2/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/tbz2/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/tbz2/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/tbz2.xml</descriptor>
- <tarLongFileMode>fail</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/tbz2/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/tbz2/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tgz-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tgz-plugin-config.xml
deleted file mode 100644
index 66118e6..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/tgz-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/tgz/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/tgz/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/tgz.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/tgz/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/tgz/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/war-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/war-plugin-config.xml
deleted file mode 100644
index 07e254a..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/assembly/war-plugin-config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/assembly/war/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/assembly/war/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/war.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/assembly/war/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/assembly/war/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/attached/depSet-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/attached/depSet-plugin-config.xml
deleted file mode 100644
index bd471e3..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/attached/depSet-plugin-config.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/attached/depSet/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/attached/depSet/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <descriptorRefs>
- <descriptorRef>dependencySet-default</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/attached/depSet/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/attached/depSet/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/attached/min-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/attached/min-plugin-config.xml
deleted file mode 100644
index 71b0ec0..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/attached/min-plugin-config.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/attached/min/target</outputDirectory>
- <finalName>assembly</finalName>
- <workDirectory>${basedir}/target/test-harness/attached/min/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <tarLongFileMode>warn</tarLongFileMode>
- <basedir>${basedir}</basedir>
- <tempRoot>${basedir}/target/test-harness/attached/min/archive-tmp</tempRoot>
- <siteDirectory>${basedir}/target/test-harness/attached/min/site</siteDirectory>
- <includeSite>false</includeSite>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml
deleted file mode 100644
index c332520..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <basedir>${basedir}</basedir>
- <project implementation="org.apache.maven.plugin.assembly.BasicAbstractAssemblyMojoFeaturesTest$TwoDependencyReactorProjectStub">
- <artifactId>packager</artifactId>
- <groupId>org.test</groupId>
- <version>0</version>
- <depOneArtifactId>test</depOneArtifactId>
- <depOneGroupId>org.test</depOneGroupId>
- <depOneVersion>1</depOneVersion>
- <depOneFile>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test.jar</depOneFile>
- <depTwoArtifactId>test2</depTwoArtifactId>
- <depTwoGroupId>org.test.2</depTwoGroupId>
- <depTwoVersion>2</depTwoVersion>
- <depTwoFile>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test2.jar</depTwoFile>
- </project>
- <!--
- <executedProject implementation="org.apache.maven.plugin.assembly.BasicAbstractAssemblyMojoFeaturesTest$TwoDependencyReactorProjectStub">
- <artifactId>packager</artifactId>
- <groupId>org.test</groupId>
- <version>0</version>
- <depOneArtifactId>test</depOneArtifactId>
- <depOneGroupId>org.test</depOneGroupId>
- <depOneVersion>1</depOneVersion>
- <depOneFile>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test.jar</depOneFile>
- <depTwoArtifactId>test2</depTwoArtifactId>
- <depTwoGroupId>org.test.2</depTwoGroupId>
- <depTwoVersion>2</depTwoVersion>
- <depTwoFile>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test2.jar</depTwoFile>
- </executedProject>
- -->
- <descriptors>
- <descriptor>${basedir}/src/test/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml</descriptor>
- </descriptors>
- <outputDirectory>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/target</outputDirectory>
- <finalName>basicAbstractAssemblyMojoFeaturesTest-ouputFileNameMapping</finalName>
- <workDirectory>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.BasicAbstractAssemblyMojoFeaturesTest$FileLoggingArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.BasicAbstractAssemblyMojoFeaturesTest$TwoDependencyReactorProjectStub">
- <artifactId>packager</artifactId>
- <groupId>org.test</groupId>
- <version>0</version>
- <depOneArtifactId>test</depOneArtifactId>
- <depOneGroupId>org.test</depOneGroupId>
- <depOneVersion>1</depOneVersion>
- <depOneFile>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test.jar</depOneFile>
- <depTwoArtifactId>test2</depTwoArtifactId>
- <depTwoGroupId>org.test.2</depTwoGroupId>
- <depTwoVersion>2</depTwoVersion>
- <depTwoFile>${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test2.jar</depTwoFile>
- </reactorProject>
- </reactorProjects>
- <classifier></classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml
deleted file mode 100644
index c86f050..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <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>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml
deleted file mode 100644
index bd29770..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <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>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml
deleted file mode 100644
index 5120040..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <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" />
- <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>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml
deleted file mode 100644
index 065f12c..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <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" />
- <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>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml
deleted file mode 100644
index 4ed5caf..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <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>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/min-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/min-plugin-config.xml
deleted file mode 100644
index fc2e6c6..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/directory/min-plugin-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <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" />
- <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>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml
deleted file mode 100644
index 139f5b1..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/unpack/archiver-manager-exception/target</outputDirectory>
- <finalName>unpack-min</finalName>
- <workDirectory>${basedir}/target/test-harness/unpack/archiver-manager-exception/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerWithExceptionStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml
deleted file mode 100644
index 97587d5..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/unpack/min/target</outputDirectory>
- <finalName>unpack-min</finalName>
- <workDirectory>${basedir}/target/test-harness/unpack/min/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml
deleted file mode 100644
index 87539dc..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/unpack/unpack-exception/target</outputDirectory>
- <finalName>unpack-min</finalName>
- <workDirectory>${basedir}/target/test-harness/unpack/unpack-exception/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects></reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml b/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml
deleted file mode 100644
index b98f04e..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>${basedir}/target/test-harness/unpack/with-reactor-projects/target</outputDirectory>
- <finalName>unpack-min</finalName>
- <workDirectory>${basedir}/target/test-harness/unpack/with-reactor-projects/work</workDirectory>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <localRepository>${localRepository}</localRepository>
- <reactorProjects>
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub" />
- <reactorProject implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub" />
- </reactorProjects>
- <classifier></classifier>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar b/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar
deleted file mode 100644
index ffa6496..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar
+++ /dev/null
@@ -1 +0,0 @@
-jar contents
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom b/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
deleted file mode 100644
index 0e40bd7..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>assembly</groupId>
- <artifactId>dependency-artifact</artifactId>
- <version>1.0</version>
- <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.jar b/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.jar
deleted file mode 100644
index ffa6496..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.jar
+++ /dev/null
@@ -1 +0,0 @@
-jar contents
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.pom b/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.pom
deleted file mode 100644
index ee36db9..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>assembly</groupId>
- <artifactId>dependency-artifact</artifactId>
- <version>1.1</version>
- <packaging>jar</packaging>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/MASSEMBLY-98.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/MASSEMBLY-98.xml
deleted file mode 100644
index 3fd6194..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/MASSEMBLY-98.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- </groupVersionAlignment>
- <groupVersionAlignment>
- <id>assembly2</id>
- <version>1.0</version>
- <excludes>
- <exclude>dependency-artifact</exclude>
- </excludes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/NoSuchArchiverException.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/NoSuchArchiverException.xml
deleted file mode 100644
index bf09313..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/NoSuchArchiverException.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>txt</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/min/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/FileItem.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/FileItem.xml
deleted file mode 100644
index 549b1ea..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/FileItem.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<component>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- </file>
- <file>
- <source>target/test-classes/fileSet/LICENSE.txt</source>
- </file>
- </files>
-</component>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/FileSet.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/FileSet.xml
deleted file mode 100644
index 617320d..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/FileSet.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<component>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- </fileSet>
- </fileSets>
-</component>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/dependencySet.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/dependencySet.xml
deleted file mode 100644
index ecfcb49..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/components/dependencySet.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<component>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory></outputDirectory>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</component>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-default.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-default.xml
deleted file mode 100644
index acd6db2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-default.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-default</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory></outputDirectory>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-excludes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-excludes.xml
deleted file mode 100644
index 754d947..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-excludes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-excludes</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory></outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>assembly:dependency-artifact1</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml
deleted file mode 100644
index a5ac6a2..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-filename-mapping</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${version}.${artifactId}.${groupId}</outputFileNameMapping>
- <unpack>false</unpack>
- <outputDirectory>libs</outputDirectory>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml
deleted file mode 100644
index e8a4a45..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-filename-mapping</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${version}-${artifactId}-${groupId}</outputFileNameMapping>
- <unpack>false</unpack>
- <outputDirectory>libs</outputDirectory>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-includes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-includes.xml
deleted file mode 100644
index abbb31e..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-includes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-includes</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory></outputDirectory>
- <scope>test</scope>
- <includes>
- <include>assembly:dependency-artifact1</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-scoped.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-scoped.xml
deleted file mode 100644
index 239ff72..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-scoped.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-scoped</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory></outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-unpack.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-unpack.xml
deleted file mode 100644
index 973771f..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/dependencySet-unpack.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>dependencySet-unpack</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <outputDirectory></outputDirectory>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/descriptorSourceDirectory/simple.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/descriptorSourceDirectory/simple.xml
deleted file mode 100644
index fc233b5..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/descriptorSourceDirectory/simple.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/descriptorSourceDirectory/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/empty.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/empty.xml
deleted file mode 100644
index 6551572..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/empty.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>empty</id>
- <formats>
- <format>zip</format>
- </formats>
- <componentDescriptors>
- <componentDescriptor>src/test/resources/assemblies/components/dependencySet.xml</componentDescriptor>
- <componentDescriptor>src/test/resources/assemblies/components/FileItem.xml</componentDescriptor>
- <componentDescriptor>src/test/resources/assemblies/components/FileSet.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-fileMode.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-fileMode.xml
deleted file mode 100644
index c0699df..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-fileMode.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileItem</id>
- <formats>
- <format>zip</format>
- </formats>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- <fileMode>777</fileMode>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-filter-file.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-filter-file.xml
deleted file mode 100644
index f1fa79f..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-filter-file.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileItem</id>
- <formats>
- <format>zip</format>
- </formats>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-filtered.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-filtered.xml
deleted file mode 100644
index f1fa79f..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-filtered.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileItem</id>
- <formats>
- <format>zip</format>
- </formats>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-lineEndings.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-lineEndings.xml
deleted file mode 100644
index 89c96e0..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-lineEndings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileItem</id>
- <formats>
- <format>zip</format>
- </formats>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-output-name.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-output-name.xml
deleted file mode 100644
index 70cafa6..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem-output-name.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileItem</id>
- <formats>
- <format>zip</format>
- </formats>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- <outputDirectory>output</outputDirectory>
- <destName>READTHIS.txt</destName>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem.xml
deleted file mode 100644
index 1ae555b..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileItem.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileItem</id>
- <formats>
- <format>zip</format>
- </formats>
- <files>
- <file>
- <source>target/test-classes/fileSet/README.txt</source>
- </file>
- <file>
- <source>target/test-classes/fileSet/LICENSE.txt</source>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-archiveBaseDirectory.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-archiveBaseDirectory.xml
deleted file mode 100644
index 6f22db9..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-archiveBaseDirectory.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>fileSet</directory>
- <lineEnding>keep</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-crlf-lineEndings.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-crlf-lineEndings.xml
deleted file mode 100644
index 618a973..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-crlf-lineEndings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-doesnt-exist.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-doesnt-exist.xml
deleted file mode 100644
index 1db6636..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-doesnt-exist.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>donkey</directory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-dos-lineEndings.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-dos-lineEndings.xml
deleted file mode 100644
index df80994..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-dos-lineEndings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-includes-excludes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-includes-excludes.xml
deleted file mode 100644
index 1a688c8..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-includes-excludes.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <includes>
- <include>**/*.txt</include>
- </includes>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-lf-lineEndings.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-lf-lineEndings.xml
deleted file mode 100644
index 1b87c71..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-lf-lineEndings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-lineEndings-exception.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-lineEndings-exception.xml
deleted file mode 100644
index 6044d66..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-lineEndings-exception.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <lineEnding>invalid</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-no-directory.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-no-directory.xml
deleted file mode 100644
index 61baab8..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-no-directory.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
-
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-unix-lineEndings.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-unix-lineEndings.xml
deleted file mode 100644
index 9050903..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet-unix-lineEndings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet.xml
deleted file mode 100644
index 6bc5288..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/fileSet.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>fileSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-excludes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-excludes.xml
deleted file mode 100644
index c6c1f95..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-excludes.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>moduleSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <excludes>
- <exclude>assembly:reactor-project-1</exclude>
- </excludes>
- <sources/>
- <binaries/>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-include-dependencies.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-include-dependencies.xml
deleted file mode 100644
index 5c12949..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-include-dependencies.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>moduleSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <sources/>
- <binaries>
- <includeDependencies>true</includeDependencies>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-includes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-includes.xml
deleted file mode 100644
index 10ab0e4..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-includes.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>moduleSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>assembly:reactor-project-1</include>
- </includes>
- <sources/>
- <binaries/>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-packed-including-dependencies.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-packed-including-dependencies.xml
deleted file mode 100644
index a69db0e..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-packed-including-dependencies.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>moduleSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <binaries>
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-packed.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-packed.xml
deleted file mode 100644
index d328a70..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet-packed.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>moduleSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <binaries>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet.xml
deleted file mode 100644
index 2f4a33b..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/moduleSet.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>moduleSet</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <sources/>
- <binaries/>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/plexus-components.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/plexus-components.xml
deleted file mode 100644
index 33cbf5e..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/plexus-components.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>plexus-components</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-classes/fileSet</directory>
- <includes>
- <include>META-INF/plexus/components.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-excludes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-excludes.xml
deleted file mode 100644
index e4ed624..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-excludes.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- <excludes>
- <exclude>dependency-artifact</exclude>
- </excludes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-includes.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-includes.xml
deleted file mode 100644
index ffc5830..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-includes.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- <includes>
- <include>dependency-artifact</include>
- </includes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment.xml
deleted file mode 100644
index cd31fc1..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-groupVersionAlignment.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-with-metadata.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-with-metadata.xml
deleted file mode 100644
index b817abe..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository-with-metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <includeMetadata>true</includeMetadata>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository.xml
deleted file mode 100644
index c63e196..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/repository.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/simple.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/simple.xml
deleted file mode 100644
index 06f9c0d..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/simple.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>zip</format>
- </formats>
- <!--includeBaseDirectory>false</includeBaseDirectory-->
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/min/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tar-bz2.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tar-bz2.xml
deleted file mode 100644
index 04eb956..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tar-bz2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>tar.bz2</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/tar-bz2/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tar-gz.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tar-gz.xml
deleted file mode 100644
index 9881e30..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tar-gz.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/tar-gz/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tbz2.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tbz2.xml
deleted file mode 100644
index 4708d3d..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tbz2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>tbz2</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/tbz2/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tgz.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tgz.xml
deleted file mode 100644
index dbcc6c8..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/tgz.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>tgz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/tgz/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/war.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/war.xml
deleted file mode 100644
index 0aac290..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/assemblies/war.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>simple</id>
- <formats>
- <format>war</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>target/test-harness/assembly/war/target</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml b/maven-assembly-plugin-2.x/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml
deleted file mode 100644
index 96863bf..0000000
--- a/maven-assembly-plugin-2.x/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>outputFileNameMapping</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.test:test</include>
- <include>org.test.2:test2</include>
- </includes>
- <outputDirectory>/dependencies/</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/it-project-parent/pom.xml b/maven-assembly-plugin-2.x/src/it/it-project-parent/pom.xml
deleted file mode 100644
index 2cac89e..0000000
--- a/maven-assembly-plugin-2.x/src/it/it-project-parent/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <profiles>
- <profile>
- <id>testing</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <repositories>
- <!--
- <repository>
- <id>main.local.as.remote</id>
- <url>file://${local.repo.path}</url>
- </repository>
- -->
- <repository>
- <id>integration.test.repo</id>
- <url>@test.remote.repo.url@</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <!--
- <pluginRepository>
- <id>main.local.as.remote</id>
- <url>file://${local.repo.path}</url>
- </pluginRepository>
- -->
- <pluginRepository>
- <id>integration.test.repo</id>
- <url>@test.remote.repo.url@</url>
- </pluginRepository>
- </pluginRepositories>
-
- <distributionManagement>
- <repository>
- <id>integration.test.repo</id>
- <url>@test.remote.repo.url@</url>
- </repository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>live</id>
-
- <!-- just avoids the information injected by the testing profile, above. -->
- </profile>
- </profiles>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/child/pom.xml
deleted file mode 100644
index 6549b26..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/child/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- </parent>
- <name>Child</name>
- <artifactId>child</artifactId>
- <version>1.0</version>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/invoker.properties
deleted file mode 100644
index e3a3cf9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean validate
-#invoker.mavenOpts=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/pom.xml
deleted file mode 100644
index 8a64a6d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <packaging>pom</packaging>
-
- <name>Parent</name>
- <modules>
- <module>child</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
deleted file mode 100644
index 3da12b6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/*.log</exclude>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/verify.bsh
deleted file mode 100644
index 714a01e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/ExecutionRoot/verify.bsh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "target/parent-1.0-src.zip" ).exists() && !new File( basedir, "child/target/child-1.0-src.zip" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/assembly.xml
deleted file mode 100644
index 24a3523..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/assembly.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly>
- <id>full</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <useProjectArtifact>true</useProjectArtifact>
- <outputDirectory>lib/</outputDirectory>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/invoker.properties
deleted file mode 100644
index 728079c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/pom.xml
deleted file mode 100644
index e7b2899..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>test</artifactId>
- <version>1.0</version>
-
- <name>Test</name>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>com.example.Main</mainClass>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/verify.bsh
deleted file mode 100644
index c17bc60..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/add-classpath/verify.bsh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
-
-File file = new File( basedir, "target/test-1.0-full.jar" );
-
-System.out.println( "file: " + file + " exists? " + file.exists() );
-
-JarFile jarFile = new JarFile( file );
-
-Manifest mf = jarFile.getManifest();
-
-Attributes attrs = mf.getMainAttributes();
-
-String classPath = (String) attrs.get( Attributes.Name.CLASS_PATH );
-
-System.out.println( "Got Main-Class: " + mainClass );
-
-return classPath.contains("plexus-utils");
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/classpath-descriptor/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/classpath-descriptor/invoker.properties
deleted file mode 100644
index 86d0756..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/classpath-descriptor/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/classpath-descriptor/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/classpath-descriptor/pom.xml
deleted file mode 100644
index c20f0ae..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/classpath-descriptor/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>test</artifactId>
- <version>1.0</version>
-
- <name>Test</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
deleted file mode 100644
index e667a1f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml
deleted file mode 100644
index 4023c17..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
-
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorSourceDirectory>src/assemble</descriptorSourceDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml
deleted file mode 100644
index 8786232..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bindir</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>commons-logging:commons-logging</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/readme.txt b/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/readme.txt
deleted file mode 100644
index 372a833..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This file is junk and should not be picked up as a descriptor.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/TODO.txt b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/TODO.txt
deleted file mode 100644
index 345e6ae..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/TODO.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
deleted file mode 100644
index 1b476c4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml
deleted file mode 100644
index 3a45274..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml
deleted file mode 100644
index 28c8e3b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bug-example</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>TODO.txt</source>
- <outputDirectory>/</outputDirectory>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh
deleted file mode 100644
index 71d8548..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "target/parent-1.0-bug-example/TODO.txt" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/a.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/a.properties
deleted file mode 100644
index aa0aca5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/a.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-testProp=boo
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/invoker.properties
deleted file mode 100644
index a708935..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/pom.xml
deleted file mode 100644
index 63324cb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
-
- <build>
- <filters>
- <filter>a.properties</filter>
- </filters>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml
deleted file mode 100644
index 9c9801b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>massembly-148-example</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>src/config/a/file.txt</source>
- <outputDirectory>a</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>src/config/b/file.txt</source>
- <outputDirectory>b</outputDirectory>
- <destName>file.txt</destName>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/config/a/file.txt b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/config/a/file.txt
deleted file mode 100644
index 7301c3c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/config/a/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file A
-${testProp}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/config/b/file.txt b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/config/b/file.txt
deleted file mode 100644
index efc606f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/src/config/b/file.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-file B
-${testProp}
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/verify.bsh
deleted file mode 100644
index 37f4f45..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/file-sameName/verify.bsh
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- File a = new File( basedir, "target/parent-1.0-massembly-148-example/a/file.txt");
- File b = new File( basedir, "target/parent-1.0-massembly-148-example/b/file.txt");
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(a));
- String s = r.readLine();
- result = s.equals("file A");
- }
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(b));
- String s = r.readLine();
- result = s.equals("file B");
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/pom.xml
deleted file mode 100644
index 053f974..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- <name>Test</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <formats>
- <format>zip</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml
deleted file mode 100644
index 0e5b6d7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/verify.bsh
deleted file mode 100644
index e2f1a45..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats-in-pom-win/verify.bsh
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-return !new java.io.File( basedir, "target/parent-1-src/src/main/assembly/src.xml" ).exists() &&
- new java.io.File( basedir, "target/parent-1-src.zip" ) .exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/TODO.txt b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/TODO.txt
deleted file mode 100644
index 345e6ae..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/TODO.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/goals.txt b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/goals.txt
deleted file mode 100644
index 13ed85b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/pom.xml
deleted file mode 100644
index 3299893..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>format-test</artifactId>
- <version>1.0</version>
-
- <name>Test</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemblies/format-test.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <outputDirectory>${project.build.directory}/assemblies</outputDirectory>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
deleted file mode 100644
index 16aa45a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>format-test</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- <format>tar</format>
- <format>tar.gz</format>
- <format>tgz</format>
- <format>tar.bz2</format>
- <format>tbz2</format>
- <format>jar</format>
- <format>war</format>
- <format>tar.snappy</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>TODO.txt</source>
- <outputDirectory>/</outputDirectory>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh
deleted file mode 100644
index e3557a0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0" );
- result = result && assembly.exists();
- result = result && assembly.isDirectory();
- result = result && new File( assembly, "TODO.txt" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.zip" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.tar" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.tar.gz" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.tgz" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.tar.bz2" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.tbz2" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.jar" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.war" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-try
-{
- File assembly = new File( basedir, "target/assemblies/format-test-1.0.tar.snappy" );
- result = result && assembly.exists();
- result = result && assembly.isFile();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/pom.xml
deleted file mode 100644
index 5e14cc4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>test</artifactId>
- <version>1</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml
deleted file mode 100644
index 2bc8fe3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <files>
- <file>
- <source>${localRepository}/org/apache/maven/plugins/maven-assembly-plugin/${testVersion}/maven-assembly-plugin-${testVersion}.jar</source>
- <outputDirectory>unprefixed</outputDirectory>
- <destName>maven-assembly-plugin.jar</destName>
- </file>
- <file>
- <source>${settings.localRepository}/org/apache/maven/plugins/maven-assembly-plugin/${testVersion}/maven-assembly-plugin-${testVersion}.jar</source>
- <outputDirectory>prefixed</outputDirectory>
- <destName>maven-assembly-plugin.jar</destName>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file b/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file
deleted file mode 100755
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/verify.bsh
deleted file mode 100644
index 4fde732..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/local-repo-interp/verify.bsh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "target/test-1-bin/unprefixed/maven-assembly-plugin.jar" );
-File f2 = new File( basedir, "target/test-1-bin/prefixed/maven-assembly-plugin.jar" );
-
-if ( !f.exists() || !f.isFile() )
-{
- 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;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
deleted file mode 100644
index fa8bf7e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml
deleted file mode 100644
index 532a96e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-256-pomPropertiesInterp</artifactId>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/myassembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <fileLocation>file/path</fileLocation>
- <fileLocation2>file2/path</fileLocation2>
- <fileLocation3>file3/path</fileLocation3>
- </properties>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml
deleted file mode 100644
index 1486342..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>myassembly</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/files</directory>
- <outputDirectory>${fileLocation}</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/files</directory>
- <outputDirectory>${pom.properties.fileLocation2}</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/files</directory>
- <outputDirectory>${project.properties.fileLocation3}</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/files/some.file b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/files/some.file
deleted file mode 100755
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/files/some.file
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
deleted file mode 100644
index 440406a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file/path/some.file" );
-File f2 = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file2/path/some.file" );
-File f3 = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file3/path/some.file" );
-
-boolean fOK = f.exists() && f.isFile();
-if ( !fOK )
-{
- 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." );
-}
-
-boolean f3OK = f3.exists() && f3.isFile();
-if ( !f3OK )
-{
- System.out.println( "File: " + f3 + " doesn't exist, or isn't a file." );
-}
-
-return fOK && f2OK;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
deleted file mode 100644
index fa8bf7e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml
deleted file mode 100644
index 08446a8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>project</artifactId>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/myassembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
deleted file mode 100644
index d4b60eb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>myassembly</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/files</directory>
- <outputDirectory>/files</outputDirectory>
- <includes>
- <include>${artifactId}1.file</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/files</directory>
- <outputDirectory>/files</outputDirectory>
- <includes>
- <include>${pom.artifactId}2.file</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/files</directory>
- <outputDirectory>/files</outputDirectory>
- <includes>
- <include>${project.artifactId}3.file</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project1.file b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project1.file
deleted file mode 100755
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project1.file
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project2.file b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project2.file
deleted file mode 100755
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project2.file
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project3.file b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project3.file
deleted file mode 100755
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/files/project3.file
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
deleted file mode 100644
index 08f4ea8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "target/project-1-myassembly/files/project1.file" );
-File f2 = new File( basedir, "target/project-1-myassembly/files/project2.file" );
-File f3 = new File( basedir, "target/project-1-myassembly/files/project3.file" );
-
-boolean fOK = f.exists() && f.isFile();
-if ( !fOK )
-{
- 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." );
-}
-
-boolean f3OK = f3.exists() && f3.isFile();
-if ( !f3OK )
-{
- System.out.println( "File: " + f3 + " doesn't exist, or isn't a file." );
-}
-
-return fOK && f2OK;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
deleted file mode 100644
index e667a1f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml
deleted file mode 100644
index 7b1b55f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
-
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml
deleted file mode 100644
index 8786232..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bindir</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>commons-logging:commons-logging</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
deleted file mode 100644
index 1b476c4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
deleted file mode 100644
index 827f2ff..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>outputFileNameMapping-withArtifactBaseVersion</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <repositories>
- <repository>
- <id>test-snapshots</id>
- <url>file://${basedir}/repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml
deleted file mode 100644
index 880e9b1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.3-SNAPSHOT</version>
- <versioning>
- <snapshot>
- <timestamp>20060811.151624</timestamp>
- <buildNumber>1</buildNumber>
- </snapshot>
- <lastUpdated>20060811151624</lastUpdated>
- </versioning>
-</metadata>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5 b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5
deleted file mode 100644
index 722722e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-41c86c6138662f89b8f9020699fdf5b9
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1 b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1
deleted file mode 100644
index 3759452..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2175f9cd18cb2e36a20818279a148eba5ad6ccfd
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar
deleted file mode 100644
index be440fd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.jar
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom
deleted file mode 100644
index 0a3c429..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/plexus-utils-1.3-20060811.151624-1.pom
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <groupId>org.codehaus.plexus</groupId>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>plexus-utils</artifactId>
- <name>Plexus Common Utilities</name>
- <version>1.3-20060811.151624-1</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>true</childDelegation>
- <excludes>
- <exclude>org/codehaus/plexus/util/FileBasedTestCase.java</exclude>
- <exclude>**/Test*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <distributionManagement>
- <snapshotRepository>
- <id>local-for-tests</id>
- <url>file:///tmp/repository</url>
- </snapshotRepository>
- <status>deployed</status>
- </distributionManagement>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml
deleted file mode 100644
index ed1b3a7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.3-SNAPSHOT</version>
- <versioning>
- <versions>
- <version>1.3-SNAPSHOT</version>
- </versions>
- <lastUpdated>20060811151624</lastUpdated>
- </versioning>
-</metadata>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5 b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5
deleted file mode 100644
index 8fb21d8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-b6789e2ec12187a1b036652cf2f81511
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1 b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1
deleted file mode 100644
index 2400910..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d38f4bcd1f71a4a67d3dab0632905266cea942ab
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
deleted file mode 100644
index 67624d9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
deleted file mode 100644
index 895fa10..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin/lib/plexus-utils-1.3.jar" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/invoker.properties
deleted file mode 100644
index 6613f3f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean validate
-#invoker.mavenOpts=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/pom.xml
deleted file mode 100644
index 786539e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>relative-project-paths</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml
deleted file mode 100644
index 19b4d26..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <excludes>
- <exclude>**/*.log</exclude>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/verify.bsh
deleted file mode 100644
index 130e385..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/relative-project-paths/verify.bsh
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-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;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/pom.xml
deleted file mode 100644
index c233222..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
-
- <name>Test</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/src/main/assembly/src.xml
deleted file mode 100644
index 0e5b6d7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/src/main/assembly/src.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/verify.bsh
deleted file mode 100644
index a4ff9bb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/basic-features/this & that/verify.bsh
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-return new java.io.File( basedir, "target/parent-1-src/src/main/assembly/src.xml" ).exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-1/pom.xml
deleted file mode 100644
index f262cb4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-1/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>project</artifactId>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child-1</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-1/src/main/resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-1/src/main/resources/test.txt
deleted file mode 100644
index 345e6ae..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-1/src/main/resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-2/pom.xml
deleted file mode 100644
index 9d57742..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-2/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>project</artifactId>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child-2</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.2</version>
- </dependency>
- <!--
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- -->
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-2/src/main/resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-2/src/main/resources/test.txt
deleted file mode 100644
index 345e6ae..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/child-2/src/main/resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/invoker.properties
deleted file mode 100644
index c1b600f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package assembly:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/pom.xml
deleted file mode 100644
index b08aedb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>project</artifactId>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>child-1</module>
- <module>child-2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml
deleted file mode 100644
index a3fb688..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>${module.artifactId}</outputDirectory>
- <includeDependencies>true</includeDependencies>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>commons-codec*</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/verify.bsh
deleted file mode 100644
index f8054bd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-190/verify.bsh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File child1Codec = new File( basedir, "target/project-1-bin/child-1/commons-codec-1.3.jar" );
-File child2Codec = new File( basedir, "target/project-1-bin/child-2/commons-codec-1.3.jar" );
-
-if ( !child1Codec.exists() )
-{
- 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 );
-}
-
-return child1Codec.exists() && child2Codec.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/invoker.properties
deleted file mode 100644
index c25c58c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=# Specify the goals to be run here, one per line. Lines beginning with a hash '#' will be ignored. clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml
deleted file mode 100644
index ca6e16b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>massembly-285</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-285-assembly</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.parent.artifactId}-mod1</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.parent.artifactId}-mod2</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/src/main/assembly/bin.xml
deleted file mode 100644
index f60e231..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/src/main/java/tests/App.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/src/main/java/tests/App.java
deleted file mode 100644
index c177e27..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/src/main/java/tests/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tests;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh
deleted file mode 100644
index 01f07f7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-/*
- This is where you verify the results of the assembly build. You may need to check the existence of a file,
- or even peek within a jar file to determine whether the assembly did the right thing.
- */
-return new File( basedir, "target/${artifactId}-${version}-bin.dir/lib/junit.jar" ).exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml
deleted file mode 100644
index 52ebef0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>massembly-285</artifactId>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>massembly-285-mod1</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/main/java/tests/App.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/main/java/tests/App.java
deleted file mode 100644
index c177e27..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/main/java/tests/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tests;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java
deleted file mode 100644
index 8c34397..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package tests;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml
deleted file mode 100644
index 48e04e2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>massembly-285</artifactId>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>massembly-285-mod2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/main/java/tests/App.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/main/java/tests/App.java
deleted file mode 100644
index c177e27..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/main/java/tests/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tests;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java
deleted file mode 100644
index 8c34397..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package tests;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/pom.xml
deleted file mode 100644
index d144586..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-285</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>massembly-285-mod1</module>
- <module>massembly-285-mod2</module>
- <module>massembly-285-assembly</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archiverConfig>
- <duplicateBehavior>skip</duplicateBehavior>
- </archiverConfig>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/verify.bsh
deleted file mode 100644
index 28fc6bf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-285/verify.bsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-
-File f = new File( basedir, "massembly-285-assembly/target/massembly-285-assembly-1-bin.jar" );
-JarFile jf = new JarFile( f );
-
-String testPath = "tests/App.class";
-
-int jarCount = 0;
-
-Enumeration e = jf.entries();
-while( e.hasMoreElements() )
-{
- 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 );
-}
-
-f = new File( basedir, "massembly-285-assembly/target/massembly-285-assembly-1-bin.zip" );
-ZipFile zf = new ZipFile( f );
-
-String testPath = "tests/App.class";
-
-int zipCount = 0;
-
-e = zf.entries();
-while( e.hasMoreElements() )
-{
- 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 );
-}
-
-return jarCount == 1;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-306/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-306/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-306/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-306/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-306/pom.xml
deleted file mode 100644
index e78427a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-306/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-306</artifactId>
- <packaging>jar</packaging>
- <name>massembly-306</name>
-
- <dependencies>
- <dependency>
- <!-- Keep the jar-with-dependencies from being file-less... -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-
- <!-- Both the range AND the scope are critical here,
- since this artifact will be EXCLUDED from the depSet. -->
- <version>[1.2.16]</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-324/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-324/assembly.xml
deleted file mode 100644
index 3a606c1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-324/assembly.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly>
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>spring-${project.version}</baseDirectory>
- <includeBaseDirectory>true</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>WEB-INF/lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-324/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-324/pom.xml
deleted file mode 100644
index d36034b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-324/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
- <artifactId>project2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-io</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
- <!-- dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency -->
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/pom.xml
deleted file mode 100644
index 08f82a4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-375</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/test.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/src/main/assembly/test.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/src/main/assembly/test.txt
deleted file mode 100644
index 4fff881..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/src/main/assembly/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test File
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml
deleted file mode 100644
index 2e61f95..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>test</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/assembly</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>test.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/verify.bsh
deleted file mode 100644
index e86cecf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-375/verify.bsh
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-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;
-}
-catch ( Throwable t )
-{
- t.printStackTrace( System.out );
- System.out.flush();
- return false;
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/pom.xml
deleted file mode 100644
index cbf101c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-462</artifactId>
- <packaging>jar</packaging>
- <version>1</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
deleted file mode 100644
index ad96e7c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/assembly-resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-${project.version}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
deleted file mode 100644
index 010bb99..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/assembly-resources</directory>
- <filtered>true</filtered>
- <lineEnding>unix</lineEnding>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/verify.bsh
deleted file mode 100644
index df275b6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-462/verify.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-String assemblyDir = "target/massembly-462-1-src/";
-
-result = result && new File( basedir, assemblyDir + "test.txt" ).exists();
-result = result && new File( basedir, assemblyDir ).list().length == 1;
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-559/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-559/pom.xml
deleted file mode 100644
index f9098d8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-559/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>test-assembly-transitive-bug</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <version>4.8.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <executions>
- <execution>
- <id>create-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-559/src/assembly/test.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-559/src/assembly/test.xml
deleted file mode 100644
index b43332f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-559/src/assembly/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>test</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <includes>
- <include>junit:*</include>
- </includes>
- <outputDirectory>junit-only</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- <dependencySet>
- <outputDirectory>no-transitive</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-580/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-580/pom.xml
deleted file mode 100644
index 5e21d11..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-580/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.sulake.maven</groupId>
- <artifactId>directory-mode-ignored</artifactId>
- <version>10-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <!-- bunch of wars defined here, random commons artifact for testing -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
- <!--type>war</type-->
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <finalName>project-deploy</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/release.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml
deleted file mode 100644
index 1e73ed6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-580/src/main/assembly/release.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>release</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>webapps</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <fileMode>0644</fileMode>
- <directoryMode>0750</directoryMode>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/pom.xml
deleted file mode 100644
index 872c67c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
- <artifactId>project1</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh
deleted file mode 100644
index 13a8339..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/start.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh
deleted file mode 100644
index 13a8339..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/bin/stop.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/empty.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/empty.properties
deleted file mode 100644
index 13a8339..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child1/src/main/resources/empty.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child2/pom.xml
deleted file mode 100644
index ed243f8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child2/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
- <artifactId>project2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>mygroup</groupId>
- <artifactId>project1</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <!-- comment-out this dependency in the second run to verify the behaviour -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child2/src/main/assembly/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child2/src/main/assembly/assembly.xml
deleted file mode 100644
index 6624975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/child2/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>deployable</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <dependencySets>
-
-
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <scope>runtime</scope>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>*.properties</include>
- </includes>
- </unpackOptions>
- <fileMode>0444</fileMode>
- <directoryMode>0444</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <scope>runtime</scope>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>bin/*</include>
- </includes>
- </unpackOptions>
- <fileMode>0744</fileMode>
- <directoryMode>0744</directoryMode>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/pom.xml
deleted file mode 100644
index 8ffb0a5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>mygroup</groupId>
- <artifactId>parent</artifactId>
- <version>0.0.1</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/verify.bsh
deleted file mode 100644
index 9e66ccd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-583/verify.bsh
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-try
-{
- File zipFile = new File( basedir, "child2/target/project2-0.0.1-SNAPSHOT-deployable.zip" );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip-file is missing or a directory." );
- result = false;
- }
-
- ZipFile zf = new ZipFile( zipFile );
-
- if ( zf.getEntry( "project2-0.0.1-SNAPSHOT/empty.properties" ) == null )
- {
- System.err.println( "empty.properties entry is missing." );
- result = false;
- }
-
- if ( zf.getEntry( "project2-0.0.1-SNAPSHOT/bin/start.sh" ) == null )
- {
- System.err.println( "start.sh entry is missing." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-730/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-730/pom.xml
deleted file mode 100644
index a0f760c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-730/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>fr.husta.test</groupId>
- <artifactId>issue-mvn-assembly-plugin-730</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <!-- <version>2.4.1</version> -->
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>test-pkg</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>unit-tests-after-packaging</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- PostgreSQL JDBC 4.0 Driver -->
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.3-1102-jdbc4</version>
- </dependency>
-
- <!-- Tests -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/test/assembly/JarWithDependenciesTest.java b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/test/assembly/JarWithDependenciesTest.java
deleted file mode 100644
index 26c080e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-730/src/test/java/fr/husta/test/assembly/JarWithDependenciesTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package fr.husta.test.assembly;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public class JarWithDependenciesTest
-{
-
- @Test
- public void checkMetaInfContent() throws IOException
- {
- // check META-INF/services/java.sql.Driver exists
- JarFile jar = new JarFile("target/issue-mvn-assembly-plugin-730-jar-with-dependencies.jar");
- JarEntry entry = jar.getJarEntry("META-INF/services/java.sql.Driver");
- if (entry == null)
- {
- fail("the file 'META-INF/services/java.sql.Driver' should exist in jar-with-dependencies");
- }
-
- // Content should be "org.postgresql.Driver"
- InputStream is = jar.getInputStream(entry);
- String content = IOUtils.toString(is, "UTF-8");
- System.out.println("JDBC Driver found : " + content.substring(0, content.indexOf("\n")));
- assertEquals("org.postgresql.Driver", content.substring(0, content.indexOf("\n")));
-
- // if test fails and content == "sun.jdbc.odbc.JdbcOdbcDriver",
- // it means it comes from jre/lib/resources.jar!/META-INF/services/java.sql.Driver (which is unwanted)
-
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/assembly.xml
deleted file mode 100644
index 50b5869..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>deployable</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <includes><include>symlinks/src/**</include></includes>
- <directoryMode>700</directoryMode>
- <fileMode>600</fileMode>
- </fileSet>
- </fileSets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/not-verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/not-verify.bsh
deleted file mode 100644
index e3da221..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/not-verify.bsh
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-
-
-
-boolean result = true;
-
-try
-{
- File zipFile = new File( basedir, "target/project2-0.0.1-SNAPSHOT-deployable.zip" );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip-file is missing or a directory." );
- result = false;
- }
-
- ZipFile zf = new ZipFile( zipFile );
-
- ZipArchiveEntry ze = zf.getEntry( "project2-0.0.1-SNAPSHOT/symlinks/src/symDir/" );
- if ( ze == null )
- {
- System.err.println( "symDir is missing." );
- result = false;
- }
-
- if (!ze.isUnixSymlink()) {
- System.err.println( "symDir is not a symnlink." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/pom.xml
deleted file mode 100644
index fd3f0dd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
- <artifactId>project2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/dirOnTheOutside/FileInDirOnTheOutside.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/dirOnTheOutside/FileInDirOnTheOutside.txt
deleted file mode 100644
index df06763..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/dirOnTheOutside/FileInDirOnTheOutside.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-I am on the outside...
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/onTheOutside.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/onTheOutside.txt
deleted file mode 100644
index 7632c2f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/onTheOutside.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-I am on the outside of the src
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/regen.sh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/regen.sh
deleted file mode 100755
index d4e4d05..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/regen.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-rm symlinks.zip
-rm symlinks.tar
-cd src
-zip --symlinks ../symlinks.zip file* targetDir sym*
-tar -cvf ../symlinks.tar file* targetDir sym*
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/aRegularDir/aRegularFile.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/aRegularDir/aRegularFile.txt
deleted file mode 100644
index 9e429a8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/aRegularDir/aRegularFile.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-I am just an ordinary file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileR.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileR.txt
deleted file mode 100644
index 3c43b41..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileR.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-This file is a source. r r r filemode
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileW.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileW.txt
deleted file mode 100644
index d4901ad..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileW.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-all w
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileX.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileX.txt
deleted file mode 100755
index 872a5cd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/fileX.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-xxx
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symDir b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symDir
deleted file mode 120000
index 29b5d5c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symDir
+++ /dev/null
@@ -1 +0,0 @@
-targetDir/
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToDirOnTheOutside b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToDirOnTheOutside
deleted file mode 120000
index eec25f5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToDirOnTheOutside
+++ /dev/null
@@ -1 +0,0 @@
-../dirOnTheOutside/
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToFileOnTheOutside b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToFileOnTheOutside
deleted file mode 120000
index fd1227b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToFileOnTheOutside
+++ /dev/null
@@ -1 +0,0 @@
-../onTheOutside.txt
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symR b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symR
deleted file mode 120000
index 114a517..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symR
+++ /dev/null
@@ -1 +0,0 @@
-fileR.txt
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symW b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symW
deleted file mode 120000
index 19a642c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symW
+++ /dev/null
@@ -1 +0,0 @@
-fileW.txt
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symX b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symX
deleted file mode 120000
index 2d8a735..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/symX
+++ /dev/null
@@ -1 +0,0 @@
-fileX.txt
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/targetDir/targetFile.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/targetDir/targetFile.txt
deleted file mode 100644
index 4f8ba15..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-731/symlinks/src/targetDir/targetFile.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-This is a target file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/assembly.xml
deleted file mode 100644
index 404839d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/assembly.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly>
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>spring-${project.version}</baseDirectory>
- <includeBaseDirectory>true</includeBaseDirectory>
- <files>
- <file>
- <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
- <outputDirectory>/lib</outputDirectory>
- <destName>${project.build.finalName}.jar</destName>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/pom.xml
deleted file mode 100644
index 15b58f9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>mygroup</groupId>
- <artifactId>project2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/verify.bsh
deleted file mode 100644
index 02ca314..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-732/verify.bsh
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-
-
-boolean result = true;
-
-try
-{
- File zipFile = new File( basedir, "target/project2-0.0.1-SNAPSHOT-bin.zip" );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip-file is missing or a directory." );
- result = false;
- }
-
- ZipFile zf = new ZipFile( zipFile );
-
- ZipEntry ze = zf.getEntry( "spring-0.0.1-SNAPSHOT/lib/project2-0.0.1-SNAPSHOT.jar" );
- if ( ze == null )
- {
- System.err.println( "filename is incorrect" );
- result = false;
- }
- zf.close();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/pom.xml
deleted file mode 100644
index 0433552..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>localhost</groupId>
- <artifactId>MASSEMBLY-733</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>my-final-name</finalName>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
-
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml
deleted file mode 100644
index d5bb3d6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---><assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <files>
- <file>
- <outputDirectory>/root</outputDirectory>
- <source>src/main/assembly/bin.xml</source>
- </file>
- </files>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/verify.bsh
deleted file mode 100644
index ba0162a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-733/verify.bsh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "target/my-final-name-bin/my-final-name/root/bin.xml" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/pom.xml
deleted file mode 100644
index 5a73063..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
- <artifactId>massembly-737</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <build>
- <defaultGoal>package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemble-deployable-war</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/deployable.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/src/assembly/deployable.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/src/assembly/deployable.xml
deleted file mode 100644
index c36a92d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/src/assembly/deployable.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>deployable</id>
- <formats>
- <format>war</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <useProjectArtifact>true</useProjectArtifact>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/src/main/webapp/WEB-INF/web.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f133f0e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-737/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/pom.xml
deleted file mode 100644
index ea5b82e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
-
- <groupId>localhost</groupId>
- <artifactId>assembly-739-bug</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <properties>
- <project.build.sourceEncoding>iso8859-1</project.build.sourceEncoding>
- <project.reporting.outputEncoding>iso8859-1</project.reporting.outputEncoding>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- ACHTUNG: 2.5 - 2.5.2 is buggy: packed directories are write protected (mode 000) -->
- <!-- Version 2.4 works and creates directories with mode 755 -->
- <executions>
- <execution>
- <id>generate-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml
deleted file mode 100644
index 5f2b74e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>conapp</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <outputDirectory>/bin</outputDirectory>
- <directory>${basedir}/src/main/scripts</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/src/main/scripts/test.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/src/main/scripts/test.txt
deleted file mode 100644
index f7c9124..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-739/src/main/scripts/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-An empty text file.
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/assembly.xml
deleted file mode 100644
index 5c93b2d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/assembly.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
- <id>dist</id>
-
- <!-- Generates a zip package containing the needed files -->
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>${mine.includeBaseDirectory}</includeBaseDirectory>
-
- <files>
- <file>
- <source>structure/README.txt</source>
- <destName>folder/README.txt</destName>
- </file>
- </files>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/invoker.properties
deleted file mode 100644
index 728079c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/pom.xml
deleted file mode 100644
index 3f1fd74..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
-
-
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-743</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Maven Assembly Bug</name>
- <description>Maven Assembly Bug</description>
-
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <!-- The configuration of the plugin -->
- <configuration>
- <!-- Specifies the configuration file of the assembly plugin -->
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- </testResources>
- </build>
-
- <properties>
- <mine.includeBaseDirectory>true</mine.includeBaseDirectory>
- </properties>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/structure/README.txt b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/structure/README.txt
deleted file mode 100644
index 600c1c0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/structure/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-BLA BLI
diff --git a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/verify.bsh
deleted file mode 100644
index c7c31f1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/bugs/massembly-743/verify.bsh
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-
-
-boolean result = true;
-
-try
-{
- File zipFile = new File( basedir, "target/massembly-743-1.0.0-SNAPSHOT/massembly-743-1.0.0-SNAPSHOT/folder/README.txt" );
-
- if ( !zipFile.exists() )
- {
- System.err.println( "incorrect path of file." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/pom.xml
deleted file mode 100644
index aa7b613..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- <packaging>jar</packaging>
-
- <name>parent</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml
deleted file mode 100644
index ad20c93..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <componentDescriptors>
- <componentDescriptor>src/main/assembly/depset.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml
deleted file mode 100644
index 70e102f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component>
- <dependencySets>
- <dependencySet>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</component>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/pom.xml
deleted file mode 100644
index cbead74..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/pom.xml
deleted file mode 100644
index 5d251b1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml
deleted file mode 100644
index b2f53e7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <componentDescriptors>
- <componentDescriptor>src/assemble/modset.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml
deleted file mode 100644
index 5f733af..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>test:child1</include>
- </includes>
-
- <useAllReactorProjects>true</useAllReactorProjects>
- <binaries>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</component>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/pom.xml
deleted file mode 100644
index 36a597b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/components/component-moduleSet/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/invoker.properties
deleted file mode 100644
index 2fdec7f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean validate
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/pom.xml
deleted file mode 100644
index 22f1062..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>configured-handler</artifactId>
- <version>1</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
-
- <executions>
- <execution>
- <id>assembly</id>
- <phase>validate</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
deleted file mode 100644
index e8ad93e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>src/config</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-
- <containerDescriptorHandlers>
- <containerDescriptorHandler>
- <handlerName>file-aggregator</handlerName>
- <configuration>
- <filePattern>.*/file.txt</filePattern>
- <outputPath>file.txt</outputPath>
- </configuration>
- </containerDescriptorHandler>
- </containerDescriptorHandlers>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt
deleted file mode 100644
index d5941d0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-file A
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt
deleted file mode 100644
index 81794e3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file B
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/verify.bsh
deleted file mode 100644
index 51e82d2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/configured-handler/verify.bsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-try
-{
- File a = new File( basedir, "target/configured-handler-1-bin/file.txt");
- File b = new File( basedir, "target/configured-handler-1-bin/b/file.txt");
-
- if(result && !a.exists() ) {
- System.out.println( "File: " + a + " should have been generated, but was not." );
- result = false;
- }
-
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(a));
- String s = null;
-
- boolean foundA = false;
- boolean foundB = false;
- while( ( s = r.readLine() ) != null )
- {
- if ( s.equals( "file A" ) ) {
- foundA = true;
- }
- else if ( s.equals( "file B" ) ) {
- foundB = true;
- }
-
- if ( foundA && foundB )
- {
- result = true;
- break;
- }
- }
-
- if ( !result )
- {
- System.out.println( "File: " + a + " should contain lines:\nfile A\nfile B\n\n ...but didn't." );
- }
- }
-
- if(result && b.exists() ) {
- System.out.println( "File: " + b + " should not exist, but does." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties
deleted file mode 100644
index aa0aca5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-testProp=boo
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
deleted file mode 100644
index ae89832..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>assembly</artifactId>
- <version>1</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>handler-def</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
-
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml
deleted file mode 100644
index 6b86e1d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>src/config</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-
- <containerDescriptorHandlers>
- <containerDescriptorHandler>
- <handlerName>file.txt</handlerName>
- </containerDescriptorHandler>
- </containerDescriptorHandlers>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/config/a/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/config/a/file.txt
deleted file mode 100644
index d5941d0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/config/a/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-file A
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/config/b/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/config/b/file.txt
deleted file mode 100644
index 81794e3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/config/b/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file B
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
deleted file mode 100644
index 5c64535..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.test</groupId>
- <version>1</version>
- <artifactId>handler-def</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index ae29e2d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
- <role-hint>file.txt</role-hint>
- <implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation>
- <configuration>
- <filePattern>.*/file.txt</filePattern>
- <outputPath>file.txt</outputPath>
- <commentChars>#</commentChars>
- </configuration>
- </component>
- </components>
-</component-set>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
deleted file mode 100644
index eae3bf9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>custom-containerDescriptorHandler</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
- <name>custom-containerDescriptorHandler</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>${invokerPluginVersion}</version>
-
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
- <streamLogs>true</streamLogs>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
-
- <executions>
- <execution>
- <id>handler-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>handler-def/pom.xml</pom>
- </configuration>
- </execution>
- <execution>
- <id>assembly-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <debug>true</debug>
- <pom>assembly/pom.xml</pom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
deleted file mode 100644
index d380581..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-try
-{
- File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
-
- if(result && !a.exists() ) {
- System.out.println( "File: " + a + " should have been generated, but was not." );
- result = false;
- }
-
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(a));
- String s = null;
-
- boolean foundA = false;
- boolean foundB = false;
- while( ( s = r.readLine() ) != null )
- {
- if ( s.equals( "file A" ) ) {
- foundA = true;
- }
- else if ( s.equals( "file B" ) ) {
- foundB = true;
- }
-
- if ( foundA && foundB )
- {
- result = true;
- break;
- }
- }
-
- if ( !result )
- {
- System.out.println( "File: " + a + " should contain lines:\nfile A\nfile B\n\n ...but didn't." );
- }
- }
-
- if(result && b.exists() ) {
- System.out.println( "File: " + b + " should not exist, but does." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/a.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/a.properties
deleted file mode 100644
index aa0aca5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/a.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-testProp=boo
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml
deleted file mode 100644
index 9a6d02b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <version>1</version>
- <artifactId>assembly</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>handler-def</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
-
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml
deleted file mode 100644
index b70db47..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <files>
- <file>
- <source>src/config/a/file.txt</source>
- <outputDirectory>a</outputDirectory>
- <destName>file.txt</destName>
- </file>
- <file>
- <source>src/config/b/file.txt</source>
- <outputDirectory>b</outputDirectory>
- <destName>file.txt</destName>
- </file>
- </files>
-
- <containerDescriptorHandlers>
- <containerDescriptorHandler>
- <handlerName>file.txt</handlerName>
- </containerDescriptorHandler>
- </containerDescriptorHandlers>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/config/a/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/config/a/file.txt
deleted file mode 100644
index d5941d0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/config/a/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-file A
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/config/b/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/config/b/file.txt
deleted file mode 100644
index 81794e3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/config/b/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file B
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
deleted file mode 100644
index 5c64535..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.test</groupId>
- <version>1</version>
- <artifactId>handler-def</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index e971df5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
- <role-hint>file.txt</role-hint>
- <implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation>
- <configuration>
- <filePattern>.*file.txt</filePattern>
- <outputPath>file.txt</outputPath>
- <commentChars>#</commentChars>
- </configuration>
- </component>
- </components>
-</component-set>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
deleted file mode 100644
index 928b454..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>custom-handler-withFileEntries</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
- <name>custom-handler-withFileEntries</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>${invokerPluginVersion}</version>
-
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <streamLogs>true</streamLogs>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
-
- <executions>
- <execution>
- <id>handler-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>handler-def/pom.xml</pom>
- </configuration>
- </execution>
- <execution>
- <id>assembly-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <debug>true</debug>
- <pom>assembly/pom.xml</pom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
deleted file mode 100644
index d380581..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-try
-{
- File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
-
- if(result && !a.exists() ) {
- System.out.println( "File: " + a + " should have been generated, but was not." );
- result = false;
- }
-
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(a));
- String s = null;
-
- boolean foundA = false;
- boolean foundB = false;
- while( ( s = r.readLine() ) != null )
- {
- if ( s.equals( "file A" ) ) {
- foundA = true;
- }
- else if ( s.equals( "file B" ) ) {
- foundB = true;
- }
-
- if ( foundA && foundB )
- {
- result = true;
- break;
- }
- }
-
- if ( !result )
- {
- System.out.println( "File: " + a + " should contain lines:\nfile A\nfile B\n\n ...but didn't." );
- }
- }
-
- if(result && b.exists() ) {
- System.out.println( "File: " + b + " should not exist, but does." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties
deleted file mode 100644
index aa0aca5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-testProp=boo
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
deleted file mode 100644
index 9a6d02b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <version>1</version>
- <artifactId>assembly</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>handler-def</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
-
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml
deleted file mode 100644
index 56f9d9f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <files>
- <file>
- <source>src/config/a/file.txt</source>
- <outputDirectory>a</outputDirectory>
- <destName>file.txt</destName>
- </file>
- </files>
-
- <fileSets>
- <fileSet>
- <directory>src/config/b</directory>
- <outputDirectory>b</outputDirectory>
- </fileSet>
- </fileSets>
-
- <containerDescriptorHandlers>
- <containerDescriptorHandler>
- <handlerName>file.txt</handlerName>
- </containerDescriptorHandler>
- </containerDescriptorHandlers>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/config/a/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/config/a/file.txt
deleted file mode 100644
index d5941d0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/config/a/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-file A
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/config/b/file.txt b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/config/b/file.txt
deleted file mode 100644
index 81794e3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/config/b/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file B
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
deleted file mode 100644
index 5c64535..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.test</groupId>
- <version>1</version>
- <artifactId>handler-def</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index e971df5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
- <role-hint>file.txt</role-hint>
- <implementation>org.apache.maven.plugin.assembly.filter.SimpleAggregatingDescriptorHandler</implementation>
- <configuration>
- <filePattern>.*file.txt</filePattern>
- <outputPath>file.txt</outputPath>
- <commentChars>#</commentChars>
- </configuration>
- </component>
- </components>
-</component-set>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
deleted file mode 100644
index e05b9a3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>custom-handler-withMixedEntries</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
- <name>custom-handler-withMixedEntries</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>${invokerPluginVersion}</version>
-
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
- <streamLogs>true</streamLogs>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
-
- <executions>
- <execution>
- <id>handler-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>handler-def/pom.xml</pom>
- </configuration>
- </execution>
- <execution>
- <id>assembly-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <debug>true</debug>
- <pom>assembly/pom.xml</pom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
deleted file mode 100644
index d380581..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-try
-{
- File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
-
- if(result && !a.exists() ) {
- System.out.println( "File: " + a + " should have been generated, but was not." );
- result = false;
- }
-
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(a));
- String s = null;
-
- boolean foundA = false;
- boolean foundB = false;
- while( ( s = r.readLine() ) != null )
- {
- if ( s.equals( "file A" ) ) {
- foundA = true;
- }
- else if ( s.equals( "file B" ) ) {
- foundB = true;
- }
-
- if ( foundA && foundB )
- {
- result = true;
- break;
- }
- }
-
- if ( !result )
- {
- System.out.println( "File: " + a + " should contain lines:\nfile A\nfile B\n\n ...but didn't." );
- }
- }
-
- if(result && b.exists() ) {
- System.out.println( "File: " + b + " should not exist, but does." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
deleted file mode 100644
index 19aa0a9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test
deleted file mode 100644
index 98f0475..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/resources/META-INF/services/test.Test
+++ /dev/null
@@ -1 +0,0 @@
-test.Foo
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
deleted file mode 100644
index 330f4e0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
deleted file mode 100644
index a19d57a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <containerDescriptorHandlers>
- <containerDescriptorHandler>
- <handlerName>metaInf-services</handlerName>
- </containerDescriptorHandler>
- </containerDescriptorHandlers>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <outputDirectory>.</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test
deleted file mode 100644
index 112758a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/resources/META-INF/services/test.Test
+++ /dev/null
@@ -1 +0,0 @@
-test.Bar
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
deleted file mode 100644
index e71f88b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
deleted file mode 100644
index 602bd6b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-
-try
-{
- boolean fooFound = false;
- boolean barFound = false;
-
- JarFile file = new JarFile( new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" ) );
- JarEntry entry = file.getEntry( "META-INF/services/test.Test" );
- if ( entry == null )
- {
- return false;
- }
-
- BufferedReader br = new BufferedReader( new InputStreamReader( file.getInputStream( entry ) ) );
-
- String line = null;
- while( ( line = br.readLine() ) != null )
- {
- if ( line.equals( "test.Foo" ) )
- {
- fooFound = true;
- }
- else if ( line.equals( "test.Bar" ) )
- {
- barFound = true;
- }
-
- if ( fooFound && barFound )
- {
- break;
- }
- }
-
- if ( !fooFound )
- {
- System.out.println( "Cannot find entry 'test.Foo' in: " + entry.getName() );
- }
-
- if ( !barFound )
- {
- System.out.println( "Cannot find entry 'test.Bar' in: " + entry.getName() );
- }
-
- return fooFound && barFound;
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return false;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
deleted file mode 100644
index 19aa0a9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index d68fa9d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler1
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 8daf08f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
deleted file mode 100644
index 330f4e0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
deleted file mode 100644
index e597301..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <containerDescriptorHandlers>
- <containerDescriptorHandler>
- <handlerName>metaInf-spring</handlerName>
- </containerDescriptorHandler>
- </containerDescriptorHandlers>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <outputDirectory>.</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index 37d79f8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler1
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index da93b8e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-4.0.xsd
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
deleted file mode 100644
index e71f88b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
deleted file mode 100644
index 81c1ff1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-
-try
-{
- JarFile file = new JarFile( new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" ) );
- JarEntry handlerEntry = file.getEntry( "META-INF/spring.handlers" );
- if ( handlerEntry == null )
- {
- return false;
- }
-
- BufferedReader br = new BufferedReader( new InputStreamReader( file.getInputStream( handlerEntry ) ) );
-
- boolean aopFound = false;
- boolean ctxFound = false;
-
- String line = null;
- while( ( line = br.readLine() ) != null )
- {
- if ( line.endsWith( "AopNamespaceHandler1" ) )
- {
- aopFound = true;
- }
- else if ( line.endsWith( "ContextNamespaceHandler1" ) )
- {
- ctxFound = true;
- }
-
- if ( aopFound && ctxFound )
- {
- break;
- }
- }
-
- if ( !aopFound )
- {
- System.out.println( "Cannot find entry 'AopNamespaceHandler1' in: " + handlerEntry.getName() );
- return false;
- }
-
- br.close();
-
- if ( !ctxFound )
- {
- System.out.println( "Cannot find entry 'ContextNamespaceHandler1' in: " + handlerEntry.getName() );
- return false;
- }
-
- JarEntry schemaEntry = file.getEntry( "META-INF/spring.schemas" );
- if ( schemaEntry == null )
- {
- return false;
- }
-
- br = new BufferedReader( new InputStreamReader( file.getInputStream( schemaEntry ) ) );
-
- boolean found30 = false;
- boolean found40 = false;
-
- String line = null;
- while( ( line = br.readLine() ) != null )
- {
- if ( line.endsWith( "spring-aop-3.0.xsd" ) )
- {
- found30 = true;
- }
- else if ( line.endsWith( "spring-aop-4.0.xsd" ) )
- {
- found40 = true;
- }
-
- if ( found30 && found40 )
- {
- break;
- }
- }
-
- br.close();
-
- if ( !found30 )
- {
- System.out.println( "Cannot find entry 'spring-aop-3.0.xsd' in: " + schemaEntry.getName() );
- return false;
- }
-
- if ( !found40 )
- {
- System.out.println( "Cannot find entry 'spring-aop-4.0.xsd' in: " + schemaEntry.getName() );
- return false;
- }
-
- return true;
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return false;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml
deleted file mode 100644
index e588627..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>dep-transfilter-wildcard-massembly544</artifactId>
- <name>dep-transfilter-wildcard-massembly544</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <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>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml
deleted file mode 100644
index 2de4fd1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>maven-libs</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <includes>
- <include>org.apache.maven*</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
deleted file mode 100644
index b2f0e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File dir = new File( basedir, "target/dep-transfilter-wildcard-massembly544-1-bin/maven-libs" );
-File[] files = {
- new File( dir, "wagon-webdav-jackrabbit-1.0-beta-4.jar" ),
- new File( dir, "xercesMinimal-1.9.6.2.jar" ),
- new File( dir, "maven-reporting-api-2.0.4.jar" ),
- new File( dir, "doxia-sink-api-1.0-alpha-7.jar" )
-};
-
-boolean result = true;
-for( int i = 0; i<files.length; i++ )
-{
- if ( !files[i].exists() )
- {
- System.out.println( "Cannot find jar: " + files[i] + " (should be included via transitive pattern)." );
- result = false;
- }
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
deleted file mode 100644
index 59d04e3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
- <artifactId>project</artifactId>
- <name>project</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <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>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml
deleted file mode 100644
index b43ffd6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>maven-libs</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <includes>
- <include>org.apache.maven.wagon*</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
deleted file mode 100644
index ef0b5f9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File wagonJackrabbitJar = new File( basedir, "target/project-1-bin/maven-libs/wagon-webdav-jackrabbit-1.0-beta-4.jar" );
-File xercesMinimalJar = new File( basedir, "target/project-1-bin/maven-libs/xercesMinimal-1.9.6.2.jar" );
-
-if ( !wagonJackrabbitJar.exists() )
-{
- 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)." );
-}
-
-return wagonJackrabbitJar.exists() && xercesMinimalJar.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
deleted file mode 100644
index 34ce84b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>child</artifactId>
- <packaging>pom</packaging>
-
- <properties>
- <test.version>2.2.1</test.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${test.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bundle.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
deleted file mode 100644
index 7ab391b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <!-- TODO: Change ${pom.*} references to ${project.*} once maven-assembly-plugin 2.2-beta-3 is available -->
- <includeBaseDirectory>false</includeBaseDirectory>
- <id>bundle</id>
- <formats>
- <format>dir</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>org.apache.maven:maven-plugin-api</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/pom.xml
deleted file mode 100644
index 2e91781..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>child</module>
- </modules>
-
- <properties>
- <test.version>2.0.6</test.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
deleted file mode 100644
index 6440a7f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "child/target/child-1.0-bundle/maven-plugin-api-2.2.1.jar" );
-File f2 = new File( basedir, "child/target/child-1.0-bundle/maven-plugin-api-2.0.6.jar" );
-
-if ( !f.exists() || !f.isFile() )
-{
- System.out.println( f + " does not exist or is not a file." );
- return false;
-}
-
-if ( f2.exists() )
-{
- System.out.println( f2 + " should NOT have been included." );
- return false;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
deleted file mode 100644
index ee7257e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child1</artifactId>
-
- <properties>
- <foo>bar</foo>
- </properties>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
deleted file mode 100644
index 7fbbf7c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Project Version: ${project.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
deleted file mode 100644
index 0d799e1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
deleted file mode 100644
index 2bef25f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <outputDirectory>${artifact.properties.foo}</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
deleted file mode 100644
index bbad5ca..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
deleted file mode 100644
index bba6e83..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "child2/target/child2-1-bin/bar/child1-1.jar" );
-return f.exists() && f.isFile();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml
deleted file mode 100644
index ea8d89d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child2/pom.xml
deleted file mode 100644
index ca764f6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child2/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>2</version>
-
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child3/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child3/pom.xml
deleted file mode 100644
index 7ff08ad..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child3/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>child3</artifactId>
-
- <name>DependencySet::By-Version</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child2</artifactId>
- <version>2</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child3/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child3/src/main/assembly/bin.xml
deleted file mode 100644
index c6cfac0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/child3/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>${artifact.baseVersion}</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/pom.xml
deleted file mode 100644
index bc6177d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/verify.bsh
deleted file mode 100644
index bffb373..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-byDepVersion/verify.bsh
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-try
-{
- File dir = new File( basedir, "child3/target/child3-1-bin" );
-
- File f = new File( dir, "1/child1-1.jar" );
- if ( !f.exists() || !f.isFile() )
- {
- System.out.println( "Could not find dependency file: " + f );
- return false;
- }
-
- f = new File( dir, "2/child2-2.jar" );
- if ( !f.exists() || !f.isFile() )
- {
- System.out.println( "Could not find dependency file: " + f );
- return false;
- }
-
- return true;
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return false;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml
deleted file mode 100644
index 1e8a527..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>enum</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.mule</groupId>
- <artifactId>mule-core</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.mule.transports</groupId>
- <artifactId>mule-transport-vm</artifactId>
- <version>1.4.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/enum/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/enum/src/main/assembly/bin.xml
deleted file mode 100644
index d7bc970..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/enum/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <unpack>true</unpack>
- <includes>
- <include>org.mule:mule-core</include>
- <include>org.mule.transports:mule-transport-vm</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/pom.xml
deleted file mode 100644
index 9c2d612..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <modules>
- <module>enum</module>
- <module>wildcard</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/verify.bsh
deleted file mode 100644
index 734f6c7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/verify.bsh
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- File f1 = new File( basedir, "enum/target/enum-1-bin.jar" );
- File f2 = new File( basedir, "wildcard/target/wildcard-1-bin.jar" );
-
- JarFile jf1 = new JarFile( f1 );
- JarFile jf2 = new JarFile( f2 );
-
- for( Enumeration e = jf1.entries(); e.hasMoreElements(); )
- {
- JarEntry entry1 = (JarEntry) e.nextElement();
- JarEntry entry2 = (JarEntry) jf2.getEntry( entry1.getName() );
-
- if ( entry2 == null )
- {
- System.out.println( "Missing entry: " + entry1.getName() + " in " + f2 );
- result = false;
- }
- }
-
- for( Enumeration e = jf2.entries(); e.hasMoreElements(); )
- {
- JarEntry entry2 = (JarEntry) e.nextElement();
- JarEntry entry1 = (JarEntry) jf2.getEntry( entry2.getName() );
-
- if ( entry1 == null )
- {
- System.out.println( "Missing entry: " + entry2.getName() + " in " + f1 );
- result = false;
- }
-
- if ( !entry1.isDirectory() )
- {
- if ( entry2.isDirectory() )
- {
- System.out.println( "One file is directory, the other a file! Entry: " + entry2.getName() );
- result = false;
- }
- else
- {
- ByteArrayOutputStream b1 = new ByteArrayOutputStream();
-
- InputStream in = jf1.getInputStream( entry1 );
- byte[] buf = new byte[1024];
- int read = -1;
-
- while( ( read = in.read( buf ) ) > -1 )
- {
- b1.write( buf, 0, read );
- }
-
- ByteArrayOutputStream b2 = new ByteArrayOutputStream();
-
- in = jf2.getInputStream( entry2 );
- read = -1;
-
- while( ( read = in.read( buf ) ) > -1 )
- {
- b2.write( buf, 0, read );
- }
-
- if ( !Arrays.equals( b1.toByteArray(), b2.toByteArray() ) )
- {
- System.out.println( "Entries are not equal! Entry name: " + entry2.getName() );
- result = false;
- }
- }
- }
- }
-}
-catch ( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml
deleted file mode 100644
index 4bb3ac3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>wildcard</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.mule</groupId>
- <artifactId>mule-core</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.mule.transports</groupId>
- <artifactId>mule-transport-vm</artifactId>
- <version>1.4.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/wildcard/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/wildcard/src/main/assembly/bin.xml
deleted file mode 100644
index 6e65991..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-enum-vs-wildcard/wildcard/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <unpack>true</unpack>
- <includes>
- <include>org.mule:*</include>
- <include>org.mule.transports:*</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml
deleted file mode 100644
index ea8d89d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml
deleted file mode 100644
index ca764f6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>2</version>
-
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml
deleted file mode 100644
index 7ff08ad..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>child3</artifactId>
-
- <name>DependencySet::By-Version</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child2</artifactId>
- <version>2</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml
deleted file mode 100644
index f66d3ac..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml
deleted file mode 100644
index bc6177d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh
deleted file mode 100644
index 155a1d0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-try
-{
- File dir = new File( basedir, "child3/target/child3-1-bin" );
-
- File f = new File( dir, "child1-1.jar" );
- if ( !f.exists() || !f.isFile() )
- {
- System.out.println( "Could not find dependency file: " + f );
- return false;
- }
-
- f = new File( dir, "child2-2.jar" );
- if ( !f.exists() || !f.isFile() )
- {
- System.out.println( "Could not find dependency file: " + f );
- return false;
- }
-
- return true;
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return false;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
deleted file mode 100644
index 74dc08d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child3</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
deleted file mode 100644
index b36c135..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child3</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
deleted file mode 100644
index b449e20..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
deleted file mode 100644
index 93bdea9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
deleted file mode 100644
index f27916a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child4</artifactId>
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <property>
- <name>test-profile</name>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
deleted file mode 100644
index 97b3aaa..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <includes>
- <include>test:child1</include>
- </includes>
- <excludes>
- <exclude>test:child2</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
deleted file mode 100644
index 81cde6b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- <module>child4</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
deleted file mode 100644
index a280106..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-test-profile=true
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
deleted file mode 100644
index 0a76930..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-return new java.io.File( basedir, "child4/target/child4-1.0-SNAPSHOT-bin/child3-1.0-SNAPSHOT.jar" ).exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
deleted file mode 100644
index f91c3fc..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
deleted file mode 100644
index 524acff..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
deleted file mode 100644
index 33b41f7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
deleted file mode 100644
index 6452a11..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>true</unpack>
- <outputDirectory>/${artifact.artifactId}</outputDirectory>
- <fileMode>0444</fileMode>
- <directoryMode>0555</directoryMode>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
deleted file mode 100644
index e71f88b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
deleted file mode 100644
index 1b2a6b3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File file = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/child1/test.txt" );
-return file.exists() && file.canRead();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/README-jira.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/README-jira.txt
deleted file mode 100644
index bbc7907..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/README-jira.txt
+++ /dev/null
@@ -1 +0,0 @@
-MASSEMBLY-132
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml
deleted file mode 100644
index 034afe2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-matchScope</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
deleted file mode 100644
index 17df2b2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>dependencySet-matchScope</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml
deleted file mode 100644
index 5dc2d4b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml
deleted file mode 100644
index 61b695e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-matchScope</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh
deleted file mode 100644
index 8b29f24..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'lib/child1.jar' jar entry." );
-
- if ( jf.getEntry( "lib/child1.jar" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." );
-
- if ( jf.getEntry( "lib/junit.jar" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/README-jira.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/README-jira.txt
deleted file mode 100644
index bbc7907..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/README-jira.txt
+++ /dev/null
@@ -1 +0,0 @@
-MASSEMBLY-132
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml
deleted file mode 100644
index 1d9f073..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-nonTransitive</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/pom.xml
deleted file mode 100644
index 8d021f5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-nonTransitive</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/src/assemble/bin.xml
deleted file mode 100644
index ff3b767..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/pom.xml
deleted file mode 100644
index 19ad363..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-nonTransitive</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh
deleted file mode 100644
index 8b29f24..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'lib/child1.jar' jar entry." );
-
- if ( jf.getEntry( "lib/child1.jar" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." );
-
- if ( jf.getEntry( "lib/junit.jar" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml
deleted file mode 100644
index 44f495e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-notUnpacked</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
deleted file mode 100644
index bd74820..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>dependencySet-notUnpacked</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml
deleted file mode 100644
index b449e20..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml
deleted file mode 100644
index 1168770..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-notUnpacked</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh
deleted file mode 100644
index 8b29f24..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'lib/child1.jar' jar entry." );
-
- if ( jf.getEntry( "lib/child1.jar" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." );
-
- if ( jf.getEntry( "lib/junit.jar" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
deleted file mode 100644
index 1b476c4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml
deleted file mode 100644
index 2746f14..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-projectArtifactNotIncluded</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>Foo bar</name>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/assembly/bin.xml
deleted file mode 100644
index 7a10fbe..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <scope>compile</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java
deleted file mode 100644
index bd77ef3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/java/foo/Foo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package foo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-public class Foo {
- public static void main(String[] args) {
- System.out.println("Hello, World!");
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/webapp/WEB-INF/web.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1e2dfe8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>Foo bar</display-name>
-
- <servlet>
- <servlet-name>foobar</servlet-name>
- <servlet-class>foo.Foo</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>foobar</servlet-name>
- <url-pattern>/app/*</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
deleted file mode 100644
index 00be9cf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-if ( basedir == void )
-{
- basedir = new File( "." );
-}
-
-File depFile = new File( basedir, "target/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT-bin/lib/commons-logging-1.0.4.jar" );
-
-File projectArtifactFile = new File( basedir, "target/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT-bin/lib/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT.war" );
-
-System.out.println( "result: " + ( depFile.exists() && !projectArtifactFile.exists() ) );
-return depFile.exists() && !projectArtifactFile.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child1/pom.xml
deleted file mode 100644
index 39a1280..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child1/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child1/src/main/resources/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child1/src/main/resources/assembly-resources/test.txt
deleted file mode 100644
index 7fbbf7c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child1/src/main/resources/assembly-resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Project Version: ${project.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/pom.xml
deleted file mode 100644
index 37d60da..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml
deleted file mode 100644
index 889fdd0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
-
- <outputDirectory>/zz</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
-
- <unpack>true</unpack>
- <unpackOptions>
- <filtered>true</filtered>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/pom.xml
deleted file mode 100644
index bbad5ca..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh
deleted file mode 100644
index 4e5b3f6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked-filtered/verify.bsh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-try
-{
- File f = new File( basedir, "child2/target/child2-1-bin/zz/assembly-resources/test.txt" );
-
- BufferedReader r = new BufferedReader( new FileReader( f ) );
- if ( r.readLine().equals( "Project Version: 1" ) )
- {
- return true;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return false;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml
deleted file mode 100644
index ab0c300..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-unpacked</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
deleted file mode 100644
index c59ee65..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>dependencySet-unpacked</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml
deleted file mode 100644
index 153a6b2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>true</unpack>
- <outputDirectory>/${artifact.artifactId}</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml
deleted file mode 100644
index d6e0d0d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-unpacked</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh
deleted file mode 100644
index 1425d9e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'child1/' jar entry." );
-
- if ( jf.getEntry( "child1/" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'junit/' jar entry." );
-
- if ( jf.getEntry( "junit" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml
deleted file mode 100644
index 9257d76..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-unpackedExcludingMetaInf</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
deleted file mode 100644
index 4c20549..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>dependencySet-unpackedExcludingMetaInf</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml
deleted file mode 100644
index ce15875..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- <outputDirectory>/${artifact.artifactId}</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml
deleted file mode 100644
index 001616d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- <relativePath>../../../it-project-parent/pom.xml</relativePath>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-unpackedExcludingMetaInf</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh
deleted file mode 100644
index 6264f72..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'child1/' jar entry." );
-
- if ( jf.getEntry( "child1/" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for 'child1/META-INF' jar entry (should not exist)." );
-
- if ( jf.getEntry( "child1/META-INF" ) != null )
- {
- System.err.println( "child1/META-INF entry should not be present." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'junit/' jar entry." );
-
- if ( jf.getEntry( "junit" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml
deleted file mode 100644
index e644626..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-unpackedSubsetsTwice</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/main/java/test/App2.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/main/java/test/App2.java
deleted file mode 100644
index 6cdfeb5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/main/java/test/App2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App2
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
deleted file mode 100644
index deda144..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>dependencySet-unpackedSubsetsTwice</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/assemble/bin.xml
deleted file mode 100644
index 7bb748b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <unpack>true</unpack>
- <outputDirectory>/classes1</outputDirectory>
- <unpackOptions>
- <includes>
- <include>**/App.class</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <unpack>true</unpack>
- <outputDirectory>/classes2</outputDirectory>
- <unpackOptions>
- <includes>
- <include>**/App2.class</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/pom.xml
deleted file mode 100644
index bec023d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-unpackedSubsetsTwice</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh
deleted file mode 100644
index 5cc4493..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'classes1/test/App.class' jar entry." );
-
- if ( jf.getEntry( "classes1/test/App.class" ) == null )
- {
- System.err.println( "classes1/test/App.class entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'classes1/test/App2.class' jar entry." );
-
- if ( jf.getEntry( "classes1/test/App2.class" ) != null )
- {
- System.err.println( "classes1/test/App2.class should not be present." );
- result = false;
- }
-
- System.out.println( "Looking for 'classes2/test/App2.class' jar entry." );
-
- if ( jf.getEntry( "classes2/test/App2.class" ) == null )
- {
- System.err.println( "classes2/test/App2.class entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'classes2/test/App.class' jar entry." );
-
- if ( jf.getEntry( "classes2/test/App.class" ) != null )
- {
- System.err.println( "classes2/test/App.class should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml
deleted file mode 100644
index f5521f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-withExecutedProject</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.xml
deleted file mode 100644
index 98ea8af..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>dependencySet-withExecutedProject</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml
deleted file mode 100644
index 88fdf14..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml
deleted file mode 100644
index 0ecfe4c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dependencySet-withExecutedProject</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml
deleted file mode 100644
index 5dc2d4b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh
deleted file mode 100644
index 8f4aeba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/lib/child1.jar" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/README-jira.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/README-jira.txt
deleted file mode 100644
index 7b77c0e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/README-jira.txt
+++ /dev/null
@@ -1 +0,0 @@
-MASSEMBLY-111
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/pom.xml
deleted file mode 100644
index 7780780..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>include-project-artifact</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/main/assembly/bin.xml
deleted file mode 100644
index a513eab..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <scope>compile</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/verify.bsh
deleted file mode 100644
index 1c9fd40..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-artifact/verify.bsh
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- File dir = new File( basedir, "target/include-project-artifact-1.0-SNAPSHOT-bin" );
-
- System.out.println( "Checking for existence and file-ishness of: " + dir );
-
- if ( !dir.exists() || !dir.isDirectory() )
- {
- System.err.println( "assembled directory is missing or not a directory." );
- return false;
- }
-
- File projectArtifact = new File( dir, "lib/include-project-artifact-1.0-SNAPSHOT.jar" );
-
- System.out.println( "Looking for 'lib/include-project-artifact-1.0-SNAPSHOT.jar file in assembly." );
-
- if ( !projectArtifact.exists() )
- {
- System.err.println( "project-artifact entry is missing." );
- return false;
- }
-
- System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." );
-
- if ( new File( dir, "lib/junit-3.8.1.jar" ).exists() )
- {
- System.err.println( "junit jar should not be present." );
- return false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/README-jira.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/README-jira.txt
deleted file mode 100644
index 7b77c0e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/README-jira.txt
+++ /dev/null
@@ -1 +0,0 @@
-MASSEMBLY-111
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/pom.xml
deleted file mode 100644
index e784e4a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>include-project-attachments</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source-assembly</id>
- <phase>compile</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/bin.xml
deleted file mode 100644
index d561661..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <scope>compile</scope>
- <useProjectArtifact>true</useProjectArtifact>
- <useProjectAttachments>true</useProjectAttachments>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml
deleted file mode 100644
index 6974e86..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>target</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/verify.bsh
deleted file mode 100644
index ed176af..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-project-attachments/verify.bsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- File dir = new File( basedir, "target/include-project-attachments-1.0-SNAPSHOT-bin" );
-
- System.out.println( "Checking for existence and file-ishness of: " + dir );
-
- if ( !dir.exists() || !dir.isDirectory() )
- {
- System.err.println( "assembled directory is missing or not a directory." );
- return false;
- }
-
- File projectArtifact = new File( dir, "lib/include-project-attachments-1.0-SNAPSHOT.jar" );
-
- System.out.println( "Looking for 'lib/include-project-attachments-1.0-SNAPSHOT.jar file in assembly." );
-
- if ( !projectArtifact.exists() )
- {
- System.err.println( "project-attachments entry is missing." );
- return false;
- }
-
- File attachment = new File( dir, "lib/include-project-attachments-1.0-SNAPSHOT-src.zip" );
-
- System.out.println( "Looking for 'lib/include-project-attachments-1.0-SNAPSHOT-src.zip file in assembly." );
-
- if ( !attachment.exists() )
- {
- System.err.println( "project attachment entry is missing." );
- return false;
- }
-
- System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." );
-
- if ( new File( dir, "lib/junit-3.8.1.jar" ).exists() )
- {
- System.err.println( "junit jar should not be present." );
- return false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/README-jira.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/README-jira.txt
deleted file mode 100644
index 7b77c0e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/README-jira.txt
+++ /dev/null
@@ -1 +0,0 @@
-MASSEMBLY-111
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/pom.xml
deleted file mode 100644
index 745cde3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>include-provided</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/pom.xml
deleted file mode 100644
index 0743329..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>include-provided</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml
deleted file mode 100644
index 763dbd2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>provided</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/pom.xml
deleted file mode 100644
index e6adb3c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>include-provided</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/verify.bsh
deleted file mode 100644
index 8b29f24..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/include-provided/verify.bsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'lib/child1.jar' jar entry." );
-
- if ( jf.getEntry( "lib/child1.jar" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." );
-
- if ( jf.getEntry( "lib/junit.jar" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
deleted file mode 100644
index e667a1f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/pom.xml
deleted file mode 100644
index 57ff0d6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>including-pom-dependency</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
- <type>pom</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml
deleted file mode 100644
index 24644b6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/src/assemble/bin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib/${artifact.artifactId}</outputDirectory>
- <unpack>true</unpack>
- <excludes>
- <exclude>*:pom</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- <includes>
- <include>*:pom</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/src/main/java/com/nf/ass/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/src/main/java/com/nf/ass/App.java
deleted file mode 100644
index 5e58c53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/src/main/java/com/nf/ass/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh
deleted file mode 100644
index bf0e341..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-// verify that transitive deps of the POM dep were included.
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/plexus-utils" ).exists();
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/classworlds" ).exists();
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/junit" ).exists();
-
-// verify that the POM dep was included without extracting.
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/plexus-container-default.pom" ).exists();
-
-// verify that the jar associated with the POM dep wasn't included either.
-result = result && !new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/plexus-container-default" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
deleted file mode 100644
index e667a1f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/pom.xml
deleted file mode 100644
index 16ae3ac..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>including-sar-dependency</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-appserver-service-xmlrpc</artifactId>
- <version>2.0-alpha-3</version>
- <type>sar</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml
deleted file mode 100644
index d3cda55..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/src/assemble/bin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib/${artifact.artifactId}</outputDirectory>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/src/main/java/com/nf/ass/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/src/main/java/com/nf/ass/App.java
deleted file mode 100644
index 5e58c53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/src/main/java/com/nf/ass/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh
deleted file mode 100644
index 9842bdf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-// verify that transitive deps of the POM dep were included.
-result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin/lib/xmlrpc" ).exists();
-result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin/lib/plexus-xmlrpc" ).exists();
-
-result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin/lib/plexus-appserver-service-xmlrpc/lib/commons-codec-1.3.jar" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/pom.xml
deleted file mode 100644
index 7a17783..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-201</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.9</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.9</version>
- <classifier>javadoc</classifier>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/src/main/assembly/bin.xml
deleted file mode 100644
index 1e597d4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.maven:maven-model:jar</include>
- <include>org.apache.maven:maven-model:jar:sources</include>
- <include>org.apache.maven:maven-model:jar:javadoc</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/verify.bsh
deleted file mode 100644
index a8f6392..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-201/verify.bsh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File main = new File( basedir, "target/massembly-201-1-bin/maven-model-2.0.9.jar" );
-File sources = new File( basedir, "target/massembly-201-1-bin/maven-model-2.0.9-sources.jar" );
-File javadocs = new File( basedir, "target/massembly-201-1-bin/maven-model-2.0.9-javadoc.jar" );
-
-if ( !main.exists() )
-{
- System.out.println( "Main (unclassified) dependency jar is missing: " + main );
-}
-
-if ( !sources.exists() )
-{
- System.out.println( "Sources dependency jar is missing: " + sources );
-}
-
-if ( !javadocs.exists() )
-{
- System.out.println( "JavaDocs dependency jar is missing: " + javadocs );
-}
-
-return main.exists() && sources.exists() && javadocs.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/assembly.xml
deleted file mode 100644
index 9fb01d8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/assembly.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>dist</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/etc</directory>
- <outputDirectory>massembly-232-${version}/etc</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/pom.xml
deleted file mode 100644
index f4d9beb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-232</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/src/main/etc/hello.txt b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/src/main/etc/hello.txt
deleted file mode 100644
index 45b983b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/src/main/etc/hello.txt
+++ /dev/null
@@ -1 +0,0 @@
-hi
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/verify.bsh
deleted file mode 100644
index ef3128b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-232/verify.bsh
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File file = new File( basedir, "target/massembly-232-1-dist/massembly-232-1/etc/hello.txt" );
-
-System.out.println( "Test file exists? " + file.exists() );
-
-return file.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/pom.xml
deleted file mode 100644
index 75966b7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
-
- <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>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml
deleted file mode 100644
index 99851f1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/main/assembly/release.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java
deleted file mode 100644
index 5e8b990..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/main/java/HelloWorld.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class HelloWorld
-{
- public static String sayHello(String name)
- {
- return "Hello " + name + "!";
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java
deleted file mode 100644
index efb679e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-public class HelloWorldTest extends TestCase
-{
- public static final void testSayHello()
- {
- assertEquals("Hello World!", HelloWorld.sayHello("World"));
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/verify.bsh
deleted file mode 100644
index 4526652..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-235/verify.bsh
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File dir = new File( basedir, "target/massembly235-test-1-release" );
-
-File goodJar = new File( dir, "xmlenc-0.52.jar" );
-File badJar = new File( dir, "xmlenc-0.39.jar" );
-
-System.out.println( "Good version of xmlenc exists? " + goodJar.exists() );
-System.out.println( "Bad version of xmlenc doesn't exist? " + (!badJar.exists()) );
-
-return goodJar.exists() && !badJar.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/pom.xml
deleted file mode 100644
index 292c9f2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-345</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archiverConfig>
- <appxml>src/main/resources/application.xml</appxml>
- </archiverConfig>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/src/assemble/bin.xml
deleted file mode 100644
index 9a829a0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
-
- <formats>
- <format>ear</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>src/main/</directory>
- </fileSet>
- </fileSets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/src/main/resources/application.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/src/main/resources/application.xml
deleted file mode 100644
index e457be4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/src/main/resources/application.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/verify.bsh
deleted file mode 100644
index 4a820d3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-345/verify.bsh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-// verify that the ear is created
-result = new File( basedir, "target/massembly-345-1-bin.ear" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child1/pom.xml
deleted file mode 100644
index 2a94120..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app-module1</artifactId>
- <name>my-app-module1</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <artifactId>my-app-module2</artifactId>
- <groupId>com.mycompany.app</groupId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/App.java
deleted file mode 100644
index 357937d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mycompany.app;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child2/pom.xml
deleted file mode 100644
index f066cc8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child2/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app-module2</artifactId>
- <name>my-app-module2</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/App2.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/App2.java
deleted file mode 100644
index 250c5e9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/App2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mycompany.app;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Hello world!
- *
- */
-public class App2
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/pom.xml
deleted file mode 100644
index 7142ade..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>my-app</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app-module2</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/zip.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/src/main/assembly/zip.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/src/main/assembly/zip.xml
deleted file mode 100644
index 8087d45..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>com.mycompany.app:my-app-module1</include>
- </includes>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <!-- outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping -->
-
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/verify.bsh
deleted file mode 100644
index ff453bf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-395/verify.bsh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-
-
-File f = new File( basedir, "target/my-app-1.0-SNAPSHOT-bin.zip" );
-ZipFile zf = new ZipFile( f );
-
-ZipEntry child1InclEntry = zf.getEntry( "my-app-1.0-SNAPSHOT/modules/junit-3.8.1.jar" );
-
-if ( child1InclEntry == null )
-{
- System.out.println( "Expected junit.jar!" );
- return false;
-}
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/assembly.xml
deleted file mode 100644
index 13abb9f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/assembly.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>deploy-zip</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>dir1</outputDirectory>
- <includes>
- <include>commons-configuration:commons-configuration</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>dir2</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <excludes>
- <exclude>commons-configuration:commons-configuration</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/pom.xml
deleted file mode 100644
index 7be510b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
-
- <name>bug-test</name>
- <groupId>com.example.assembly</groupId>
- <artifactId>bug-test</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.6</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/verify.bsh
deleted file mode 100644
index ba96f4f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-619/verify.bsh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.zip.*;
-
-ZipFile zf = new ZipFile( new File( basedir, "target/bug-test-1.0-SNAPSHOT-deploy-zip.zip" ) );
-
-ZipEntry child1InclEntry = zf.getEntry( "bug-test-1.0-SNAPSHOT/dir2/classworlds-1.1.jar" );
-
-if ( child1InclEntry != null )
-{
- System.out.println( "Unexpected file in jar !" );
- return false;
-}
-
-return true;
-
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/invoker.properties
deleted file mode 100644
index 9afbffa..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml
deleted file mode 100644
index ec4bc1e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>massembly-99</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>module-a</artifactId>
- <name>Assembly Spike Module A</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/src/main/java/com/nf/ass/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/src/main/java/com/nf/ass/App.java
deleted file mode 100644
index 5e58c53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/src/main/java/com/nf/ass/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java
deleted file mode 100644
index 2112666..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml
deleted file mode 100644
index 0d9b494..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>massembly-99</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>module-b</artifactId>
- <name>Assembly Spike Module B</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/src/main/java/com/nf/ass/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/src/main/java/com/nf/ass/App.java
deleted file mode 100644
index 5e58c53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/src/main/java/com/nf/ass/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java
deleted file mode 100644
index 2112666..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/pom.xml
deleted file mode 100644
index 315326d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>massembly-99</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Assembly Spike</name>
- <modules>
- <module>module-a</module>
- <module>module-b</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots</url>
- </pluginRepository>
- </pluginRepositories>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml
deleted file mode 100644
index 76d09d6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/verify.bsh
deleted file mode 100644
index 0a6c04a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/massembly-99/verify.bsh
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/lib/jdom.jar" ).exists();
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/lib/velocity.jar" ).exists();
-
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
-
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
deleted file mode 100644
index f88d9ff..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
- <artifactId>mid-artifactId-wildcard-massembly570</artifactId>
- <name>mid-artifactId-wildcard-massembly570</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <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>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
deleted file mode 100644
index 7df67d3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>maven-libs</outputDirectory>
- <includes>
- <include>org.apache.maven.plugins:maven-*-plugin</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
deleted file mode 100644
index e7cd3b3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/verify.bsh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File dir = new File( basedir, "target/mid-artifactId-wildcard-massembly570-1-bin/maven-libs" );
-
-File[] files = {
- new File( dir, "maven-clean-plugin-2.4.1.jar" ),
- new File( dir, "maven-jar-plugin-2.3.2.jar")
-};
-
-boolean missing = false;
-for( int i = 0; i<files.length; i++ )
-{
- if ( !files[i].exists() )
- {
- System.out.println( "Missing jar: " + files[i] + " (should be included via wildcard pattern)." );
- missing = true;
- }
-}
-
-return !missing;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml
deleted file mode 100644
index 7ff27ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
- <artifactId>massembly-241</artifactId>
- <name>massembly-241</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <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>
- </dependency>
- <dependency>
- <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>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml
deleted file mode 100644
index d9186c8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>maven-libs</outputDirectory>
- <includes>
- <include>org.apache.maven.wagon*</include>
- <include>org.apache.maven.reporting*</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh
deleted file mode 100644
index 3c310d7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File wagonProviderJar = new File( basedir, "target/massembly-241-1-bin/maven-libs/wagon-provider-api-1.0-beta-4.jar" );
-File reportingImplJar = new File( basedir, "target/massembly-241-1-bin/maven-libs/maven-reporting-impl-2.0.4.1.jar" );
-
-if ( !wagonProviderJar.exists() )
-{
- 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)." );
-}
-
-return wagonProviderJar.exists() && reportingImplJar.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
deleted file mode 100644
index d66f297..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>project</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
deleted file mode 100644
index d57c36f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>some_directory</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
deleted file mode 100644
index 0424f51..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-// verify that the ear is created
-File dirWithMapping = new File( basedir, "target/project-1-bin/some_directory/junit.jar/" );
-
-if ( dirWithMapping.exists() )
-{
- 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;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
deleted file mode 100644
index 2fbc8f2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.github.runeflobakk</groupId>
- <artifactId>assembly-plugin-bug-demo</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-default-skin</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-unpacked-dependency</id>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/unpack-deps.xml</descriptor>
- </descriptors>
- <filters>
- <filter>src/main/filters/my.properties</filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml
deleted file mode 100644
index 9a79fed..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-
- <id>my-assembly</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>*:maven-default-skin:*:*</include>
- </includes>
- <outputDirectory>deps</outputDirectory>
- <unpack>true</unpack>
- <unpackOptions>
- <filtered>true</filtered>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties
deleted file mode 100644
index 6a3529e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-my.name=John Doe
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh
deleted file mode 100644
index e1f2927..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.zip.*;
-
-ZipFile zf = new ZipFile( new File( basedir, "target/assembly-plugin-bug-demo-1.0-SNAPSHOT-my-assembly.zip" ) );
-
-ZipEntry child1InclEntry = zf.getEntry( "assembly-plugin-bug-demo-1.0-SNAPSHOT/deps/META-INF/maven/org.apache.maven.skins/maven-default-skin/pom.xml" );
-
-if ( child1InclEntry == null )
-{
- System.out.println( "Incorrect path of unpacked jar file" );
- return false;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
deleted file mode 100644
index 9afbffa..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml
deleted file mode 100644
index 0ea29fa..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>using-moduleSet-implied-depSet</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>module-a</artifactId>
- <name>Assembly Spike Module A</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/main/java/com/nf/ass/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/main/java/com/nf/ass/App.java
deleted file mode 100644
index 5e58c53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/main/java/com/nf/ass/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java
deleted file mode 100644
index 2112666..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml
deleted file mode 100644
index c4357c3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>using-moduleSet-implied-depSet</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>module-b</artifactId>
- <name>Assembly Spike Module B</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java
deleted file mode 100644
index 5e58c53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java
deleted file mode 100644
index 2112666..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.nf.ass;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
deleted file mode 100644
index fc49e84..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>using-moduleSet-implied-depSet</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <modules>
- <module>module-a</module>
- <module>module-b</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots</url>
- </pluginRepository>
- </pluginRepositories>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml
deleted file mode 100644
index 539782c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
deleted file mode 100644
index b03fecc..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/jdom-1.0.jar" ).exists();
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/velocity-1.4.jar" ).exists();
-
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
-
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
deleted file mode 100644
index e2971b5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>jars-in-archive-root</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>bin</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh
deleted file mode 100644
index 04c3438..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "jars-in-archive-root-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-bin.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- System.out.println( "Looking for project-artifact jar zip entry." );
-
- ZipEntry je = zf.getEntry( basename + "/" + basename + ".jar" );
-
- if ( je == null )
- {
- System.out.println( "project artifact is missing from archive root dir." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml
deleted file mode 100644
index 928b51d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>component-descriptors-merged</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java
deleted file mode 100644
index 2b0959b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class AppChild1
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 0f56d44..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>child</role>
- <role-hint>one</role-hint>
- <implementation>test/AppChild1</implementation>
- </component>
- </components>
-</component-set>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
deleted file mode 100644
index cd74182..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>component-descriptors-merged</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml
deleted file mode 100644
index aeae9a6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>true</unpack>
- <outputDirectory>${artifact.artifactId}</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 6e540c5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>child</role>
- <role-hint>two</role-hint>
- <implementation>test/App</implementation>
- </component>
- </components>
-</component-set>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
deleted file mode 100644
index d79f907..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>component-descriptors-merged</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh
deleted file mode 100644
index b6a03dd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-jar-with-dependencies.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for component descriptor jar entry." );
-
- JarEntry je = jf.getEntry( "META-INF/plexus/components.xml" );
-
- if ( je == null )
- {
- System.err.println( "component descriptor is missing." );
- result = false;
- }
- else
- {
- InputStream instream = jf.getInputStream( je );
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buf = new byte[16];
- int read = -1;
-
- while( ( read = instream.read( buf ) ) > -1 )
- {
- baos.write( buf, 0, read );
- }
-
- String test = new String( baos.toByteArray() );
- System.out.println( test );
-
- result = test.indexOf( "one" ) > -1 && test.indexOf( "two" ) > -1;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
deleted file mode 100644
index 0f0ce1f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
deleted file mode 100644
index 2b0959b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class AppChild1
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
deleted file mode 100644
index 2702005..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-binary-assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
deleted file mode 100644
index aeae9a6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>true</unpack>
- <outputDirectory>${artifact.artifactId}</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
deleted file mode 100644
index 007c57b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
deleted file mode 100644
index 2369dc9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-jar-with-dependencies.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- System.out.println( "Looking for 'test/AppChild1.class' jar entry." );
-
- if ( jf.getEntry( "test/AppChild1.class" ) == null )
- {
- System.err.println( "child1 class is missing." );
- result = false;
- }
-
- if ( jf.getEntry( "test/App.class" ) == null )
- {
- System.err.println( "child2 class is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'junit/' jar entry." );
-
- if ( jf.getEntry( "junit/framework/TestCase.class" ) != null )
- {
- System.err.println( "junit jar should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml
deleted file mode 100644
index 8d47842..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>jar-with-dependencies-no-target-dir</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml
deleted file mode 100644
index 8112647..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>test:child1</include>
- </includes>
- <unpack>true</unpack>
- <outputDirectory>${artifact.artifactId}</outputDirectory>
- <scope>test</scope>
- <excludes>
- <exclude>junit:junit</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
deleted file mode 100644
index 99da4a3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- System.out.println( "Creating JarFile java.io.File." );
-
- File jarFile = new File( basedir, "target/jar-with-dependencies-no-target-dir-1.0-SNAPSHOT-jar-with-dependencies.jar" );
-
- System.out.println( "Checking for existence and file-ishness of: " + jarFile );
-
- if ( !jarFile.exists() || jarFile.isDirectory() )
- {
- System.err.println( "jar file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating JarFile instance." );
-
- JarFile jf = new JarFile( jarFile );
-
- if ( jf.getEntry( "test/App.class" ) == null )
- {
- System.err.println( "App class is missing." );
- result = false;
- }
-
- System.out.println( "Looking for absence of 'target/classes/test/App.class' jar entry." );
-
- if ( jf.getEntry( "target/classes/test/App.class" ) != null )
- {
- System.err.println( "target directory should not be present." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml
deleted file mode 100644
index 29dbe25..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>multimodule-sources-copied</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml
deleted file mode 100644
index dd45797..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>multimodule-sources-copied</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
deleted file mode 100644
index d50b186..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>multimodule-sources-copied</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh
deleted file mode 100644
index f32b690..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "multimodule-sources-copied-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-project.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- String childPath = basename + "/child1";
-
- System.out.println( "Checking child1 project files..." );
-
- System.out.println( "Looking for project source file." );
-
- ZipEntry je = zf.getEntry( childPath + "/src/main/java/test/App.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for project test-source file." );
-
- je = null;
- je = zf.getEntry( childPath + "/src/test/java/test/AppTest.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " test-source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for pom.xml file." );
-
- je = null;
- je = zf.getEntry( childPath + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( childPath + " POM missing." );
- result = false;
- }
-
- childPath = basename + "/child2";
-
- System.out.println( "Checking child2 project files..." );
-
- System.out.println( "Looking for project source file." );
-
- je = null;
- je = zf.getEntry( childPath + "/src/main/java/test/App.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for project test-source file." );
-
- je = null;
- je = zf.getEntry( childPath + "/src/test/java/test/AppTest.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " test-source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for pom.xml file." );
-
- je = null;
- je = zf.getEntry( childPath + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( childPath + " POM missing." );
- result = false;
- }
-
- System.out.println( "Looking for main pom.xml file." );
-
- je = null;
- je = zf.getEntry( basename + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( "project POM missing." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
deleted file mode 100644
index ecc205d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>multimodule-sources-copied</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
deleted file mode 100644
index c90b727..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>multimodule-sources-copied</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml
deleted file mode 100644
index 54d7345..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>multimodule-sources-copied</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
deleted file mode 100644
index b4d76f7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "multimodule-sources-copied-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-project.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- String childPath = basename + "/child1";
-
- System.out.println( "Checking child1 project files..." );
-
- System.out.println( "Looking for project source file." );
-
- ZipEntry je = zf.getEntry( childPath + "/src/main/java/test/App.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for project test-source file." );
-
- je = null;
- je = zf.getEntry( childPath + "/src/test/java/test/AppTest.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " test-source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for pom.xml file." );
-
- je = null;
- je = zf.getEntry( childPath + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( childPath + " POM missing." );
- result = false;
- }
-
- je = null;
- je = zf.getEntry( childPath + "/target/child1-1.0-SNAPSHOT.jar" );
-
- if ( je != null )
- {
- System.out.println( childPath + " target directory should not be included." );
- result = false;
- }
-
- childPath = basename + "/child2";
-
- System.out.println( "Checking child2 project files..." );
-
- System.out.println( "Looking for project source file." );
-
- je = null;
- je = zf.getEntry( childPath + "/src/main/java/test/App.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for project test-source file." );
-
- je = null;
- je = zf.getEntry( childPath + "/src/test/java/test/AppTest.java" );
-
- if ( je == null )
- {
- System.out.println( childPath + " test-source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for pom.xml file." );
-
- je = null;
- je = zf.getEntry( childPath + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( childPath + " POM missing." );
- result = false;
- }
-
- je = null;
- je = zf.getEntry( childPath + "/target/child2-1.0-SNAPSHOT.jar" );
-
- if ( je != null )
- {
- System.out.println( childPath + " target directory should not be included." );
- result = false;
- }
-
- System.out.println( "Looking for main pom.xml file." );
-
- je = null;
- je = zf.getEntry( basename + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( "project POM missing." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml
deleted file mode 100644
index 99649a1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>no-target-dir</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
deleted file mode 100644
index 4a5d537..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "no-target-dir-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-project.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- System.out.println( "Looking for project classes." );
-
- ZipEntry je = zf.getEntry( basename + "/target/classes/test/App.java" );
-
- if ( je != null )
- {
- System.out.println( "project classes should not be included." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
deleted file mode 100644
index b4645d1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>sources-copied</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/verify.bsh
deleted file mode 100644
index a2ad7a6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/project/sources-copied/verify.bsh
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "sources-copied-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-project.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- System.out.println( "Looking for project source file." );
-
- ZipEntry je = zf.getEntry( basename + "/src/main/java/test/App.java" );
-
- if ( je == null )
- {
- System.out.println( "project source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for project test-source file." );
-
- je = null;
- je = zf.getEntry( basename + "/src/test/java/test/AppTest.java" );
-
- if ( je == null )
- {
- System.out.println( "project test-source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for pom.xml file." );
-
- je = null;
- je = zf.getEntry( basename + "/pom.xml" );
-
- if ( je == null )
- {
- System.out.println( "project POM missing." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml
deleted file mode 100644
index 49aa72d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>no-target-dir</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
deleted file mode 100644
index fa08ffe..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "no-target-dir-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-src.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- System.out.println( "Looking for project classes." );
-
- ZipEntry je = zf.getEntry( basename + "/target/classes/test/App.class" );
-
- if ( je != null )
- {
- System.out.println( "project classes should not be present." );
- result = false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
deleted file mode 100644
index 299b368..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>src-dir-copied</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh
deleted file mode 100644
index f148edb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-String basename = "src-dir-copied-1.0-SNAPSHOT";
-
-try
-{
- File zipFile = new File( basedir, "target/" + basename + "-src.zip" );
-
- System.out.println( "Checking for existence and file-ishness of: " + zipFile );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip file is missing or a directory." );
- return false;
- }
-
- System.out.println( "Creating zipFile instance." );
-
- ZipFile zf = new ZipFile( zipFile );
-
- System.out.println( "Looking for project source file." );
-
- ZipEntry je = zf.getEntry( basename + "/src/main/java/test/App.java" );
-
- if ( je == null )
- {
- System.out.println( "project source file missing." );
- result = false;
- }
-
- System.out.println( "Looking for project test-source file." );
-
- je = null;
- je = zf.getEntry( basename + "/src/test/java/test/AppTest.java" );
-
- if ( je == null )
- {
- System.out.println( "project test-source file missing." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace( System.out );
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/invoker.properties
deleted file mode 100644
index 2b30b89..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/invoker.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
-invoker.os.family = !windows
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/pom.xml
deleted file mode 100644
index 3c10c60..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>file-set-fileMode</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml
deleted file mode 100644
index 93a2b3e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/assemble/src.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <fileMode>0400</fileMode>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/verify.bsh
deleted file mode 100644
index c279b83..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/file-set-fileMode/verify.bsh
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-FileWriter writer = null;
-
-try
-{
- File file = new File( basedir, "target/file-set-fileMode-1.0-SNAPSHOT-src/src/main/java/test/App.java" );
- if (!file.exists()) {
- System.out.println( "File: " + file + " expected." );
- return false;
- }
-
- writer = new FileWriter( file );
- writer.write( "This is a test." );
-
- System.out.println( "File: " + file + " should not be writable." );
-
- result = false;
-}
-catch( IOException e )
-{
- result = true;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
deleted file mode 100644
index 1b476c4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/pom.xml
deleted file mode 100644
index cb76370..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>fileItem-fileMode</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml
deleted file mode 100644
index 7a9411b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/assemble/src.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>src/main/java/test/App.java</source>
- <fileMode>0400</fileMode>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/verify.bsh
deleted file mode 100644
index f450b2f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-modes/fileItem-fileMode/verify.bsh
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-
-boolean result = true;
-
-FileWriter writer = null;
-
-try
-{
- File file = new File( basedir, "target/fileItem-fileMode-1.0-SNAPSHOT-src/App.java" );
- if (!file.exists()) {
- System.out.println( "File: " + file + " expected." );
- return false;
- }
-
- writer = new FileWriter( file );
- writer.write( "This is a test." );
-
- if ( System.getProperty( "os.name" ).toLowerCase( Locale.ENGLISH ).indexOf( "windows" ) >= 0 )
- {
- System.out.println( "Detected Windows - skipping" );
- return true;
- }
-
- System.out.println( "File: " + file + " should not be writable." );
-
- result = false;
-}
-catch( IOException e )
-{
- result = true;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/pom.xml
deleted file mode 100644
index 336586f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>default-directory-unspecified</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml
deleted file mode 100644
index 5b255fb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/src/main/assembly/src.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>*.*</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/verify.bsh
deleted file mode 100644
index 6264823..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-directory-unspecified/verify.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-String assemblyDir = "target/default-directory-unspecified-1.0-SNAPSHOT-src/";
-
-result = result && new File( basedir, assemblyDir + "build.log" ).exists();
-result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/pom.xml
deleted file mode 100644
index 1ee2aa0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>default-excludes-unspecified</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/main/assembly/src.xml
deleted file mode 100644
index 6c34124..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/main/assembly/src.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh
deleted file mode 100644
index e47426d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-String assemblyDir = "target/default-excludes-unspecified-1.0-SNAPSHOT-src/src/main/assembly/";
-
-result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
-result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/pom.xml
deleted file mode 100644
index 33b295f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>dont-use-default-excludes</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh
deleted file mode 100644
index ab3bd05..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File srcSvnDir = new File( basedir, "src/main/assembly/.svn" );
-srcSvnDir.mkdirs();
-
-File srcSvnFile = new File( srcSvnDir, "entries" );
-
-FileWriter writer = new FileWriter( srcSvnFile );
-writer.write( "Test, Test" );
-writer.flush();
-writer.close();
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/main/assembly/src.xml
deleted file mode 100644
index d3d6184..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/main/assembly/src.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <useDefaultExcludes>false</useDefaultExcludes>
- <directory>src</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/verify.groovy b/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/verify.groovy
deleted file mode 100644
index a7b841e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/dont-use-default-excludes/verify.groovy
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File assemblyDir = new File( basedir, "target/dont-use-default-excludes-1.0-SNAPSHOT-src/src/main/assembly" );
-
-assert new File( assemblyDir, "src.xml" ).exists();
-assert new File( assemblyDir, ".svn" ).exists();
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
deleted file mode 100644
index 39fe875..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- </parent>
- <name>Child</name>
- <artifactId>child</artifactId>
- <version>1.0</version>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/file.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/file.txt
deleted file mode 100644
index 345e6ae..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
deleted file mode 100644
index 9daeafb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt
deleted file mode 100644
index 9daeafb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/pom.xml
deleted file mode 100644
index 938b7ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <packaging>pom</packaging>
-
- <name>Parent</name>
- <modules>
- <module>child</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
deleted file mode 100644
index 4a004f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>src</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/*.log</exclude>
- <exclude>%regex[(?!((?!target/)[^/]+/)*src/).*target.*]</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties
deleted file mode 100644
index ac72d00..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-Test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
deleted file mode 100644
index 9daeafb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/target/omit.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/target/omit.txt
deleted file mode 100644
index 9daeafb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/target/omit.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/verify.bsh
deleted file mode 100644
index c606d16..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excludes-using-regex/verify.bsh
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-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;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/pom.xml
deleted file mode 100644
index d0333e1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>excluding-svn-dirs</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh
deleted file mode 100644
index ab3bd05..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File srcSvnDir = new File( basedir, "src/main/assembly/.svn" );
-srcSvnDir.mkdirs();
-
-File srcSvnFile = new File( srcSvnDir, "entries" );
-
-FileWriter writer = new FileWriter( srcSvnFile );
-writer.write( "Test, Test" );
-writer.flush();
-writer.close();
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/main/assembly/src.xml
deleted file mode 100644
index d447a9e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src</directory>
- <excludes>
- <exclude>**/.svn/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy b/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy
deleted file mode 100644
index e480b55..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-assert new File( basedir, "src/main/assembly/.svn" ).exists();
-
-File assemblyDir = new File( basedir, "target/excluding-svn-dirs-1.0-SNAPSHOT-src/src/main/assembly" );
-
-assert new File( assemblyDir, "src.xml" ).exists();
-assert !new File( assemblyDir, ".svn" ).exists();
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
deleted file mode 100644
index e5bc076..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>child</artifactId>
- <packaging>jar</packaging>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
deleted file mode 100644
index f2ab45c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/child/src/main/assembly-resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-${project.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/pom.xml
deleted file mode 100644
index 2a6d9d5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>child</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
deleted file mode 100644
index fb4abd0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.apache.maven.plugin.assembly.test:child</include>
- </includes>
- <sources>
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>src/main/assembly-resources</directory>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/verify.bsh
deleted file mode 100644
index 7289891..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-module-sources/verify.bsh
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "target/parent-1-src/child/test.txt" );
-
-if ( !f.exists() )
-{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
-}
-
-String line = null;
-
-BufferedReader reader = new BufferedReader( new FileReader( f ) );
-line = reader.readLine();
-reader.close();
-
-System.out.println( "First line of test.txt: '" + line + "' should equal the project version: '1'." );
-
-return "1".equals( line.trim() );
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
deleted file mode 100644
index ec1dd59..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>child</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
deleted file mode 100644
index f2ab45c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-${project.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
deleted file mode 100644
index 2fbfdbe..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>src/main/assembly-resources</directory>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/pom.xml
deleted file mode 100644
index f48be7e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>filtered-multimodule-parent</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>child</module>
- </modules>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
deleted file mode 100644
index 7e9b952..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>${test}</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
deleted file mode 100644
index 3b568c3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/verify.bsh
deleted file mode 100644
index 7a100ed..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/filtered-multimodule/verify.bsh
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "child/target/child-1-src/test.txt" );
-
-if ( !f.exists() )
-{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
-}
-
-String line = null;
-
-BufferedReader reader = new BufferedReader( new FileReader( f ) );
-line = reader.readLine();
-reader.close();
-
-System.out.println( "First line of test.txt: '" + line + "' should equal the project version: '1'." );
-
-return "1".equals( line.trim() );
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/pom.xml
deleted file mode 100644
index fc187bf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>include-base-directory</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/main/assembly/src.xml
deleted file mode 100644
index 6bb179e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src</directory>
- <excludes>
- <exclude>**/.svn/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/verify.bsh
deleted file mode 100644
index 37b711e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-base-directory/verify.bsh
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-String assemblyDir = "target/include-base-directory-1.0-SNAPSHOT-src/include-base-directory-1.0-SNAPSHOT/src/main/assembly/";
-
-result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/pom.xml
deleted file mode 100644
index 78fd9b2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>include-parent-dir</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/parent.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>build-parent-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>directory-single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.xml
deleted file mode 100644
index 6ddf5cd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>parent</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>..</directory>
- <outputDirectory></outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/pom.xml
deleted file mode 100644
index 9c25a1f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>include-parent-dir</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <modules>
- <module>child</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/verify.bsh
deleted file mode 100644
index fe42f24..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/include-parent-dir/verify.bsh
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-return new File( basedir, "child/target/child-1.0-SNAPSHOT-parent/child/pom.xml" ).exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/invoker.properties
deleted file mode 100644
index 728079c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/pom.xml
deleted file mode 100644
index b2d7b03..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>massembly-665</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/src/main/assembly/src.xml
deleted file mode 100644
index a6cd520..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/src/main/assembly/src.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/test/java/test</directory>
- <outputDirectory>bin</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>/src/test/java/test</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/src/test/java/test/aFile.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/src/test/java/test/aFile.txt
deleted file mode 100644
index d019a45..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/massembly-665/src/test/java/test/aFile.txt
+++ /dev/null
@@ -1 +0,0 @@
-A test file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml
deleted file mode 100644
index 1b9ebbf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- <relativePath>../../../../it-project-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>child</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly-resources/test.txt
deleted file mode 100644
index 67b7ddb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly-resources/test.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-${project.version}
-${project.artifactId}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
deleted file mode 100644
index f3e2f5f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>src/main/assembly-resources</directory>
- <filtered>true</filtered>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml
deleted file mode 100644
index 62562b3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- <relativePath>../../../it-project-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>filtered-multimodule-parent</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>child</module>
- </modules>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml
deleted file mode 100644
index 7e9b952..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>${test}</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
deleted file mode 100644
index 3b568c3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
deleted file mode 100644
index 181a8e8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "child/target/child-1-src/test.txt" );
-
-if ( !f.exists() )
-{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
-}
-
-StringBuffer sb = new StringBuffer();
-
-FileReader reader = new FileReader( f );
-char[] cbuf = new char[16];
-int read = -1;
-while( ( read = reader.read( cbuf ) ) > -1 )
-{
- sb.append( cbuf, 0, read );
-}
-
-reader.close();
-
-System.out.println( "Contents of test.txt: '" + sb.toString() + "' should contain the unix newline: '\\n'." );
-
-if ( sb.toString().indexOf( "1\nchild" ) == -1 )
-{
- System.out.println( "test.txt has wrong line ending" );
- return false;
-}
-if ( sb.toString().indexOf( "child\n" ) > -1 )
-{
- System.out.println( "test.txt has an extra line ending at the end of the file" );
- return false;
-}
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml
deleted file mode 100644
index ec1dd59..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>child</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly-resources/test.txt
deleted file mode 100644
index 67b7ddb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly-resources/test.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-${project.version}
-${project.artifactId}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
deleted file mode 100644
index fde76f4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>src/main/assembly-resources</directory>
- <filtered>true</filtered>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml
deleted file mode 100644
index 62562b3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- <relativePath>../../../it-project-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>filtered-multimodule-parent</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>child</module>
- </modules>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/assembly/bin.xml
deleted file mode 100644
index 7e9b952..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>${test}</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
deleted file mode 100644
index 3b568c3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
deleted file mode 100644
index 2dfae6d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "child/target/child-1-src/test.txt" );
-
-if ( !f.exists() )
-{
- System.out.println( "Filtered file from file-set: " + f + " is missing." );
- return false;
-}
-
-StringBuffer sb = new StringBuffer();
-
-FileReader reader = new FileReader( f );
-char[] cbuf = new char[16];
-int read = -1;
-while( ( read = reader.read( cbuf ) ) > -1 )
-{
- sb.append( cbuf, 0, read );
-}
-
-reader.close();
-
-System.out.println( "Contents of test.txt: '" + sb.toString() + "' should contain the windows newline: '\\r\\n'." );
-
-if ( sb.toString().indexOf( "1\r\nchild" ) == -1 )
-{
- System.out.println( "test.txt has wrong line ending" );
- return false;
-}
-if ( sb.toString().indexOf( "child\r\n" ) > -1 )
-{
- System.out.println( "test.txt has an extra line ending at the end of the file" );
- return false;
-}
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/adir/emptyfile.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/adir/emptyfile.txt
deleted file mode 100644
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/adir/emptyfile.txt
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/invoker.properties
deleted file mode 100644
index 728079c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/pom.xml
deleted file mode 100644
index f2fd2be..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>platform-specific-filesets</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/src.xml
deleted file mode 100644
index 99fd0c4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/src.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>adir</directory>
- </fileSet>
- <fileSet>
- <directory>/adir</directory>
- </fileSet>
- <fileSet>
- <directory>c:\adir</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/verify.groovy b/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/verify.groovy
deleted file mode 100644
index 9236d88..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/platformspecific-filesets/verify.groovy
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-File assemblyDir = new File( basedir, "build.log" );
-String buildOutput = org.codehaus.plexus.util.FileUtils.fileRead(assemblyDir)
-return buildOutput.contains("assembly descriptor contains a");
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/emptyfile.txt b/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/emptyfile.txt
deleted file mode 100644
index e69de29..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/emptyfile.txt
+++ /dev/null
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/pom.xml
deleted file mode 100644
index 91c7913..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>excluding-svn-dirs</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/src.xml
deleted file mode 100644
index 3e4fd13..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/src.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>emptyfile.txt</source>
- <destName>fud.txt</destName>
- </file>
- <file>
- <source>src.xml</source>
- <destName>fud.txt</destName>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/verify.groovy b/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/verify.groovy
deleted file mode 100644
index eb66b14..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/precedence-check/verify.groovy
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-File assemblyDir = new File( basedir, "target/excluding-svn-dirs-1.0-SNAPSHOT-src/fud.txt" );
-
-assert assemblyDir.length( ) == 0;
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/pom.xml
deleted file mode 100644
index 15552e6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>use-default-excludes</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/main/assembly/src.xml
deleted file mode 100644
index 46829ca..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/main/assembly/src.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <useDefaultExcludes>true</useDefaultExcludes>
- <directory>src</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/verify.bsh
deleted file mode 100644
index 8f4c8ec..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/file-sets/use-default-excludes/verify.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-String assemblyDir = "target/use-default-excludes-1.0-SNAPSHOT-src/src/main/assembly/";
-
-result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
-result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/pom.xml
deleted file mode 100644
index d795fbf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
-
- <name>Parent</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/src/assemble/bin.xml
deleted file mode 100644
index 1fa9bff..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/src/assemble/bin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>src/config/a/filtered.txt</source>
- <outputDirectory>a</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt b/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt
deleted file mode 100644
index c74f84a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/src/config/a/filtered.txt
+++ /dev/null
@@ -1 +0,0 @@
-OS Version: ${os.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/verify.bsh
deleted file mode 100644
index 85764ee..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/filtered-sysprop/verify.bsh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-try
-{
- String osVersion = System.getProperty( "os.version" );
- File a = new File( basedir, "target/parent-1.0-bin/a/filtered.txt");
-
- BufferedReader r = new BufferedReader(new FileReader(a));
- String line = r.readLine();
- if ( ! line.endsWith( osVersion ) )
- {
- System.out.println( "Expected OS version: " + osVersion );
- System.out.println( "Line was: " + line );
- return false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/a.properties b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/a.properties
deleted file mode 100644
index aa0aca5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/a.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-testProp=boo
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/pom.xml
deleted file mode 100644
index 822ef25..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>child</artifactId>
- <name>Child</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/assemble/bin.xml
deleted file mode 100644
index f2cd791..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/assemble/bin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>src/config/a/file.txt</source>
- <outputDirectory>a</outputDirectory>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/config/a/file.txt b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/config/a/file.txt
deleted file mode 100644
index 7301c3c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/config/a/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file A
-${testProp}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/config/b/file.txt b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/config/b/file.txt
deleted file mode 100644
index efc606f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/child/src/config/b/file.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-file B
-${testProp}
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/pom.xml
deleted file mode 100644
index d8c54b7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <name>Parent</name>
-
- <modules>
- <module>child</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/verify.bsh
deleted file mode 100644
index feec574..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/files/multimodule-relativePath/verify.bsh
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File a = new File( basedir, "child/target/child-1.0-bin/a/file.txt");
-
-if ( !a.exists() || !a.isFile() )
-{
- System.out.println( "Missing test file: " + a );
- return false;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml
deleted file mode 100755
index 7bec610..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
- <groupId>com.cregganna.samples</groupId>
- <artifactId>maven-assembly-plugin-2.5-crash</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <build>
-
- <filters>
- <filter>src/main/filters/test.properties</filter>
- </filters>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>prod-assemble</id>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- <configuration>
- <descriptors>
- <descriptors>src/main/assemblies/prod-assemble.xml</descriptors>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml
deleted file mode 100755
index 57f5922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>prod</id>
- <formats>
- <format>tar</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>src/main/filtered-config</directory>
- <outputDirectory>/config</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties
deleted file mode 100755
index 77c9d88..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# In maven-assembly-plugin:2.4.1
-# On Filtering during assembly the environment is "test-environment" showing that the
-# project.build.filters have been applied.
-# With the patch the environment then becomes the desired "prod-environment"
-environment=${filtered.environment}
-value.test=${filtered.test}
-value.prod=${filtered.prod}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties
deleted file mode 100755
index 0fee5ed..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-filtered.environment=prod-environment
-filtered.prod=prod.value
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties
deleted file mode 100755
index 8e032c0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-filtered.environment=test-environment
-filtered.test=test.value
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
deleted file mode 100644
index 9868a9c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>filtered-assembly</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <componentDescriptors>
- <!-- Needs to be interpolated before actual resolution -->
- <componentDescriptor>${project.basedir}/component.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
deleted file mode 100644
index 89cde8c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component>
- <files>
- <file>
- <source>pom.xml</source>
- </file>
- </files>
-</component>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
deleted file mode 100644
index a708935..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml
deleted file mode 100644
index 1d2aea3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>test</artifactId>
- <version>1.0</version>
- <name>Test</name>
-
- <!--
- Verify that the <componentDescriptor> elements of an assembly descriptor get interpolated before resolution
- of the component descriptor is attempted (MASSEMBLY-486).
- -->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
deleted file mode 100644
index e97847c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File file = new File( basedir, "target/test-1.0-filtered-assembly/pom.xml" );
-if ( !file.isFile() )
-{
- throw new IllegalStateException( "Missing: " + file );
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties
deleted file mode 100644
index 9ef4967..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
deleted file mode 100644
index c471291..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>filters-defined-in-build</artifactId>
- <packaging>pom</packaging>
-
- <build>
- <filters>
- <filter>${basedir}/src/main/filters/filter-build.properties</filter>
- </filters>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/descriptor.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <escapeString>\</escapeString>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
- </properties>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
deleted file mode 100644
index 01ec27a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>assembly</id>
-
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/config</directory>
- <outputDirectory></outputDirectory>
- <lineEnding>unix</lineEnding>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
deleted file mode 100644
index 8cd4d45..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-test.build.filter.props.1=${filter.build}
-escapedString=\${project.artifactId}
-non.ascii.characters=some characters åäö
-test.assembly.filter.props.1=${filter.assembly}
-test.pom.props.1=${project.artifactId}-${project.version}.${project.packaging}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
deleted file mode 100644
index 9dde704..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-test.build.filter.props.2=${filter.build}
-test.assembly.filter.props.2=${filter.assembly}
-test.pom.props.2=${project.artifactId}-${project.version}.${project.packaging}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
deleted file mode 100644
index cb46768..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-filter.assembly=Filter defined in the Assembly plugin's configuration.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
deleted file mode 100644
index 34dd0a3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-filter.build=Filter defined in the projects' build section.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
deleted file mode 100644
index d029edf..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-try
-{
- File file = new File( basedir, "target/filters-defined-in-build-1/file-1.properties");
- // This is a properties file encoded using ISO-8859-1
- BufferedReader r = new BufferedReader( new InputStreamReader( new FileInputStream( file ), "ISO-8859-1" ) );
- String s = r.readLine();
- if(s.contains("filter.build"))
- {
- System.out.println("file-1.properties was not filtered");
- return false;
- }
- s = r.readLine();
- if(!s.contains("escapedString=${project.artifactId}"))
- {
- System.out.println("file-1.properties did not escape filtering");
- return false;
- }
- s = r.readLine();
- if(!s.contains("åäö"))
- {
- System.out.println("file-1.properties has corrupted non ascii characters");
- return false;
- }
-
- file = new File( basedir, "target/filters-defined-in-build-1/file-2.properties");
- r = new BufferedReader(new FileReader(file));
- s = r.readLine();
- if(s.contains("filter.build"))
- {
- System.out.println("file-2.properties was not filtered");
- return false;
- }
-
- return true;
-}
-catch( IOException e )
-{
- e.printStackTrace();
- return false;
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties
deleted file mode 100644
index a38906a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-test.properties=foo
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
deleted file mode 100644
index a708935..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml
deleted file mode 100644
index 3609814..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml
deleted file mode 100644
index 2307b51..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>filtered-assembly</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>src/config/file.txt</source>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt
deleted file mode 100644
index fdf2c8f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-${test.properties}
-\${project.artifactId}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh
deleted file mode 100644
index 2f0d936..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- File file = new File( basedir, "target/parent-1.0-filtered-assembly/file.txt");
- if(result) {
- BufferedReader r = new BufferedReader(new FileReader(file));
- String s = r.readLine();
- result = s.equals("foo");
- if(result) {
- s = r.readLine();
- if(!s.contains("\\"))
- {
- System.out.println("file.txt escaped filtering");
- return false;
- }
- }
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/invoker.properties
deleted file mode 100644
index 9ef4967..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/invoker.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/pom.xml
deleted file mode 100644
index 3209334..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>filters-defined-in-build</artifactId>
- <packaging>pom</packaging>
-
- <build>
- <filters>
- <filter>${basedir}/src/main/filters/filter-build.properties</filter>
- </filters>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/descriptor.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <escapeString>\</escapeString>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <anExpr>über</anExpr>
- </properties>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/assembly/descriptor.xml b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/assembly/descriptor.xml
deleted file mode 100644
index fcbc4a5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/assembly/descriptor.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>assembly</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/config</directory>
- <outputDirectory></outputDirectory>
- <lineEnding>unix</lineEnding>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/config/aTextFileISO8859-1.txt b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/config/aTextFileISO8859-1.txt
deleted file mode 100644
index 150391c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/config/aTextFileISO8859-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bjørn is cool ${anExpr}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/config/file-1.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/config/file-1.properties
deleted file mode 100644
index d9bd5d1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/config/file-1.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-bøs=${anExpr}
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/filters/filter-assembly.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/filters/filter-assembly.properties
deleted file mode 100644
index cb46768..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/filters/filter-assembly.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-filter.assembly=Filter defined in the Assembly plugin's configuration.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/filters/filter-build.properties b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/filters/filter-build.properties
deleted file mode 100644
index 34dd0a3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/src/main/filters/filter-build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-filter.build=Filter defined in the projects' build section.
diff --git a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/verify.bsh
deleted file mode 100644
index bd8b8e8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/filtering-feature/massembly-736/verify.bsh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-try
-{
- File file = new File( basedir, "target/filters-defined-in-build-1/file-1.properties");
- Properties properties = new Properties( );
- properties.load( new FileInputStream( file ) );
- String value = properties.get("b\u00f8s");
-
- if (!value.equals("\u00FCber")){
- System.out.println("Expected über, found:" + value);
- return false;
- }
- return true;
-}
-catch( IOException e )
-{
- e.printStackTrace();
- return false;
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
deleted file mode 100644
index 5ff2c39..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>assembly-assembly-with-module-binaries</artifactId>
- <groupId>org.apache.maven.plugins.assembly.it</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
deleted file mode 100644
index a359964..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>assembly-assembly-with-module-binaries</artifactId>
- <groupId>org.apache.maven.plugins.assembly.it</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child2</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
deleted file mode 100644
index 9f1387a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
deleted file mode 100644
index a531d76..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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.apache.maven.plugins.assembly.it</groupId>
- <artifactId>assembly-assembly-with-module-binaries</artifactId>
-
- <version>1.0</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
deleted file mode 100644
index 84eb2d5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/test.properties b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/test.properties
deleted file mode 100644
index 8c0bdf8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/test.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-descriptor=src/assemble/bin.xml
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
deleted file mode 100644
index 4342cd3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-try
-{
- File zipFile = new File( basedir, "target/assembly-assembly-with-module-binaries-1.0-bin.zip" );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip-file is missing or a directory." );
- result = false;
- }
-
- ZipFile zf = new ZipFile( zipFile );
-
- if ( zf.getEntry( "assembly-assembly-with-module-binaries-1.0/modules/child1.jar" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- if ( zf.getEntry( "assembly-assembly-with-module-binaries-1.0/modules/child2.jar" ) == null )
- {
- System.err.println( "child2 entry is missing." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
deleted file mode 100644
index ed9a669..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>assembly-attached-with-module-binaries</artifactId>
- <groupId>org.apache.maven.plugins.assembly.it</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
deleted file mode 100644
index d741851..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>assembly-attached-with-module-binaries</artifactId>
- <groupId>org.apache.maven.plugins.assembly.it</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child2</artifactId>
- <name>Maven Quick Start Archetype</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
deleted file mode 100644
index e2bd4d7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml
deleted file mode 100644
index b98f9fb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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.apache.maven.plugins.assembly.it</groupId>
- <artifactId>assembly-attached-with-module-binaries</artifactId>
-
- <version>1.0</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
deleted file mode 100644
index 84eb2d5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/test.properties b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/test.properties
deleted file mode 100644
index 8c0bdf8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/test.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-descriptor=src/assemble/bin.xml
diff --git a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh
deleted file mode 100644
index a5f72ca..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.zip.*;
-
-boolean result = true;
-
-try
-{
- File zipFile = new File( basedir, "target/assembly-attached-with-module-binaries-1.0-bin.zip" );
-
- if ( !zipFile.exists() || zipFile.isDirectory() )
- {
- System.err.println( "zip-file is missing or a directory." );
- result = false;
- }
-
- ZipFile zf = new ZipFile( zipFile );
-
- if ( zf.getEntry( "assembly-attached-with-module-binaries-1.0/modules/child1.jar" ) == null )
- {
- System.err.println( "child1 entry is missing." );
- result = false;
- }
-
- if ( zf.getEntry( "assembly-attached-with-module-binaries-1.0/modules/child2.jar" ) == null )
- {
- System.err.println( "child2 entry is missing." );
- result = false;
- }
-
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml
deleted file mode 100644
index fdf4fd1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
-
- <!-- This is the key configuration for the test -->
- <ignorePermissions>true</ignorePermissions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml
deleted file mode 100644
index e347357..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- <fileMode>777</fileMode>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh
deleted file mode 100644
index 5fc410b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
-
-// minimal tests; the big thing here is that ignoring permissions doesn't stop the assembly from running...
-File pom = new File( basedir, "target/parent-1-bin/parent-1/pom.xml" );
-
-if ( !pom.exists() || !pom.isFile() )
-{
- System.out.println( "POM was not included in assembly." );
- return false;
-}
-
-File junitJar = new File( basedir, "target/parent-1-bin/parent-1/lib/junit-3.8.1.jar" );
-if ( !junitJar.exists() && !junitJar.isFile() )
-{
- System.out.println( "JUnit jar was not included in assembly." );
- return false;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
deleted file mode 100644
index 1ff55c5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>ignoreDirFormatExtensions</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>src2</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src2.xml</descriptor>
- </descriptors>
- <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
deleted file mode 100644
index 9eafc13..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
deleted file mode 100644
index 4d836ed..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src2</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
deleted file mode 100644
index 625474a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File src = new File( basedir, "target/ignoreDirFormatExtensions-1-src/pom.xml" );
-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 = src2;
-
- if ( !f.exists() )
- {
- System.out.println( "Project assembly directory is missing. Check-file was: " + f );
- }
-}
-
-return src.exists() && src2.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
deleted file mode 100644
index 65b05ef..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>manifest-with-customEntry</artifactId>
- <packaging>jar</packaging>
- <version>1</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
- <mainClass>test.App</mainClass>
- </manifest>
- <manifestEntries>
- <mode>development</mode>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh
deleted file mode 100644
index 5343be0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
-
-File file = new File( basedir, "target/manifest-with-customEntry-1-jar-with-dependencies.jar" );
-
-System.out.println( "file: " + file + " exists? " + file.exists() );
-
-JarFile jarFile = new JarFile( file );
-
-Manifest mf = jarFile.getManifest();
-
-Attributes attrs = mf.getMainAttributes();
-
-String mode = (String) attrs.get( new Attributes.Name( "mode" ) );
-
-System.out.println( "Got mode: " + mode );
-
-return "development".equals( mode );
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
deleted file mode 100644
index 19c09db..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>manifest-with-mainClass</artifactId>
- <packaging>jar</packaging>
- <version>1</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
- <mainClass>test.App</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh
deleted file mode 100644
index 071f08d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
-
-File file = new File( basedir, "target/manifest-with-mainClass-1-jar-with-dependencies.jar" );
-
-System.out.println( "file: " + file + " exists? " + file.exists() );
-
-JarFile jarFile = new JarFile( file );
-
-Manifest mf = jarFile.getManifest();
-
-Attributes attrs = mf.getMainAttributes();
-
-String mainClass = (String) attrs.get( Attributes.Name.MAIN_CLASS );
-
-System.out.println( "Got Main-Class: " + mainClass );
-
-return "test.App".equals( mainClass );
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/invoker.properties
deleted file mode 100644
index 75550e8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean deploy
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/pom.xml
deleted file mode 100644
index c6bfa69..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>massembly-291</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
deleted file mode 100644
index 3b22579..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>build.log</exclude>
- <exclude>${project.build.directory}/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/test.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/test.properties
deleted file mode 100644
index 586ead7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/test.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-altDeploymentRepository=test::default::file://${project.build.directory}/deploy
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/verify.bsh
deleted file mode 100644
index c487625..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-291/verify.bsh
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-String base = "target/deploy/org/test/massembly-291/1/massembly-291-1";
-File pom = new File( basedir, base + ".pom" );
-File zip = new File( basedir, base + ".zip" );
-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 = 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 );
- }
-}
-
-return pom.exists() && zip.exists() && tgz.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/invoker.properties
deleted file mode 100644
index 75550e8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean deploy
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/pom.xml
deleted file mode 100644
index 3fcccca..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>massembly-301</artifactId>
- <packaging>jar</packaging>
- <version>1</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
deleted file mode 100644
index 3b22579..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>build.log</exclude>
- <exclude>${project.build.directory}/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/test.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/test.properties
deleted file mode 100644
index 586ead7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/test.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-altDeploymentRepository=test::default::file://${project.build.directory}/deploy
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/verify.bsh
deleted file mode 100644
index 0f2c8df..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/massembly-301/verify.bsh
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-String base = "target/deploy/org/test/massembly-301/1/massembly-301-1";
-File jar = new File( basedir, base + ".jar" );
-File zip = new File( basedir, base + ".zip" );
-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 = 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 );
- }
-}
-
-return jar.exists() && zip.exists() && tgz.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
deleted file mode 100644
index 47cc494..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>no-appendAssemblyId-no-classifier</artifactId>
- <packaging>jar</packaging>
- <version>1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <type>maven-plugin</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh
deleted file mode 100644
index 3f7fc5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
-
-File file = new File( basedir, "target/no-appendAssemblyId-no-classifier-1.jar" );
-
-System.out.println( "file: " + file + " exists? " + file.exists() );
-
-JarFile jarFile = new JarFile( file );
-
-JarEntry entry = jarFile.getEntry( "org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.class" );
-
-return entry != null;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
deleted file mode 100644
index 1088930..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>skipAssemblyCLIPropertySet</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
deleted file mode 100644
index 835cffc..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
deleted file mode 100644
index 46cd704..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-assembly.skipAssembly=true
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
deleted file mode 100644
index 831a7f9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
-
-File file = new File( basedir, "target/skipAssemblyCLIPropertySet-1.zip" );
-
-return !file.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml
deleted file mode 100644
index 942f3f7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>single-in-one-project-hierarchy</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
deleted file mode 100644
index 962ccf7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>test</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh
deleted file mode 100644
index ebff7fb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-return new File( basedir, "target/single-in-one-project-hierarchy-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
deleted file mode 100644
index 1a83917..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>single-twice-in-multimodule-hierarchy</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>child1</artifactId>
- <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
deleted file mode 100644
index 962ccf7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>test</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
deleted file mode 100644
index a220157..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>single-twice-in-multimodule-hierarchy</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>child2</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
deleted file mode 100644
index 962ccf7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>test</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
deleted file mode 100644
index ad27575..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>single-twice-in-multimodule-hierarchy</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
deleted file mode 100644
index d084d55..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-boolean result = true;
-
-result = result && new File( basedir, "child1/target/child1-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists();
-result = result && new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
deleted file mode 100644
index 16d73c4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>single-in-one-project-hierarchy</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>first-assembly</id>
- <phase>package</phase>
- <configuration>
- <finalName>first</finalName>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- <execution>
- <id>second-assembly</id>
- <phase>package</phase>
- <configuration>
- <finalName>second</finalName>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
deleted file mode 100644
index 962ccf7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <scope>test</scope>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
deleted file mode 100644
index c1ff037..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/first-bin/lib/junit.jar" ).exists();
-result = result && new File( basedir, "target/second-bin/lib/junit.jar" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/pom.xml
deleted file mode 100644
index cb09610..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>massembly-298</artifactId>
- <groupId>org.test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Child 1</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java
deleted file mode 100644
index de889bd..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test.child1;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java
deleted file mode 100644
index e45e9ee..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/main/java/org/test/child1/App2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test.child1;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App2
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/pom.xml
deleted file mode 100644
index 3eb809a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>massembly-298</artifactId>
- <groupId>org.test</groupId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <name>Child 2</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java
deleted file mode 100644
index 2ed5856..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/child2/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test.child2;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java
deleted file mode 100644
index 59f7199..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/main/java/org/test/other/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test.other;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/invoker.properties
deleted file mode 100644
index 9f1387a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/pom.xml
deleted file mode 100644
index df6fe53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>massembly-298</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <name>Parent</name>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml
deleted file mode 100644
index ebdbed7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/src/assemble/bin.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.test:child1</include>
- </includes>
- <binaries>
- <outputDirectory>${artifact.artifactId}</outputDirectory>
- <includeDependencies>false</includeDependencies>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>org/test/child1/App2*</include>
- </includes>
- </unpackOptions>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.test:child2</include>
- </includes>
- <binaries>
- <outputDirectory>${artifact.artifactId}</outputDirectory>
- <includeDependencies>false</includeDependencies>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>org/test/other/*</exclude>
- </excludes>
- </unpackOptions>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/verify.bsh
deleted file mode 100644
index c6db984..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-298/verify.bsh
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.zip.*;
-
-ZipFile zf = new ZipFile( new File( basedir, "target/massembly-298-1-bin.zip" ) );
-
-ZipEntry child1InclEntry = zf.getEntry( "child1/org/test/child1/App2.class" );
-
-if ( child1InclEntry == null )
-{
- 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;
-}
-
-ZipEntry child2InclEntry = zf.getEntry( "child2/org/test/child2/App.class" );
-
-if ( child2InclEntry == null )
-{
- 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;
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/assembly.xml
deleted file mode 100644
index e298098..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/assembly.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>server/default</outputDirectory>
- <!-- outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping -->
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <!-- outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping -->
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:junit</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child1/pom.xml
deleted file mode 100644
index 11a0de7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child1/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?><project>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app-module1</artifactId>
- <name>my-app-module1</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <!-- dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency -->
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java
deleted file mode 100644
index 357937d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child1/src/main/java/com/mycompany/app/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mycompany.app;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child2/pom.xml
deleted file mode 100644
index 0813a53..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child2/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app-module2</artifactId>
- <name>my-app-module2</name>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/mycompany/app/App2.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/mycompany/app/App2.java
deleted file mode 100644
index 250c5e9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/child2/src/main/java/com/mycompany/app/App2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mycompany.app;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Hello world!
- *
- */
-public class App2
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/pom.xml
deleted file mode 100644
index 863b938..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-317/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>my-app</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.mycompany.app</groupId>
- <artifactId>my-app-module2</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/child-client/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/child-client/pom.xml
deleted file mode 100644
index 7ed55d4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/child-client/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-assembly-test</artifactId>
- <groupId>maven-assembly-test</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>maven-assembly-test</groupId>
- <artifactId>modul-client</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.2.0</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/child-server/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/child-server/pom.xml
deleted file mode 100644
index 1ac88e8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/child-server/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-assembly-test</artifactId>
- <groupId>maven-assembly-test</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>maven-assembly-test</groupId>
- <artifactId>modul-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-default-skin</artifactId>
- <version>1.0</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/pom.xml
deleted file mode 100644
index 2acabec..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-assembly-test</artifactId>
- <groupId>maven-assembly-test</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>maven-assembly-test</groupId>
- <artifactId>distribution</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/distribution.xml</descriptor>
- <descriptor>src/assembly/client.xml</descriptor>
- <descriptor>src/assembly/server.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>enforce-dont-exist</id>
- <phase>package</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireFilesDontExist>
- <message>Libary maven-default-skin-1.0.jar non client dependency!</message>
- <files>
- <file>${project.build.directory}/distribution-${project.version}-all/client/lib/maven-default-skin-1.0.jar</file>
- <file>${project.build.directory}/distribution-${project.version}-client/client/lib/maven-default-skin-1.0.jar</file>
- </files>
- </requireFilesDontExist>
- <requireFilesDontExist>
- <message>Libary maven-monitor-2.2.0.jar non server dependency!</message>
- <files>
- <file>${project.build.directory}/distribution-${project.version}-all/server/lib/maven-monitor-2.2.0.jar</file>
- <file>${project.build.directory}/distribution-${project.version}-server/server/lib/maven-monitor-2.2.0.jar</file>
- </files>
- </requireFilesDontExist>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <name>Test Distribution</name>
- <description>Distributionmodul</description>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/client.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/client.xml
deleted file mode 100644
index b75ce17..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/client.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>client</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <componentDescriptors>
- <componentDescriptor>component-client.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-client.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-client.xml
deleted file mode 100644
index 198e41e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-client.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
- <includes>
- <include>maven-assembly-test:*-client</include>
- </includes>
- <binaries>
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- <outputFileNameMapping>client/lib/${module.artifactId}.${module.extension}</outputFileNameMapping>
- <dependencySets>
- <!-- Bibliotheken -->
- <dependencySet>
- <outputDirectory>client/lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <!--
- <useStrictFiltering>true</useStrictFiltering>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- -->
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</component>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-server.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-server.xml
deleted file mode 100644
index 3704597..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/component-server.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
- <includes>
- <include>maven-assembly-test:modul-server</include>
- </includes>
- <binaries>
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- <outputFileNameMapping>server/lib/${module.artifactId}.${module.extension}</outputFileNameMapping>
- <dependencySets>
- <!-- Bibliotheken -->
- <dependencySet>
- <outputDirectory>server/lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <!--
- <useStrictFiltering>true</useStrictFiltering>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- -->
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</component>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/distribution.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/distribution.xml
deleted file mode 100644
index df02bbb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/distribution.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>all</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <componentDescriptors>
- <componentDescriptor>component-client.xml</componentDescriptor>
- <componentDescriptor>component-server.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/server.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/server.xml
deleted file mode 100644
index 703bac6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/descriptor/src/assembly/server.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>server</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <componentDescriptors>
- <componentDescriptor>component-server.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/pom.xml
deleted file mode 100644
index b83f35e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-474/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>maven-assembly-test</groupId>
- <artifactId>maven-assembly-test</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <description>Mulitproject for testing assembly </description>
- <build>
- <defaultGoal>clean package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- </plugins>
-
- </build>
- <modules>
- <module>child-client</module>
- <module>child-server</module>
- <module>descriptor</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/assembly.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/assembly.xml
deleted file mode 100644
index 6de3edb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/assembly.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>deploy-zip</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>dir1</outputDirectory>
- <includes>
- <include>commons-configuration:commons-configuration</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>dir2</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <excludes>
- <exclude>commons-configuration:commons-configuration</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/child-client/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/child-client/pom.xml
deleted file mode 100644
index 2f2a9ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/child-client/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-assembly-test</artifactId>
- <groupId>maven-assembly-test</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>maven-assembly-test</groupId>
- <artifactId>modul-client</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.2.0</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/descriptor/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
deleted file mode 100644
index 11ddf28..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-assembly-test</artifactId>
- <groupId>maven-assembly-test</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>maven-assembly-test</groupId>
- <artifactId>distribution</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/client.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>enforce-dont-exist</id>
- <phase>package</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireFilesDontExist>
- <message>Libary maven-default-skin-1.0.jar non client dependency!</message>
- <files>
- <file>
- ${project.build.directory}/distribution-${project.version}-all/client/lib/maven-default-skin-1.0.jar
- </file>
- <file>
- ${project.build.directory}/distribution-${project.version}-client/client/lib/maven-default-skin-1.0.jar
- </file>
- </files>
- </requireFilesDontExist>
- <requireFilesDontExist>
- <message>Libary maven-monitor-2.2.0.jar non server dependency!</message>
- <files>
- <file>
- ${project.build.directory}/distribution-${project.version}-all/server/lib/maven-monitor-2.2.0.jar
- </file>
- <file>
- ${project.build.directory}/distribution-${project.version}-server/server/lib/maven-monitor-2.2.0.jar
- </file>
- </files>
- </requireFilesDontExist>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <name>Test Distribution</name>
- <description>Distributionmodul</description>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/descriptor/src/assembly/client.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/descriptor/src/assembly/client.xml
deleted file mode 100644
index 6fe1626..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/descriptor/src/assembly/client.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>client</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
- <includes>
- <include>maven-assembly-test:*-client</include>
- </includes>
- <binaries>
- <unpack>false</unpack>
- <!-- includeDependencies>true</includeDependencies -->
- <!-- outputFileNameMapping>testdep</outputFileNameMapping -->
- <dependencySets>
- <dependencySet>
- <outputDirectory>dir1</outputDirectory>
- <includes>
- <include>commons-configuration:commons-configuration</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>dir2</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <excludes>
- <exclude>commons-configuration:commons-configuration</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/invoker.properties
deleted file mode 100644
index f902e50..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=install
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/pom.xml
deleted file mode 100644
index 2d2d095..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>maven-assembly-test</groupId>
- <artifactId>maven-assembly-test</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <description>Mulitproject for testing assembly</description>
- <build>
- <defaultGoal>clean package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${testVersion}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- </plugins>
-
- </build>
- <modules>
- <module>child-client</module>
- <module>descriptor</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/verify.bsh
deleted file mode 100644
index 64d79c8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/massembly-619/verify.bsh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.zip.*;
-
-File f = new File( basedir, "descriptor/target/distribution-0.0.1-SNAPSHOT-client/dir2/classworlds-1.1.jar" );
-
-return !f.exists();
-
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml
deleted file mode 100644
index 30048c9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Child 1</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml
deleted file mode 100644
index 31463e0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <name>Child 2</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml
deleted file mode 100644
index 3c32af1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
- <name>Child 3</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
deleted file mode 100644
index 9afbffa..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml
deleted file mode 100644
index 88f0d30..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <packaging>pom</packaging>
- <version>1.0</version>
-
- <name>Parent</name>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml
deleted file mode 100644
index c72e302..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.test:child1</include>
- <include>org.test:child3</include>
- </includes>
- <binaries>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <includeDependencies>true</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh
deleted file mode 100644
index 8c0e8db..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/parent-1.0-bin/lib/child1.jar" ).exists();
-result = result && new File( basedir, "target/parent-1.0-bin/lib/child3.jar" ).exists();
-
-result = result && !new File( basedir, "target/parent-1.0-bin/lib/child2.jar" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
deleted file mode 100644
index 70b5949..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>child</artifactId>
- <name>Child</name>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
deleted file mode 100644
index c74f84a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
+++ /dev/null
@@ -1 +0,0 @@
-OS Version: ${os.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
deleted file mode 100644
index 1aa0d44..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-try
-{
- String javaVersion = System.getProperty( "java.version" );
- File a = new File( basedir, "target/parent-1.0-bin/a/filtered.txt");
-
- BufferedReader r = new BufferedReader(new FileReader(a));
- String line = r.readLine();
- if ( ! line.endsWith( javaVersion ) )
- {
- System.out.println( "Expected java version: " + javaVersion + "\nLine was: " + line );
- return false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
deleted file mode 100644
index f304a2e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
-
- <packaging>pom</packaging>
- <name>Parent</name>
-
- <modules>
- <module>child</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
deleted file mode 100644
index 8e245fb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <sources>
- <fileSets>
- <fileSet>
- <directory>src/config/a</directory>
- <outputDirectory>a</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
deleted file mode 100644
index 920aa80..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-try
-{
- String osVersion = System.getProperty( "os.version" );
- File a = new File( basedir, "target/parent-1.0-bin/child/a/filtered.txt");
-
- BufferedReader r = new BufferedReader(new FileReader(a));
- String line = r.readLine();
- if ( ! line.endsWith( osVersion ) )
- {
- System.out.println( "Expected OS version: " + osVersion );
- System.out.println( "Line was: " + line );
- return false;
- }
-}
-catch( IOException e )
-{
- e.printStackTrace();
-}
-
-return true;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
deleted file mode 100644
index ee7257e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child1</artifactId>
-
- <properties>
- <foo>bar</foo>
- </properties>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
deleted file mode 100644
index 7fbbf7c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Project Version: ${project.version}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
deleted file mode 100644
index 0d799e1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- </parent>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>child1</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
deleted file mode 100644
index 905f2da..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
-
- <includes>
- <include>test:child1</include>
- </includes>
- <binaries>
- <outputDirectory>${module.properties.foo}/${module.artifactId}</outputDirectory>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
deleted file mode 100644
index bbad5ca..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
deleted file mode 100644
index a845244..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File f = new File( basedir, "child2/target/child2-1-bin/bar/child1" );
-return f.exists() && f.isDirectory();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml
deleted file mode 100644
index 509966b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml
deleted file mode 100644
index 2684487..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>test</groupId>
- <version>1</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/pom.xml
deleted file mode 100644
index 8369b76..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>test</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>../child1</module>
- <module>../child2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/src/assemble/src.xml
deleted file mode 100644
index b98a195..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/src/assemble/src.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>test:child1</include>
- <include>test:child2</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>sources/${artifact.artifactId}</outputDirectory>
- <directory>.</directory>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>**/*~</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh
deleted file mode 100644
index 1a8ac93..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/parent-1-src/sources/child1/pom.xml" ).exists();
-
-result = result && new File( basedir, "target/parent-1-src/sources/child2/pom.xml" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml
deleted file mode 100644
index 30048c9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Child 1</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml
deleted file mode 100644
index 31463e0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <name>Child 2</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml
deleted file mode 100644
index 3c32af1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
- <name>Child 3</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml
deleted file mode 100644
index 6448346..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <packaging>pom</packaging>
- <version>1.0</version>
-
- <name>Parent</name>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>directory-inline</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/src/assemble/src.xml
deleted file mode 100644
index c1a5e18..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/src/assemble/src.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.test:child1</include>
- <include>org.test:child3</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>sources/${artifact.artifactId}</outputDirectory>
- <directory>.</directory>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>**/*~</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.bsh
deleted file mode 100644
index 2ee5ee0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-sourceNotBinaries/verify.bsh
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/parent-1.0-src/sources/child1/pom.xml" ).exists();
-
-result = result && !new File( basedir, "target/parent-1.0-src/sources/child2/pom.xml" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml
deleted file mode 100644
index 30048c9..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
- <name>Child 1</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml
deleted file mode 100644
index 31463e0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
- <name>Child 2</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml
deleted file mode 100644
index 3c32af1..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
- <name>Child 3</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/main/java/org/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/main/java/org/test/App.java
deleted file mode 100644
index 5120975..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/main/java/org/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java
deleted file mode 100644
index 35ee617..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml
deleted file mode 100644
index 7117316..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.test</groupId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child4</artifactId>
- <name>Child 4 - Assembler</name>
- <version>1.0</version>
-
- <!-- Used to ensure this child is sorted LAST.
- NOT used by the assembly descriptor! -->
- <dependencies>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>child2</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>child3</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/src/assemble/bin.xml
deleted file mode 100644
index 96a138b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/src/assemble/bin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <!-- This is the key to this configuration -->
- <useAllReactorProjects>true</useAllReactorProjects>
-
- <includes>
- <include>org.test:child1</include>
- <include>org.test:child3</include>
- </includes>
- <binaries>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/pom.xml
deleted file mode 100644
index e2955e2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <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>
- <packaging>pom</packaging>
- <version>1.0</version>
-
- <name>Parent</name>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- <module>child4</module>
- </modules>
-
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh
deleted file mode 100644
index a8dd3cc..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/multimodule-wholeReactorFromChild/verify.bsh
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-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;
-}
-
-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;
-}
-
-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;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml
deleted file mode 100644
index fc9ab38..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml
deleted file mode 100644
index fdcc922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>child-level1-project2</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml
deleted file mode 100644
index 068aa96..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level2-project1</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
deleted file mode 100644
index eb95500..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml
deleted file mode 100644
index 7b389a0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level1-project1</module>
- <module>child-level1-project2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml
deleted file mode 100644
index cff7e87..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includeSubModules>false</includeSubModules>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh
deleted file mode 100644
index 505c36f..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
-
- result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml
deleted file mode 100644
index fc9ab38..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml
deleted file mode 100644
index fdcc922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>child-level1-project2</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml
deleted file mode 100644
index 068aa96..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level2-project1</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/invoker.properties
deleted file mode 100644
index eb95500..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/pom.xml
deleted file mode 100644
index 7b389a0..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level1-project1</module>
- <module>child-level1-project2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/src/assemble/bin.xml
deleted file mode 100644
index aa7f1a7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/verify.bsh
deleted file mode 100644
index 221ec12..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-level-multimodule/verify.bsh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-try
-{
- result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
- result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
-}
-catch( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml
deleted file mode 100644
index abed4e6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>two-levels-includeBaseDir-withBin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml
deleted file mode 100644
index fdcc922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>child-level1-project2</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml
deleted file mode 100644
index 40f618e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <groupId>test</groupId>
- <artifactId>two-levels-includeBaseDir-withBin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level2-project1</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
deleted file mode 100644
index 9afbffa..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml
deleted file mode 100644
index ecc836c..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>two-levels-includeBaseDir-withBin</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level1-project1</module>
- <module>child-level1-project2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml
deleted file mode 100644
index bb3fedb..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <binaries>
- <outputDirectory>modules</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh
deleted file mode 100644
index 4debfb2..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-boolean result = true;
-
-String finalName = "two-levels-includeBaseDir-withBin-1.0-SNAPSHOT";
-String rootDir = "target/" + finalName + "-bin/" + finalName + "/modules/";
-
-result = result && new File( basedir, rootDir + "child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
-
-result = result && new File( basedir, rootDir + "child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml
deleted file mode 100644
index 1eff5c8..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>two-levels-includeBaseDir-withSrc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml
deleted file mode 100644
index fdcc922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>child-level1-project2</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml
deleted file mode 100644
index 3d622ef..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <groupId>test</groupId>
- <artifactId>two-levels-includeBaseDir-withSrc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level2-project1</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml
deleted file mode 100644
index 402ea4e..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>two-levels-includeBaseDir-withSrc</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level1-project1</module>
- <module>child-level1-project2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml
deleted file mode 100644
index 5528b69..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includeSubModules>true</includeSubModules>
-
- <sources>
- <excludeSubModuleDirectories>true</excludeSubModuleDirectories>
- <includeModuleDirectory>true</includeModuleDirectory>
- <outputDirectoryMapping>modules/${module.artifactId}</outputDirectoryMapping>
-
- <fileSets>
- <fileSet>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/.svn/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh
deleted file mode 100644
index abae3a6..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-String finalName = "two-levels-includeBaseDir-withSrc-1.0-SNAPSHOT";
-String rootDir = "target/" + finalName + "-src/" + finalName + "/modules/";
-
-result = result && new File( basedir, rootDir + "child-level1-project1/pom.xml" ).exists();
-
-result = result && new File( basedir, rootDir + "child-level1-project2/pom.xml" ).exists();
-
-result = result && new File( basedir, rootDir + "child-level2-project1/pom.xml" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml
deleted file mode 100644
index fc9ab38..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml
deleted file mode 100644
index fdcc922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>child-level1-project2</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
deleted file mode 100644
index 6cdfeb5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App2
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
deleted file mode 100644
index 1e1b27b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App2.
- */
-public class App2Test
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public App2Test( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( App2Test.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp2()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml
deleted file mode 100644
index 068aa96..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level2-project1</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml
deleted file mode 100644
index bb28558..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level1-project1</module>
- <module>child-level1-project2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml
deleted file mode 100644
index a5bdfe5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includeSubModules>false</includeSubModules>
- <sources>
- <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
- <fileSets>
- <fileSet>
- <excludes>
- <exclude>**/.svn</exclude>
- <exclude>**/target</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
deleted file mode 100644
index 3a5ced7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project1/pom.xml" ).exists();
-
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/pom.xml" ).exists();
-
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/child-level2-project1/pom.xml" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml
deleted file mode 100644
index fc9ab38..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java
deleted file mode 100644
index d5c1205..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml
deleted file mode 100644
index fdcc922..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?><project>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
- <parent>
- <artifactId>child-level1-project2</artifactId>
- <groupId>test</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
deleted file mode 100644
index 6cdfeb5..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App2
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
deleted file mode 100644
index 1e1b27b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App2.
- */
-public class App2Test
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public App2Test( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( App2Test.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp2()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml
deleted file mode 100644
index 068aa96..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <parent>
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level2-project1</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
deleted file mode 100644
index c686d5b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml
deleted file mode 100644
index bb28558..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>test</groupId>
- <artifactId>two-level-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>child-level1-project1</module>
- <module>child-level1-project2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml
deleted file mode 100644
index 0cf029b..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <sources>
- <fileSets>
- <fileSet>
- <excludes>
- <exclude>**/.svn</exclude>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
deleted file mode 100644
index b256f9d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.jar.*;
-
-boolean result = true;
-
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project1/pom.xml" ).exists();
-
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/pom.xml" ).exists();
-
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level2-project1/pom.xml" ).exists();
-
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/child-level2-project1/pom.xml" ).exists();
-
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project1/target" ).exists();
-
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/target" ).exists();
-
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level2-project1/target" ).exists();
-
-return result;
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/pom.xml
deleted file mode 100644
index a20dbd7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>repository-assembly</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>assembly</finalName>
- </configuration>
-
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/assemble/bin.xml
deleted file mode 100644
index 33fe72d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <repositories>
- <repository>
- <outputDirectory>repo</outputDirectory>
- <scope>test</scope>
- <includes>
- <include>junit:junit</include>
- </includes>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java
deleted file mode 100644
index 3b568c3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
deleted file mode 100644
index 2178c35..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/verify.bsh
deleted file mode 100644
index ba85131..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/basic-repository/verify.bsh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File junitJar = new File( basedir, "target/assembly-bin/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
-
-return junitJar.exists();
-
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/invoker.properties
deleted file mode 100644
index c743aa4..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=clean package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/pom.xml
deleted file mode 100644
index 4283dee..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>massembly-196</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <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>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>single-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml
deleted file mode 100644
index bee9748..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <repositories>
- <repository>
- <includeMetadata>true</includeMetadata>
- <outputDirectory>repo</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>org.apache.maven.plugins</id>
- <version>2.0</version>
- <excludes>
- <exclude>maven-surefire-plugin</exclude>
- </excludes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/src/main/java/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/src/main/java/test/App.java
deleted file mode 100644
index d0442f3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/src/main/java/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/verify.bsh
deleted file mode 100644
index f1777fc..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/massembly-196/verify.bsh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-File jarPlugin = new File( basedir, "target/massembly-196-1-bin/repo/org/apache/maven/plugins/maven-jar-plugin/2.0/maven-jar-plugin-2.0.jar" );
-File surefirePlugin = new File( basedir, "target/massembly-196-1-bin/repo/org/apache/maven/plugins/maven-surefire-plugin/2.3/maven-surefire-plugin-2.3.jar" );
-
-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" );
-}
-
-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" );
-}
-
-return jarPlugin.exists() && surefirePlugin.exists();
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml
deleted file mode 100644
index 24582e7..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>repo-with-snapshot-parents</artifactId>
- <version>1-SNAPSHOT</version>
- </parent>
- <artifactId>child</artifactId>
- <packaging>jar</packaging>
-
- <repositories>
- <repository>
- <id>my.remote</id>
- <url>file://${basedir}/remote-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>assembly</finalName>
- </configuration>
-
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar
deleted file mode 100644
index 6e4cf2a..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom
deleted file mode 100644
index 3587217..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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">
- <parent>
- <artifactId>plexus</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- <version>1.0.11</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>plexus-utils</artifactId>
- <name>Plexus Common Utilities</name>
- <version>1.4.3-SNAPSHOT</version>
- <url>http://plexus.codehaus.org/plexus-utils</url>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- surefire requires plexus-utils to be jdk 1.3 compatible -->
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- required to ensure the test classes are used, not surefire's plexus-utils -->
- <childDelegation>true</childDelegation>
- <excludes>
- <exclude>org/codehaus/plexus/util/FileBasedTestCase.java</exclude>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>JAVA_HOME</name>
- <value>${JAVA_HOME}</value>
- </property>
- <property>
- <name>M2_HOME</name>
- <value>${M2_HOME}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <scm>
- <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-utils/trunk/</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-utils/trunk</developerConnection>
- <url>http://fisheye.codehaus.org/browse/plexus/plexus-utils/trunk/</url>
- </scm>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
deleted file mode 100644
index 28ee574..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+++ /dev/null
@@ -1,308 +0,0 @@
-<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>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus</artifactId>
- <packaging>pom</packaging>
- <name>Plexus</name>
- <version>1.0.11</version>
- <ciManagement>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>dev@plexus.codehaus.org</address>
- </configuration>
- </notifier>
- <notifier>
- <type>irc</type>
- <configuration>
- <host>irc.codehaus.org</host>
- <port>6667</port>
- <channel>#plexus</channel>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <inceptionYear>2001</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <mailingLists>
- <mailingList>
- <name>Plexus User List</name>
- <subscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</subscribe>
- <unsubscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</unsubscribe>
- <archive>http://archive.plexus.codehaus.org/user</archive>
- </mailingList>
- <mailingList>
- <name>Plexus Developer List</name>
- <subscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</subscribe>
- <unsubscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</unsubscribe>
- <archive>http://archive.plexus.codehaus.org/dev</archive>
- </mailingList>
- <mailingList>
- <name>Plexus Announce List</name>
- <subscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</subscribe>
- <unsubscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</unsubscribe>
- <archive>http://archive.plexus.codehaus.org/announce</archive>
- </mailingList>
- <mailingList>
- <name>Plexus Commit List</name>
- <subscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</subscribe>
- <unsubscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</unsubscribe>
- <archive>http://archive.plexus.codehaus.org/scm</archive>
- </mailingList>
- </mailingLists>
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.codehaus.org/browse/PLX</url>
- </issueManagement>
-
- <distributionManagement>
- <repository>
- <id>codehaus.org</id>
- <name>Plexus Central Repository</name>
- <url>dav:https://dav.codehaus.org/repository/plexus</url>
- </repository>
- <snapshotRepository>
- <id>codehaus.org</id>
- <name>Plexus Central Development Repository</name>
- <url>dav:https://dav.codehaus.org/snapshots.repository/plexus</url>
- </snapshotRepository>
- <site>
- <id>codehaus.org</id>
- <url>dav:https://dav.codehaus.org/plexus</url>
- </site>
- </distributionManagement>
- <repositories>
- <repository>
- <id>codehaus.snapshots</id>
- <name>Codehaus Snapshot Development Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <developers>
- <developer>
- <id>jvanzyl</id>
- <name>Jason van Zyl</name>
- <email>jason@maven.org</email>
- <roles>
- <role>Developer</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- <developer>
- <id>kaz</id>
- <name>Pete Kazmier</name>
- <email />
- <organization />
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>jtaylor</id>
- <name>James Taylor</name>
- <email>james@jamestaylor.org</email>
- <organization />
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>dandiep</id>
- <name>Dan Diephouse</name>
- <email>dan@envoisolutions.com</email>
- <organization>Envoi solutions</organization>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>kasper</id>
- <name>Kasper Nielsen</name>
- <email>apache@kav.dk</email>
- <organization />
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>bwalding</id>
- <name>Ben Walding</name>
- <email>bwalding@codehaus.org</email>
- <organization>Walding Consulting Services</organization>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>mhw</id>
- <name>Mark Wilkinson</name>
- <email>mhw@kremvax.net</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>michal</id>
- <name>Michal Maczka</name>
- <email>mmaczka@interia.pl</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <id>evenisse</id>
- <name>Emmanuel Venisse</name>
- <email>evenisse@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Trygve Laugstol</name>
- <id>trygvis</id>
- <email>trygvis@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Kenney Westerhof</name>
- <id>kenney</id>
- <email>kenney@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Carlos Sanchez</name>
- <id>carlos</id>
- <email>carlos@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Brett Porter</name>
- <id>brett</id>
- <email>brett@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>John Casey</name>
- <id>jdcasey</id>
- <email>jdcasey@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Andrew Williams</name>
- <id>handyande</id>
- <email>andy@handyande.co.uk</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rahul Thakur</name>
- <id>rahul</id>
- <email>rahul.thakur.xdev@gmail.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Joakim Erdfelt</name>
- <id>joakime</id>
- <email>joakim@erdfelt.com</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Olivier Lamy</name>
- <id>olamy</id>
- <email>olamy@codehaus.org</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <scm>
- <connection>scm:svn:http://svn.codehaus.org/plexus/pom/trunk/</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/plexus/pom/trunk/</developerConnection>
- <url>http://fisheye.codehaus.org/browse/plexus/pom/trunk/</url>
- </scm>
- <organization>
- <name>Codehaus</name>
- <url>http://www.codehaus.org/</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.1.1-SNAPSHOT</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- </plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <goals>deploy</goals>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml
deleted file mode 100644
index 33fe72d..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<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>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <repositories>
- <repository>
- <outputDirectory>repo</outputDirectory>
- <scope>test</scope>
- <includes>
- <include>junit:junit</include>
- </includes>
- </repository>
- </repositories>
-</assembly>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java
deleted file mode 100644
index 3b568c3..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
deleted file mode 100644
index 2178c35..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.plugin.assembly.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties
deleted file mode 100644
index 4b2a3ba..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.goals=package
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
deleted file mode 100644
index b71afea..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
- <artifactId>repo-with-snapshot-parents</artifactId>
- <packaging>pom</packaging>
- <version>1-SNAPSHOT</version>
-
- <modules>
- <module>child</module>
- </modules>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh b/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
deleted file mode 100644
index f078118..0000000
--- a/maven-assembly-plugin-2.x/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-
-File junitJar = new File( basedir, "child/target/assembly-bin/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
-boolean junitExists = junitJar.exists();
-
-File plexusUtilsJar = new File( basedir, "child/target/assembly-bin/repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar" );
-boolean puJarExists = plexusUtilsJar.exists();
-
-File plexusUtilsPom = new File( basedir, "child/target/assembly-bin/repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom" );
-boolean puPomExists = plexusUtilsPom.exists();
-
-File plexusPom = new File( basedir, "child/target/assembly-bin/repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom" );
-boolean plexusPomExists = plexusPom.exists();
-
-File parentPom = new File( basedir, "child/target/assembly-bin/repo/org/apache/maven/plugin/assembly/test/repo-with-snapshot-parents/1-SNAPSHOT/repo-with-snapshot-parents-1-SNAPSHOT.pom" );
-boolean plexusPomExists = plexusPom.exists();
-
-return junitExists && puJarExists && puPomExists && plexusPomExists && parentPomExists;
diff --git a/maven-assembly-plugin-2.x/src/it/settings.xml b/maven-assembly-plugin-2.x/src/it/settings.xml
deleted file mode 100644
index 1a4fc98..0000000
--- a/maven-assembly-plugin-2.x/src/it/settings.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<settings>
- <profiles>
- <profile>
- <id>it-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshot.codehaus</id>
- <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache.snapshot</id>
- <url>https://repository.apache.org/content/groups/snapshots-group/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</settings>
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
deleted file mode 100644
index 0e33e8b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.filtering.MavenReaderFilter;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public interface AssemblerConfigurationSource
-{
-
- /**
- * @return The descriptor.
- */
- String getDescriptor();
-
- /**
- * @return The descriptor id.
- */
- String getDescriptorId();
-
- /**
- * @return The descriptors.
- */
- String[] getDescriptors();
-
- /**
- * @return The descriptor references.
- */
- String[] getDescriptorReferences();
-
- /**
- * @return The descriptor source direcotoy.
- */
- File getDescriptorSourceDirectory();
-
- /**
- * @return The base directory.
- */
- File getBasedir();
-
- /**
- * @return The Maven Project.
- */
- MavenProject getProject();
-
- /**
- * @return Site included.
- */
- boolean isSiteIncluded();
-
- /**
- * @return The site directory.
- */
- File getSiteDirectory();
-
- /**
- * @return The final name.
- */
- String getFinalName();
-
- /**
- * @return append the assembly id.
- */
- boolean isAssemblyIdAppended();
-
- /**
- * @return The classifier.
- */
- String getClassifier();
-
- /**
- * @return Tar long file mode.
- */
- String getTarLongFileMode();
-
- /**
- * @return The output directory.
- */
- File getOutputDirectory();
-
- /**
- * @return The working direcotory.
- */
- File getWorkingDirectory();
-
- /**
- * @return the jar archive configuration.
- */
- MavenArchiveConfiguration getJarArchiveConfiguration();
-
- /**
- * @return The local repository.
- */
- ArtifactRepository getLocalRepository();
-
- /**
- * @return The temporary root directory.
- */
- File getTemporaryRootDirectory();
-
- /**
- * @return The archive base directory.
- */
- File getArchiveBaseDirectory();
-
- /**
- * @return The filters.
- */
- List<String> getFilters();
-
- /**
- * @return include the project build filters or not.
- */
- boolean isIncludeProjectBuildFilters();
-
- /**
- * @return The list of reactor projects.
- */
- List<MavenProject> getReactorProjects();
-
- /**
- * @return The remote repositories.
- */
- List<ArtifactRepository> getRemoteRepositories();
-
- /**
- * @return Is this a test run.
- */
- boolean isDryRun();
-
- /**
- * @return Ignore directory format extensions.
- */
- boolean isIgnoreDirFormatExtensions();
-
- /**
- * @return Ignore missing descriptor.
- */
- boolean isIgnoreMissingDescriptor();
-
- /**
- * @return The maven session.
- */
- MavenSession getMavenSession();
-
- /**
- * @return The archiver configu.
- */
- String getArchiverConfig();
-
- /**
- * Maven shared filtering utility.
- *
- * @ return the maven reader filter
- */
- MavenReaderFilter getMavenReaderFilter();
-
- /**
- * @return Update only yes/no.
- */
- boolean isUpdateOnly();
-
- /**
- * @return Use JVM chmod yes/no.
- */
- boolean isUseJvmChmod();
-
- /**
- * @return Ignore permissions yes/no.
- */
- boolean isIgnorePermissions();
-
- /**
- * @return The current encoding.
- */
- String getEncoding();
-
- /**
- * @return The escape string.
- */
- String getEscapeString();
-
- /**
- * @return The list of delimiters.
- */
- List<String> getDelimiters();
-
- @Nonnull
- FixedStringSearchInterpolator getRepositoryInterpolator();
-
- /**
- * Gets an interpolator from environment variables and stuff
- */
- @Nonnull
- FixedStringSearchInterpolator getCommandLinePropsInterpolator();
-
- /**
- * Gets an interpolator from environment variables and stuff
- */
- @Nonnull
- FixedStringSearchInterpolator getEnvInterpolator();
-
- @Nonnull
- FixedStringSearchInterpolator getMainProjectInterpolator();
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
deleted file mode 100644
index b857227..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.plugin.assembly;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class InvalidAssemblerConfigurationException
- extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- /**
- * @param message The message.
- * @param error The error
- */
- public InvalidAssemblerConfigurationException( final String message, final Throwable error )
- {
- super( message, error );
- }
-
- /**
- * @param message The message.
- */
- public InvalidAssemblerConfigurationException( final String message )
- {
- super( message );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
deleted file mode 100644
index 907b4d9..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class ArchiveCreationException
- extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Create in instance.
- *
- * @param message The message to use.
- * @param error The error.
- */
- public ArchiveCreationException( final String message, final Throwable error )
- {
- super( message, error );
- }
-
- /**
- * @param message The message.
- */
- public ArchiveCreationException( final String message )
- {
- super( message );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
deleted file mode 100644
index 9cf9e23..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class ArchiveExpansionException
- extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- /**
- * @param message The message to use for this instance.
- * @param error The error which has been thrown.
- */
- public ArchiveExpansionException( final String message, final Throwable error )
- {
- super( message, error );
- }
-
- /**
- * @param message The message.
- */
- public ArchiveExpansionException( final String message )
- {
- super( message );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
deleted file mode 100644
index 40b84bf..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-
-import java.io.File;
-
-/**
- * Creates an archive
- * @version $Id$
- */
-public interface AssemblyArchiver
-{
- String ROLE = AssemblyArchiver.class.getName();
-
- /**
- * Create the assembly archive. Generally:
- * <ol>
- * <li>Setup any directory structures for temporary files</li>
- * <li>Calculate the output directory/file for the assembly</li>
- * <li>Setup any handler components for special descriptor files we may encounter</li>
- * <li>Lookup and configure the {@link org.codehaus.plexus.archiver.Archiver} to be used</li>
- * <li>Determine what, if any, dependency resolution will be required, and resolve any dependency-version conflicts
- * up front to produce a managed-version map for the whole assembly process.</li>
- * <li>Iterate through the available {@link org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase}
- * instances, executing each to handle a different
- * top-level section of the assembly descriptor, if that section is present.</li>
- * </ol>
- *
- * @param assembly The {@link Assembly}
- * @param fullName The full name.
- * @param format The format.
- * @param configSource The {@link AssemblerConfigurationSource}
- * @param recompressZippedFiles recompress zipped files.
- * @return The resulting archive file.
- * @throws ArchiveCreationException when creation fails
- * @throws AssemblyFormattingException when formatting fails
- * @throws InvalidAssemblerConfigurationException when the configurationis bad
- */
- File createArchive( Assembly assembly, String fullName, String format, AssemblerConfigurationSource configSource,
- boolean recompressZippedFiles )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException;
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
deleted file mode 100644
index 1f67b83..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
+++ /dev/null
@@ -1,544 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.DebugConfigurationListener;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.archiver.AssemblyProxyArchiver;
-import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
-import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhaseComparator;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilter;
-import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.archiver.ArchiveFinalizer;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.diags.DryRunArchiver;
-import org.codehaus.plexus.archiver.filters.JarSecurityFileSelector;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.archiver.tar.TarArchiver;
-import org.codehaus.plexus.archiver.tar.TarLongFileMode;
-import org.codehaus.plexus.archiver.war.WarArchiver;
-import org.codehaus.plexus.archiver.zip.AbstractZipArchiver;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
-import org.codehaus.plexus.component.configurator.ComponentConfigurator;
-import org.codehaus.plexus.component.configurator.ConfigurationListener;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Controller component designed to organize the many activities involved in creating an assembly archive. This includes
- * locating and configuring {@link Archiver} instances, executing multiple {@link AssemblyArchiverPhase} instances to
- * interpret the various sections of the assembly descriptor and determine which files to add, and other associated
- * activities.
- *
- * @version $Id$
- */
-@Component( role = AssemblyArchiver.class )
-public class DefaultAssemblyArchiver
- extends AbstractLogEnabled
- implements AssemblyArchiver, Contextualizable
-{
-
- @Requirement
- private ArchiverManager archiverManager;
-
- @Requirement( role = AssemblyArchiverPhase.class )
- private List<AssemblyArchiverPhase> assemblyPhases;
-
- @SuppressWarnings( "MismatchedQueryAndUpdateOfCollection" )
- @Requirement( role = ContainerDescriptorHandler.class )
- private Map<String, ContainerDescriptorHandler> containerDescriptorHandlers;
-
- private PlexusContainer container;
-
- @SuppressWarnings( "UnusedDeclaration" )
- public DefaultAssemblyArchiver()
- {
- }
-
- // introduced for testing.
-
- /**
- * @param archiverManager The archive manager.
- * @param assemblyPhases The list of {@link AssemblyArchiverPhase}
- */
- protected DefaultAssemblyArchiver( final ArchiverManager archiverManager,
- final List<AssemblyArchiverPhase> assemblyPhases )
- {
- this.archiverManager = archiverManager;
- this.assemblyPhases = assemblyPhases;
- }
-
- private List<AssemblyArchiverPhase> sortedPhases()
- {
- List<AssemblyArchiverPhase> sorted = new ArrayList<AssemblyArchiverPhase>( assemblyPhases );
- Collections.sort( sorted, new AssemblyArchiverPhaseComparator() );
- return sorted;
- }
-
- /**
- * {@inheritDoc}
- */
- public File createArchive( final Assembly assembly, final String fullName, final String format,
- final AssemblerConfigurationSource configSource, boolean recompressZippedFiles )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
- {
- validate( assembly );
-
- String filename = fullName;
- if ( !configSource.isIgnoreDirFormatExtensions() || !format.startsWith( "dir" ) )
- {
- filename += "." + format;
- }
-
- AssemblyFileUtils.verifyTempDirectoryAvailability( configSource.getTemporaryRootDirectory() );
-
- final File outputDirectory = configSource.getOutputDirectory();
-
- final File destFile = new File( outputDirectory, filename );
-
- try
- {
- final String finalName = configSource.getFinalName();
- final String specifiedBasedir = assembly.getBaseDirectory();
-
- String basedir = finalName;
-
- if ( specifiedBasedir != null )
- {
- basedir = AssemblyFormatUtils.getOutputDirectory( specifiedBasedir, finalName, configSource,
- AssemblyFormatUtils.moduleProjectInterpolator(
- configSource.getProject() ),
- AssemblyFormatUtils.artifactProjectInterpolator(
- null ) );
- }
-
- final List<ContainerDescriptorHandler> containerHandlers =
- selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers(), configSource );
-
- final Archiver archiver =
- createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource, containerHandlers,
- recompressZippedFiles );
-
- archiver.setDestFile( destFile );
-
- for ( AssemblyArchiverPhase phase : sortedPhases() )
- {
- phase.execute( assembly, archiver, configSource );
- }
-
- archiver.createArchive();
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException(
- "Error creating assembly archive " + assembly.getId() + ": " + e.getMessage(), e );
- }
- catch ( final IOException e )
- {
- throw new ArchiveCreationException(
- "Error creating assembly archive " + assembly.getId() + ": " + e.getMessage(), e );
- }
- catch ( final NoSuchArchiverException e )
- {
- throw new ArchiveCreationException(
- "Unable to obtain archiver for extension '" + format + "', for assembly: '" + assembly.getId() + "'",
- e );
- }
- catch ( final DependencyResolutionException e )
- {
- throw new ArchiveCreationException(
- "Unable to resolve dependencies for assembly '" + assembly.getId() + "'", e );
- }
-
- return destFile;
- }
-
- private void validate( final Assembly assembly )
- throws InvalidAssemblerConfigurationException
- {
- if ( assembly.getId() == null || assembly.getId().trim().length() < 1 )
- {
- throw new InvalidAssemblerConfigurationException( "Assembly ID must be present and non-empty." );
- }
- }
-
- // CHECKSTYLE_OFF: LineLength
- private List<ContainerDescriptorHandler> selectContainerDescriptorHandlers(
- List<ContainerDescriptorHandlerConfig> requestedContainerDescriptorHandlers,
- final AssemblerConfigurationSource configSource )
- throws InvalidAssemblerConfigurationException
- // CHECKSTYLE_ON: LineLength
- {
- getLogger().debug( "All known ContainerDescriptorHandler components: " + ( containerDescriptorHandlers == null
- ? "none; map is null."
- : "" + containerDescriptorHandlers.keySet() ) );
-
- if ( requestedContainerDescriptorHandlers == null )
- {
- requestedContainerDescriptorHandlers = new ArrayList<ContainerDescriptorHandlerConfig>();
- }
-
- final List<ContainerDescriptorHandler> handlers = new ArrayList<ContainerDescriptorHandler>();
- final List<String> hints = new ArrayList<String>();
-
- if ( !requestedContainerDescriptorHandlers.isEmpty() )
- {
- for ( final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers )
- {
- final String hint = config.getHandlerName();
- final ContainerDescriptorHandler handler = containerDescriptorHandlers.get( hint );
-
- if ( handler == null )
- {
- throw new InvalidAssemblerConfigurationException(
- "Cannot find ContainerDescriptorHandler with hint: " + hint );
- }
-
- getLogger().debug(
- "Found container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
-
- if ( config.getConfiguration() != null )
- {
- getLogger().debug( "Configuring handler with:\n\n" + config.getConfiguration() + "\n\n" );
-
- configureContainerDescriptorHandler( handler, (Xpp3Dom) config.getConfiguration(), configSource );
- }
-
- handlers.add( handler );
- hints.add( hint );
- }
- }
-
- if ( !hints.contains( "plexus" ) )
- {
- handlers.add( new ComponentsXmlArchiverFileFilter() );
- }
-
- return handlers;
- }
-
- /**
- * Creates the necessary archiver to build the distribution file.
- *
- * @param format Archive format
- * @param includeBaseDir the base directory for include.
- * @param finalName The final name.
- * @param configSource {@link AssemblerConfigurationSource}
- * @param containerHandlers The list of {@link ContainerDescriptorHandler}
- * @param recompressZippedFiles recompress zipped files.
- * @return archiver Archiver generated
- * @throws org.codehaus.plexus.archiver.ArchiverException
- * @throws org.codehaus.plexus.archiver.manager.NoSuchArchiverException
- */
- protected Archiver createArchiver( final String format, final boolean includeBaseDir, final String finalName,
- final AssemblerConfigurationSource configSource,
- final List<ContainerDescriptorHandler> containerHandlers,
- boolean recompressZippedFiles )
- throws NoSuchArchiverException
- {
- Archiver archiver;
- if ( "tgz".equals( format ) || "tbz2".equals( format ) || format.startsWith( "tar" ) )
- {
- archiver = createTarArchiver( format, TarLongFileMode.valueOf( configSource.getTarLongFileMode() ) );
- }
- else if ( "war".equals( format ) )
- {
- archiver = createWarArchiver();
- }
- else
- {
- archiver = archiverManager.getArchiver( format );
- }
-
- if ( archiver instanceof AbstractZipArchiver )
- {
- ( (AbstractZipArchiver) archiver ).setRecompressAddedZips( recompressZippedFiles );
- }
-
- final List<FileSelector> extraSelectors = new ArrayList<FileSelector>();
- final List<ArchiveFinalizer> extraFinalizers = new ArrayList<ArchiveFinalizer>();
- if ( archiver instanceof JarArchiver )
- {
- extraSelectors.add( new JarSecurityFileSelector() );
-
- extraFinalizers.add(
- new ManifestCreationFinalizer( configSource.getMavenSession(), configSource.getProject(),
- configSource.getJarArchiveConfiguration() ) );
-
- }
-
- if ( configSource.getArchiverConfig() != null )
- {
- configureArchiver( archiver, configSource );
- }
-
- String prefix = "";
- if ( includeBaseDir )
- {
- prefix = finalName;
- }
-
- archiver = new AssemblyProxyArchiver( prefix, archiver, containerHandlers, extraSelectors, extraFinalizers,
- configSource.getWorkingDirectory(), getLogger() );
- if ( configSource.isDryRun() )
- {
- archiver = new DryRunArchiver( archiver, getLogger() );
- }
-
- archiver.setUseJvmChmod( configSource.isUpdateOnly() );
- archiver.setIgnorePermissions( configSource.isIgnorePermissions() );
- archiver.setForced( !configSource.isUpdateOnly() );
-
- return archiver;
- }
-
- private void configureContainerDescriptorHandler( final ContainerDescriptorHandler handler, final Xpp3Dom config,
- final AssemblerConfigurationSource configSource )
- throws InvalidAssemblerConfigurationException
- {
- getLogger().debug( "Configuring handler: '" + handler.getClass().getName() + "' -->" );
-
- try
- {
- configureComponent( handler, config, configSource );
- }
- catch ( final ComponentConfigurationException e )
- {
- throw new InvalidAssemblerConfigurationException(
- "Failed to configure handler: " + handler.getClass().getName(), e );
- }
- catch ( final ComponentLookupException e )
- {
- throw new InvalidAssemblerConfigurationException(
- "Failed to lookup configurator for setup of handler: " + handler.getClass().getName(), e );
- }
-
- getLogger().debug( "-- end configuration --" );
- }
-
- private void configureArchiver( final Archiver archiver, final AssemblerConfigurationSource configSource )
- {
- Xpp3Dom config;
- try
- {
- config = Xpp3DomBuilder.build( new StringReader( configSource.getArchiverConfig() ) );
- }
- catch ( final XmlPullParserException e )
- {
- throw new ArchiverException( "Failed to parse archiver configuration for: " + archiver.getClass().getName(),
- e );
- }
- catch ( final IOException e )
- {
- throw new ArchiverException( "Failed to parse archiver configuration for: " + archiver.getClass().getName(),
- e );
- }
-
- getLogger().debug( "Configuring archiver: '" + archiver.getClass().getName() + "' -->" );
-
- try
- {
- configureComponent( archiver, config, configSource );
- }
- catch ( final ComponentConfigurationException e )
- {
- throw new ArchiverException( "Failed to configure archiver: " + archiver.getClass().getName(), e );
- }
- catch ( final ComponentLookupException e )
- {
- throw new ArchiverException(
- "Failed to lookup configurator for setup of archiver: " + archiver.getClass().getName(), e );
- }
-
- getLogger().debug( "-- end configuration --" );
- }
-
- private void configureComponent( final Object component, final Xpp3Dom config,
- final AssemblerConfigurationSource configSource )
- throws ComponentLookupException, ComponentConfigurationException
- {
- final ComponentConfigurator configurator =
- (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, "basic" );
-
- final ConfigurationListener listener = new DebugConfigurationListener( getLogger() );
-
- final ExpressionEvaluator expressionEvaluator = new AssemblyExpressionEvaluator( configSource );
-
- final XmlPlexusConfiguration configuration = new XmlPlexusConfiguration( config );
-
- final Object[] containerRealm = getContainerRealm();
-
- /*
- * NOTE: The signature of configureComponent() has changed in Maven 3.x, the reflection prevents a linkage error
- * and makes the code work with both Maven 2 and 3.
- */
- try
- {
- final Method configureComponent =
- ComponentConfigurator.class.getMethod( "configureComponent", Object.class, PlexusConfiguration.class,
- ExpressionEvaluator.class, (Class<?>) containerRealm[1],
- ConfigurationListener.class );
-
- configureComponent.invoke( configurator, component, configuration, expressionEvaluator, containerRealm[0],
- listener );
- }
- catch ( final NoSuchMethodException e )
- {
- throw new RuntimeException( e );
- }
- catch ( final IllegalAccessException e )
- {
- throw new RuntimeException( e );
- }
- catch ( final InvocationTargetException e )
- {
- if ( e.getCause() instanceof ComponentConfigurationException )
- {
- throw (ComponentConfigurationException) e.getCause();
- }
- throw new RuntimeException( e.getCause() );
- }
- }
-
- private Object[] getContainerRealm()
- {
- /*
- * NOTE: The return type of getContainerRealm() has changed in Maven 3.x, the reflection prevents a linkage
- * error and makes the code work with both Maven 2 and 3.
- */
- try
- {
- final Method getContainerRealm = container.getClass().getMethod( "getContainerRealm" );
- return new Object[]{ getContainerRealm.invoke( container ), getContainerRealm.getReturnType() };
- }
- catch ( final NoSuchMethodException e )
- {
- throw new RuntimeException( e );
- }
- catch ( final IllegalAccessException e )
- {
- throw new RuntimeException( e );
- }
- catch ( final InvocationTargetException e )
- {
- throw new RuntimeException( e.getCause() );
- }
- }
-
- protected Archiver createWarArchiver()
- throws NoSuchArchiverException
- {
- final WarArchiver warArchiver = (WarArchiver) archiverManager.getArchiver( "war" );
- warArchiver.setIgnoreWebxml( false ); // See MNG-1274
-
- return warArchiver;
- }
-
- protected Archiver createTarArchiver( final String format, final TarLongFileMode tarLongFileMode )
- throws NoSuchArchiverException
- {
- final TarArchiver tarArchiver = (TarArchiver) archiverManager.getArchiver( "tar" );
- final int index = format.indexOf( '.' );
- if ( index >= 0 )
- {
- TarArchiver.TarCompressionMethod tarCompressionMethod;
- // TODO: this should accept gz and bz2 as well so we can skip
- // TODO: over the switch
- final String compression = format.substring( index + 1 );
- if ( "gz".equals( compression ) )
- {
- tarCompressionMethod = TarArchiver.TarCompressionMethod.gzip;
- }
- else if ( "bz2".equals( compression ) )
- {
- tarCompressionMethod = TarArchiver.TarCompressionMethod.bzip2;
- }
- else if ( "snappy".equals( compression ) )
- {
- tarCompressionMethod = TarArchiver.TarCompressionMethod.snappy;
- }
- else
- {
- // TODO: better handling
- throw new IllegalArgumentException( "Unknown compression format: " + compression );
- }
- tarArchiver.setCompression( tarCompressionMethod );
- }
- else if ( "tgz".equals( format ) )
- {
- tarArchiver.setCompression( TarArchiver.TarCompressionMethod.gzip );
- }
- else if ( "tbz2".equals( format ) )
- {
- tarArchiver.setCompression( TarArchiver.TarCompressionMethod.bzip2 );
- }
-
- tarArchiver.setLongfile( tarLongFileMode );
-
- return tarArchiver;
- }
-
- public void contextualize( final Context context )
- throws ContextException
- {
- container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
- }
-
- protected void setContainer( final PlexusContainer container )
- {
- this.container = container;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
deleted file mode 100644
index 245bdbc..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.AbstractArchiveFinalizer;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.archiver.jar.Manifest;
-import org.codehaus.plexus.archiver.jar.ManifestException;
-import org.codehaus.plexus.util.IOUtil;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public class ManifestCreationFinalizer
- extends AbstractArchiveFinalizer
-{
-
- private final MavenProject project;
-
- private final MavenSession session;
-
- private final MavenArchiveConfiguration archiveConfiguration;
-
- // TODO: I'd really prefer to rewrite MavenArchiver as either a
- // separate manifest creation utility (and to
- // create an include pom.properties etc into another archiver), or
- // an implementation of an archiver
- // (the first is preferable).
- private final MavenArchiver mavenArchiver = new MavenArchiver();
-
- public ManifestCreationFinalizer( final MavenSession session, final MavenProject project,
- final MavenArchiveConfiguration archiveConfiguration )
- {
- this.session = session;
- this.project = project;
- this.archiveConfiguration = archiveConfiguration;
- }
-
- @Override
- public void finalizeArchiveCreation( final Archiver archiver )
- {
- if ( archiveConfiguration != null )
- {
- try
- {
- Manifest manifest;
- final File manifestFile = archiveConfiguration.getManifestFile();
-
- if ( manifestFile != null )
- {
- Reader manifestFileReader = null;
- try
- {
- manifestFileReader = new InputStreamReader( new FileInputStream( manifestFile ), "UTF-8" );
- manifest = new Manifest( manifestFileReader );
- }
- catch ( final FileNotFoundException e )
- {
- throw new ArchiverException( "Manifest not found: " + e.getMessage(), e );
- }
- catch ( final IOException e )
- {
- throw new ArchiverException( "Error processing manifest: " + e.getMessage(), e );
- }
- finally
- {
- IOUtil.close( manifestFileReader );
- }
- }
- else
- {
- manifest = mavenArchiver.getManifest( session, project, archiveConfiguration );
- }
-
- if ( ( manifest != null ) && ( archiver instanceof JarArchiver ) )
- {
- final JarArchiver jarArchiver = (JarArchiver) archiver;
- jarArchiver.addConfiguredManifest( manifest );
- }
- }
- catch ( final ManifestException e )
- {
- throw new ArchiverException( "Error creating manifest: " + e.getMessage(), e );
- }
- catch ( final DependencyResolutionRequiredException e )
- {
- throw new ArchiverException( "Dependencies were not resolved: " + e.getMessage(), e );
- }
- }
- }
-
- public List<String> getVirtualFiles()
- {
- if ( archiveConfiguration != null )
- {
- try
- {
- if ( mavenArchiver.getManifest( project, archiveConfiguration.getManifest() ) != null )
- {
- return Collections.singletonList( "META-INF/MANIFEST.MF" );
- }
- }
- catch ( final ManifestException ignore )
- {
- // noop
- }
- catch ( final DependencyResolutionRequiredException ignore )
- {
- // noop
- }
- }
-
- return null;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
deleted file mode 100644
index fc99184..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
+++ /dev/null
@@ -1,1035 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.archiver;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler;
-import org.codehaus.plexus.archiver.ArchiveEntry;
-import org.codehaus.plexus.archiver.ArchiveFinalizer;
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
-import org.codehaus.plexus.archiver.FinalizerEnabled;
-import org.codehaus.plexus.archiver.ResourceIterator;
-import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
-import org.codehaus.plexus.archiver.util.DefaultFileSet;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
-import org.codehaus.plexus.logging.Logger;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Delegating archiver implementation that supports:
- * <ul>
- * <li>dry-running (where the delegate archiver is never actually called)</li>
- * <li>prefixing (where all paths have a set global prefix prepended before addition)</li>
- * <li>duplication checks on archive additions (for archive-file path + prefix)</li>
- * </ul>
- *
- * @author jdcasey
- * @version $Id$
- */
-public class AssemblyProxyArchiver
- implements Archiver
-{
-
- private final Archiver delegate;
-
- private final ThreadLocal<Boolean> inPublicApi = new ThreadLocal<Boolean>();
-
- private final Logger logger;
-
- private final String assemblyWorkPath;
-
- private String rootPrefix;
-
- private FileSelector[] selectors;
-
- private boolean forced;
-
- /**
- * @since 2.2
- */
- private boolean useJvmChmod;
-
- public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate,
- final List<ContainerDescriptorHandler> containerDescriptorHandlers,
- final List<FileSelector> extraSelectors, final List<ArchiveFinalizer> extraFinalizers,
- final File assemblyWorkDir, final Logger logger )
- {
- this.rootPrefix = rootPrefix;
- this.delegate = delegate;
-
- assemblyWorkPath = assemblyWorkDir.getAbsolutePath().replace( '\\', '/' );
-
- this.logger = logger;
-
- if ( !"".equals( rootPrefix ) && !rootPrefix.endsWith( "/" ) )
- {
- this.rootPrefix += "/";
- }
-
- final List<FileSelector> selectors = new ArrayList<FileSelector>();
-
- FinalizerEnabled finalizer = ( delegate instanceof FinalizerEnabled ) ? (FinalizerEnabled) delegate : null;
-
- if ( containerDescriptorHandlers != null )
- {
- for ( final ContainerDescriptorHandler handler : containerDescriptorHandlers )
- {
- selectors.add( handler );
-
- if ( finalizer != null )
- {
- finalizer.addArchiveFinalizer( handler );
- }
- }
- }
-
- if ( extraSelectors != null )
- {
- for ( final FileSelector selector : extraSelectors )
- {
- selectors.add( selector );
- }
- }
-
- if ( ( extraFinalizers != null ) && finalizer != null )
- {
- for ( ArchiveFinalizer extraFinalizer : extraFinalizers )
- {
- finalizer.addArchiveFinalizer( extraFinalizer );
- }
- }
-
- if ( !selectors.isEmpty() )
- {
- this.selectors = selectors.toArray( new FileSelector[selectors.size()] );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addArchivedFileSet( @Nonnull final File archiveFile, final String prefix, final String[] includes,
- final String[] excludes )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile );
-
- fs.setIncludes( includes );
- fs.setExcludes( excludes );
- fs.setPrefix( rootPrefix + prefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
-
- delegate.addArchivedFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- private void debug( final String message )
- {
- if ( ( logger != null ) && logger.isDebugEnabled() )
- {
- logger.debug( message );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addArchivedFileSet( @Nonnull final File archiveFile, final String prefix )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile );
-
- fs.setPrefix( rootPrefix + prefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
-
- delegate.addArchivedFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile );
-
- fs.setIncludes( includes );
- fs.setExcludes( excludes );
- fs.setPrefix( rootPrefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
-
- delegate.addArchivedFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addArchivedFileSet( @Nonnull final File archiveFile )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile );
-
- fs.setPrefix( rootPrefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
-
- delegate.addArchivedFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addDirectory( @Nonnull final File directory, final String prefix, final String[] includes,
- final String[] excludes )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultFileSet fs = new DefaultFileSet();
-
- fs.setDirectory( directory );
- fs.setIncludes( includes );
- fs.setExcludes( excludes );
- fs.setPrefix( rootPrefix + prefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
-
- doAddFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addSymlink( String symlinkName, String symlinkDestination )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.addSymlink( symlinkName, symlinkDestination );
- }
- finally
- {
- inPublicApi.set( null );
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addSymlink( String symlinkName, int permissions, String symlinkDestination )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.addSymlink( symlinkName, permissions, symlinkDestination );
- }
- finally
- {
- inPublicApi.set( null );
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addDirectory( @Nonnull final File directory, final String prefix )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultFileSet fs = new DefaultFileSet();
-
- fs.setDirectory( directory );
- fs.setPrefix( rootPrefix + prefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
-
- doAddFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addDirectory( @Nonnull final File directory, final String[] includes, final String[] excludes )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultFileSet fs = new DefaultFileSet();
-
- fs.setDirectory( directory );
- fs.setIncludes( includes );
- fs.setExcludes( excludes );
- fs.setPrefix( rootPrefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
-
- doAddFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addDirectory( @Nonnull final File directory )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final DefaultFileSet fs = new DefaultFileSet();
-
- fs.setDirectory( directory );
- fs.setPrefix( rootPrefix );
- fs.setFileSelectors( selectors );
-
- debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
-
- doAddFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addFile( @Nonnull final File inputFile, @Nonnull final String destFileName, final int permissions )
- {
- if ( acceptFile( inputFile ) )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- debug( "Adding file: " + inputFile + " to archive location: " + rootPrefix + destFileName );
-
- delegate.addFile( inputFile, rootPrefix + destFileName, permissions );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addFile( @Nonnull final File inputFile, @Nonnull final String destFileName )
- {
- if ( acceptFile( inputFile ) )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- debug( "Adding file: " + inputFile + " to archive location: " + rootPrefix + destFileName );
-
- delegate.addFile( inputFile, rootPrefix + destFileName );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void createArchive()
- throws IOException
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setForced( forced );
- delegate.createArchive();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getDefaultDirectoryMode()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.getDefaultDirectoryMode();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDefaultDirectoryMode( final int mode )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setDefaultDirectoryMode( mode );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getDefaultFileMode()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.getDefaultFileMode();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDefaultFileMode( final int mode )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setDefaultFileMode( mode );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public File getDestFile()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.getDestFile();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestFile( final File destFile )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setDestFile( destFile );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- @Override
- @SuppressWarnings( { "deprecation" } )
- public Map<String, ArchiveEntry> getFiles()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.getFiles();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean getIncludeEmptyDirs()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.getIncludeEmptyDirs();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setIncludeEmptyDirs( final boolean includeEmptyDirs )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setIncludeEmptyDirs( includeEmptyDirs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isForced()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.isForced();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setForced( final boolean forced )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- this.forced = forced;
- delegate.setForced( forced );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isSupportingForced()
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- return delegate.isSupportingForced();
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDotFileDirectory( final File dotFileDirectory )
- {
- throw new UnsupportedOperationException(
- "Undocumented feature of plexus-archiver; this is not yet supported." );
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addArchivedFileSet( final ArchivedFileSet fileSet )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final PrefixedArchivedFileSet fs = new PrefixedArchivedFileSet( fileSet, rootPrefix, selectors );
-
- debug( "Adding archived file-set in: " + fileSet.getArchive() + " to archive location: " + fs.getPrefix() );
-
- delegate.addArchivedFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- @Override
- public void addArchivedFileSet( ArchivedFileSet archivedFileSet, Charset charset )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final PrefixedArchivedFileSet fs = new PrefixedArchivedFileSet( archivedFileSet, rootPrefix, selectors );
-
- debug( "Adding archived file-set in: " + archivedFileSet.getArchive() + " to archive location: "
- + fs.getPrefix() );
-
- delegate.addArchivedFileSet( fs, charset );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addFileSet( @Nonnull final FileSet fileSet )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- final PrefixedFileSet fs = new PrefixedFileSet( fileSet, rootPrefix, selectors );
-
- debug( "Adding file-set in: " + fileSet.getDirectory() + " to archive location: " + fs.getPrefix() );
-
- doAddFileSet( fs );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- private void doAddFileSet( final FileSet fs )
- {
- final String fsPath = fs.getDirectory().getAbsolutePath().replace( '\\', '/' );
-
- if ( fsPath.equals( assemblyWorkPath ) )
- {
- logger.debug( "SKIPPING fileset with source directory matching assembly working-directory: " + fsPath );
- }
- else if ( assemblyWorkPath.startsWith( fsPath ) )
- {
- final List<String> newEx = new ArrayList<String>();
- if ( fs.getExcludes() != null )
- {
- newEx.addAll( Arrays.asList( fs.getExcludes() ) );
- }
-
- final String workDirExclude = assemblyWorkPath.substring( fsPath.length() + 1 );
-
- logger.debug(
- "Adding exclude for assembly working-directory: " + workDirExclude + "\nFile-Set source directory: "
- + fsPath );
-
- newEx.add( workDirExclude );
-
- final List<String> newIn = new ArrayList<String>();
- if ( fs.getIncludes() != null )
- {
- for ( final String include : fs.getIncludes() )
- {
- if ( !include.startsWith( workDirExclude ) )
- {
- newIn.add( include );
- }
- }
- }
-
- final DefaultFileSet dfs = new DefaultFileSet();
-
- dfs.setCaseSensitive( fs.isCaseSensitive() );
- dfs.setDirectory( fs.getDirectory() );
- dfs.setExcludes( newEx.toArray( new String[newEx.size()] ) );
- dfs.setFileSelectors( fs.getFileSelectors() );
- dfs.setIncludes( newIn.toArray( new String[newIn.size()] ) );
- dfs.setIncludingEmptyDirectories( fs.isIncludingEmptyDirectories() );
- dfs.setPrefix( fs.getPrefix() );
- dfs.setUsingDefaultExcludes( fs.isUsingDefaultExcludes() );
-
- delegate.addFileSet( dfs );
- }
- else
- {
- delegate.addFileSet( fs );
- }
- }
-
- private boolean acceptFile( final File inputFile )
- {
- if ( !Boolean.TRUE.equals( inPublicApi.get() ) )
- {
- if ( selectors != null )
- {
- final FileInfo fileInfo = new DefaultFileInfo( inputFile );
-
- for ( final FileSelector selector : selectors )
- {
- try
- {
- if ( !selector.isSelected( fileInfo ) )
- {
- return false;
- }
- }
- catch ( final IOException e )
- {
- throw new ArchiverException(
- "Error processing file: " + inputFile + " using selector: " + selector, e );
- }
- }
- }
- }
-
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
- {
- File file = new File( resource.getName() ); // zOMG.
- if ( acceptFile( file ) )
- {
-
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.addResource( resource, rootPrefix + destFileName, permissions );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addResources( final PlexusIoResourceCollection resources )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.addResources( resources );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @Nonnull
- public ResourceIterator getResources()
- {
- return delegate.getResources();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getDuplicateBehavior()
- {
- return delegate.getDuplicateBehavior();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDuplicateBehavior( final String duplicate )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setDuplicateBehavior( duplicate );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getDirectoryMode()
- {
- return delegate.getDirectoryMode();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDirectoryMode( final int mode )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setDirectoryMode( mode );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getFileMode()
- {
- return delegate.getFileMode();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setFileMode( final int mode )
- {
- inPublicApi.set( Boolean.TRUE );
- try
- {
- delegate.setFileMode( mode );
- }
- finally
- {
- inPublicApi.set( null );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getOverrideDirectoryMode()
- {
- return delegate.getOverrideDirectoryMode();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getOverrideFileMode()
- {
- return delegate.getOverrideFileMode();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isUseJvmChmod()
- {
- return useJvmChmod;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setUseJvmChmod( final boolean useJvmChmod )
- {
- this.useJvmChmod = useJvmChmod;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isIgnorePermissions()
- {
- return delegate.isIgnorePermissions();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setIgnorePermissions( final boolean ignorePermissions )
- {
- delegate.setIgnorePermissions( ignorePermissions );
- }
-
- private static final class DefaultFileInfo
- implements FileInfo
- {
-
- private final File inputFile;
-
- DefaultFileInfo( final File inputFile )
- {
- this.inputFile = inputFile;
- }
-
- @Override
- public InputStream getContents()
- throws IOException
- {
- return new FileInputStream( inputFile );
- }
-
- @Override
- public String getName()
- {
- return inputFile.getName();
- }
-
- @Override
- public boolean isDirectory()
- {
- return inputFile.isDirectory();
- }
-
- @Override
- public boolean isFile()
- {
- return inputFile.isFile();
- }
-
- @Override
- public boolean isSymbolicLink()
- {
- return false;
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
deleted file mode 100644
index ec99b2c..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.archiver;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-
-import java.io.File;
-
-import static org.apache.maven.plugin.assembly.archive.archiver.PrefixedFileSet.combineSelectors;
-
-/**
- * @version $Id$
- */
-class PrefixedArchivedFileSet
- implements ArchivedFileSet
-{
-
- private final String rootPrefix;
-
- private final ArchivedFileSet fileSet;
-
- private final FileSelector[] selectors;
-
- /**
- * @param fileSet The archived file set.
- * @param rootPrefix The root prefix.
- * @param selectors The file selectors.
- */
- public PrefixedArchivedFileSet( ArchivedFileSet fileSet, String rootPrefix, FileSelector[] selectors )
- {
- this.fileSet = fileSet;
- this.selectors = selectors;
-
- if ( rootPrefix.length() > 0 && !rootPrefix.endsWith( "/" ) )
- {
- this.rootPrefix = rootPrefix + "/";
- }
- else
- {
- this.rootPrefix = rootPrefix;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public File getArchive()
- {
- return fileSet.getArchive();
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] getExcludes()
- {
- return fileSet.getExcludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public FileSelector[] getFileSelectors()
- {
- return combineSelectors( fileSet.getFileSelectors(), selectors );
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] getIncludes()
- {
- return fileSet.getIncludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getPrefix()
- {
- String prefix = fileSet.getPrefix();
- if ( prefix.startsWith( "/" ) )
- {
- if ( prefix.length() > 1 )
- {
- prefix = prefix.substring( 1 );
- }
- else
- {
- prefix = "";
- }
- }
-
- return rootPrefix + prefix;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isCaseSensitive()
- {
- return fileSet.isCaseSensitive();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isIncludingEmptyDirectories()
- {
- return fileSet.isIncludingEmptyDirectories();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isUsingDefaultExcludes()
- {
- return fileSet.isUsingDefaultExcludes();
- }
-
- public InputStreamTransformer getStreamTransformer()
- {
- return fileSet.getStreamTransformer();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
deleted file mode 100644
index 49a4612..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.archiver;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.archiver.FileSet;
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-
-import java.io.File;
-
-/**
- * @version $Id$
- */
-class PrefixedFileSet
- implements FileSet
-{
-
- private final String rootPrefix;
-
- private final FileSet fileSet;
-
- private final FileSelector[] selectors;
-
- /**
- * @param fileSet The file set.
- * @param rootPrefix The root prefix
- * @param selectors The file selectors.
- */
- public PrefixedFileSet( final FileSet fileSet, final String rootPrefix, final FileSelector[] selectors )
- {
- this.fileSet = fileSet;
- this.selectors = selectors;
-
- if ( rootPrefix.length() > 0 && !rootPrefix.endsWith( "/" ) )
- {
- this.rootPrefix = rootPrefix + "/";
- }
- else
- {
- this.rootPrefix = rootPrefix;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] getExcludes()
- {
- return fileSet.getExcludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public FileSelector[] getFileSelectors()
- {
- FileSelector[] sel = fileSet.getFileSelectors();
- final FileSelector[] selectors1 = selectors;
- return combineSelectors( sel, selectors1 );
- }
-
- /**
- * {@inheritDoc}
- */
- static FileSelector[] combineSelectors( FileSelector[] first, FileSelector[] second )
- {
- if ( ( first != null ) && ( second != null ) )
- {
- final FileSelector[] temp = new FileSelector[first.length + second.length];
-
- System.arraycopy( first, 0, temp, 0, first.length );
- System.arraycopy( second, 0, temp, first.length, second.length );
-
- first = temp;
- }
- else if ( ( first == null ) && ( second != null ) )
- {
- first = second;
- }
-
- return first;
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] getIncludes()
- {
- return fileSet.getIncludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getPrefix()
- {
- String prefix = fileSet.getPrefix();
- if ( prefix == null )
- {
- return rootPrefix;
- }
-
- if ( prefix.startsWith( "/" ) )
- {
- if ( prefix.length() > 1 )
- {
- prefix = prefix.substring( 1 );
- }
- else
- {
- prefix = "";
- }
- }
-
- return rootPrefix + prefix;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isCaseSensitive()
- {
- return fileSet.isCaseSensitive();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isIncludingEmptyDirectories()
- {
- return fileSet.isIncludingEmptyDirectories();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isUsingDefaultExcludes()
- {
- return fileSet.isUsingDefaultExcludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public File getDirectory()
- {
- return fileSet.getDirectory();
- }
-
- public InputStreamTransformer getStreamTransformer()
- {
- return fileSet.getStreamTransformer();
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
deleted file mode 100644
index 1fd6e87..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.archiver;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
-
-/**
- * @author jdcasey
- * @version $Id$
- * //todo delete this class once the plexus maven plugin can merge a generated components.xml with an existing one.
- */
-class SarUnArchiver
- extends ZipUnArchiver
-{
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
deleted file mode 100644
index e76c74b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.codehaus.plexus.archiver.Archiver;
-
-/**
- * Handles one top-level section of the assembly descriptor, to determine which files to include in the assembly archive
- * for that section.
- *
- * @version $Id$
- */
-public interface AssemblyArchiverPhase
-{
- String ROLE = AssemblyArchiverPhase.class.getName();
-
- /**
- * Handle the associated section of the assembly descriptor.
- *
- * @param assembly The assembly descriptor to use
- * @param archiver The archiver used to create the assembly archive, to which files/directories/artifacts are
- * added
- * @param configSource The configuration for this assembly build, normally derived from the plugin that launched
- * the assembly process.
- * @throws ArchiveCreationException in case of an archive creation error.
- * @throws AssemblyFormattingException in case of a assembly formatting exception.
- * @throws InvalidAssemblerConfigurationException in case of an invalid assembler configuration.
- */
- void execute( Assembly assembly, Archiver archiver, AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException;
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
deleted file mode 100644
index e3534a2..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Comparator;
-
-/**
- *
- */
-public class AssemblyArchiverPhaseComparator
- implements Comparator<AssemblyArchiverPhase>
-{
- public int compare( AssemblyArchiverPhase o1, AssemblyArchiverPhase o2 )
- {
- boolean o1hasOrder = o1 instanceof PhaseOrder;
- boolean o2hasOrder = o2 instanceof PhaseOrder;
- if ( !o1hasOrder && !o2hasOrder )
- {
- return o1.getClass().getName().compareTo( o2.getClass().getName() );
- }
- if ( !o1hasOrder )
- {
- return -1;
- }
- if ( !o2hasOrder )
- {
- return +1;
- }
- return new Integer( ( (PhaseOrder) o1 ).order() ).compareTo( ( (PhaseOrder) o2 ).order() );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
deleted file mode 100644
index 126486f..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.task.AddDependencySetsTask;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Handles the top-level <dependencySets/> section of the assembly descriptor.
- *
- * @version $Id$
- */
-@Component( role = AssemblyArchiverPhase.class, hint = "dependency-sets" )
-public class DependencySetAssemblyPhase
- extends AbstractLogEnabled
- implements AssemblyArchiverPhase, PhaseOrder
-{
-
- @Requirement
- private MavenProjectBuilder projectBuilder;
-
- @Requirement
- private ArchiverManager archiverManager;
-
- @Requirement
- private DependencyResolver dependencyResolver;
-
-
- /**
- * Default constructor.
- */
- public DependencySetAssemblyPhase()
- {
- // used for plexus init
- }
-
- /**
- * @param projectBuilder The Maven Project Builder.
- * @param logger The Logger.
- */
- public DependencySetAssemblyPhase( final MavenProjectBuilder projectBuilder, DependencyResolver dependencyResolver,
- final Logger logger )
- {
- this.projectBuilder = projectBuilder;
- this.dependencyResolver = dependencyResolver;
- enableLogging( logger );
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute( final Assembly assembly, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
-
- Map<DependencySet, Set<Artifact>> resolved =
- dependencyResolver.resolveDependencySets( assembly, configSource, assembly.getDependencySets() );
- for ( Map.Entry<DependencySet, Set<Artifact>> dependencySetSetEntry : resolved.entrySet() )
- {
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( dependencySetSetEntry.getKey() ),
- dependencySetSetEntry.getValue(), configSource.getProject(), projectBuilder,
- getLogger() );
-
- task.execute( archiver, configSource );
- }
- }
-
- public int order()
- {
- // CHECKSTYLE_OFF: MagicNumber
- return 40;
- // CHECKSTYLE_ON: MagicNumber
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
deleted file mode 100644
index 4568ec0..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.format.ReaderFormatter;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.FileItem;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.warnForPlatformSpecifics;
-import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
-
-/**
- * Handles the top-level <files/> section of the assembly descriptor.
- *
- * @version $Id$
- */
-@Component( role = AssemblyArchiverPhase.class, hint = "file-items" )
-public class FileItemAssemblyPhase
- extends AbstractLogEnabled
- implements AssemblyArchiverPhase, PhaseOrder
-{
-
- /**
- * {@inheritDoc}
- */
- public void execute( final Assembly assembly, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final List<FileItem> fileList = assembly.getFiles();
- final File basedir = configSource.getBasedir();
-
- for ( final FileItem fileItem : fileList )
- {
- final String sourcePath = fileItem.getSource();
-
- // ensure source file is in absolute path for reactor build to work
- File source = new File( sourcePath );
-
- // save the original sourcefile's name, because filtration may
- // create a temp file with a different name.
- final String sourceName = source.getName();
-
- if ( !source.isAbsolute() )
- {
- source = new File( basedir, sourcePath );
- }
-
- String destName = fileItem.getDestName();
-
- if ( destName == null )
- {
- destName = sourceName;
- }
-
- final String outputDirectory1 = fileItem.getOutputDirectory();
-
- warnForPlatformSpecifics( getLogger(), outputDirectory1 );
-
- final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( outputDirectory1, configSource.getFinalName(), configSource,
- AssemblyFormatUtils.moduleProjectInterpolator(
- configSource.getProject() ),
- AssemblyFormatUtils.artifactProjectInterpolator( null ) );
-
- String target;
-
- // omit the last char if ends with / or \\
- if ( outputDirectory.endsWith( "/" ) || outputDirectory.endsWith( "\\" ) )
- {
- target = outputDirectory + destName;
- }
- else if ( outputDirectory.length() < 1 )
- {
- target = destName;
- }
- else
- {
- target = outputDirectory + "/" + destName;
- }
-
- try
- {
- final InputStreamTransformer fileSetTransformers =
- ReaderFormatter.getFileSetTransformers( configSource, fileItem.isFiltered(),
- fileItem.getLineEnding() );
-
- final PlexusIoResource restoUse = createResource( source, fileSetTransformers );
-
- int mode = TypeConversionUtils.modeToInt( fileItem.getFileMode(), getLogger() );
- archiver.addResource( restoUse, target, mode );
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e );
- }
- catch ( IOException e )
- {
- throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e );
- }
- }
- }
-
- public int order()
- {
- return 10;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
deleted file mode 100644
index 6071bfb..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTask;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
-import javax.annotation.Nonnull;
-import java.util.List;
-
-/**
- * Handles the <fileSets/> top-level section of the assembly descriptor.
- *
- * @version $Id$
- */
-@Component( role = AssemblyArchiverPhase.class, hint = "file-sets" )
-public class FileSetAssemblyPhase
- extends AbstractLogEnabled
- implements AssemblyArchiverPhase, PhaseOrder
-{
-
- /**
- * {@inheritDoc}
- */
- public void execute( @Nonnull final Assembly assembly, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final List<FileSet> fileSets = assembly.getFileSets();
-
- if ( ( fileSets != null ) && !fileSets.isEmpty() )
- {
- final AddFileSetsTask task = new AddFileSetsTask( fileSets );
-
- task.setLogger( getLogger() );
- task.execute( archiver, configSource );
- }
- }
-
-
- public int order()
- {
- // CHECKSTYLE_OFF: MagicNumber
- return 20;
- // CHECKSTYLE_ON: MagicNumber
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
deleted file mode 100644
index de09c08..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
+++ /dev/null
@@ -1,587 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.task.AddArtifactTask;
-import org.apache.maven.plugin.assembly.archive.task.AddDependencySetsTask;
-import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTask;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.functions.MavenProjects;
-import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
-import org.apache.maven.plugin.assembly.model.Assemblies;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.model.ModuleBinaries;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-import org.apache.maven.plugin.assembly.model.ModuleSources;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.FilterUtils;
-import org.apache.maven.plugin.assembly.utils.ProjectUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.apache.maven.plugin.assembly.functions.MavenProjects.addTo;
-import static org.apache.maven.plugin.assembly.functions.MavenProjects.log;
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator;
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator;
-
-/**
- * Handles the <moduleSets/> top-level section of the assembly descriptor.
- *
- * @version $Id$
- */
-@Component( role = AssemblyArchiverPhase.class, hint = "module-sets" )
-public class ModuleSetAssemblyPhase
- extends AbstractLogEnabled
- implements AssemblyArchiverPhase, PhaseOrder
-{
-
- // TODO: Remove if using something like commons-lang instead.
-
- /**
- * The line separator.
- */
- private static final String LINE_SEPARATOR = System.getProperty( "line.separator" );
-
- @Requirement
- private MavenProjectBuilder projectBuilder;
-
- @Requirement
- private ArchiverManager archiverManager;
-
- @Requirement
- private DependencyResolver dependencyResolver;
-
- /**
- * Create an instance.
- */
- public ModuleSetAssemblyPhase()
- {
- // needed for plexus
- }
-
- /**
- * @param projectBuilder The project builder.
- * @param logger The logger.
- */
- public ModuleSetAssemblyPhase( final MavenProjectBuilder projectBuilder, DependencyResolver dependencyResolver,
- final Logger logger )
- {
- this.projectBuilder = projectBuilder;
- this.dependencyResolver = dependencyResolver;
- enableLogging( logger );
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute( final Assembly assembly, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
- Assemblies.forEachModuleSet( assembly, new ModuleSetConsumer()
- {
- public void accept( ModuleSet resolvedModule )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
- validate( resolvedModule, configSource );
-
- final Set<MavenProject> moduleProjects = getModuleProjects( resolvedModule, configSource, getLogger() );
-
- final ModuleSources sources = resolvedModule.getSources();
- addModuleSourceFileSets( sources, moduleProjects, archiver, configSource );
-
- final ModuleBinaries binaries = resolvedModule.getBinaries();
- addModuleBinaries( assembly, resolvedModule, binaries, moduleProjects, archiver, configSource );
- }
- } );
- }
-
- private void validate( final ModuleSet moduleSet, final AssemblerConfigurationSource configSource )
- {
- if ( ( moduleSet.getSources() == null ) && ( moduleSet.getBinaries() == null ) )
- {
- getLogger().warn( "Encountered ModuleSet with no sources or binaries specified. Skipping." );
- }
-
- if ( moduleSet.isUseAllReactorProjects() && !moduleSet.isIncludeSubModules() )
- {
- getLogger().warn( "includeSubModules == false is incompatible with useAllReactorProjects. Ignoring."
- + "\n\nTo refactor, remove the <includeSubModules/> flag, and use the <includes/> "
- + "and <excludes/> sections to fine-tune the modules included." );
- }
-
- final List<MavenProject> projects = configSource.getReactorProjects();
- if ( projects != null && projects.size() > 1 && projects.indexOf( configSource.getProject() ) == 0
- && moduleSet.getBinaries() != null )
- {
- getLogger().warn( "[DEPRECATION] moduleSet/binaries section detected in root-project assembly."
- + "\n\nMODULE BINARIES MAY NOT BE AVAILABLE FOR THIS ASSEMBLY!"
- + "\n\n To refactor, move this assembly into a child project and use the flag "
- + "<useAllReactorProjects>true</useAllReactorProjects> in each moduleSet." );
- }
-
- if ( moduleSet.getSources() != null )
- {
- final ModuleSources sources = moduleSet.getSources();
- if ( isDeprecatedModuleSourcesConfigPresent( sources ) )
- {
- getLogger().warn( "[DEPRECATION] Use of <moduleSources/> as a file-set is deprecated. "
- + "Please use the <fileSets/> sub-element of <moduleSources/> instead." );
- }
- else if ( !sources.isUseDefaultExcludes() )
- {
- getLogger().warn( "[DEPRECATION] Use of directoryMode, fileMode, or useDefaultExcludes "
- + "elements directly within <moduleSources/> are all deprecated. "
- + "Please use the <fileSets/> sub-element of <moduleSources/> instead." );
- }
- }
- }
-
- void addModuleBinaries( final Assembly assembly, ModuleSet moduleSet, final ModuleBinaries binaries,
- final Set<MavenProject> projects, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
- if ( binaries == null )
- {
- return;
- }
-
- final Set<MavenProject> moduleProjects = new LinkedHashSet<MavenProject>();
-
- MavenProjects.select( projects, "pom", log( getLogger() ), addTo( moduleProjects ) );
-
- final String classifier = binaries.getAttachmentClassifier();
-
- final Map<MavenProject, Artifact> chosenModuleArtifacts = new HashMap<MavenProject, Artifact>();
-
- for ( final MavenProject project : moduleProjects )
- {
- Artifact artifact;
-
- if ( classifier == null )
- {
- getLogger().debug( "Processing binary artifact for module project: " + project.getId() );
-
- artifact = project.getArtifact();
- }
- else
- {
- getLogger().debug(
- "Processing binary attachment: " + classifier + " for module project: " + project.getId() );
-
- artifact = MavenProjects.findArtifactByClassifier( project, classifier );
-
- if ( artifact == null )
- {
- throw new InvalidAssemblerConfigurationException(
- "Cannot find attachment with classifier: " + classifier + " in module project: "
- + project.getId() + ". Please exclude this module from the module-set." );
- }
- }
-
- chosenModuleArtifacts.put( project, artifact );
- addModuleArtifact( artifact, project, archiver, configSource, binaries );
- }
-
- final List<DependencySet> depSets = getDependencySets( binaries );
-
- if ( depSets != null )
- {
- Map<DependencySet, Set<Artifact>> dependencySetSetMap =
- dependencyResolver.resolveDependencySets( assembly, moduleSet, configSource, depSets );
-
- for ( final DependencySet ds : depSets )
- {
- // NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled!
- ds.setUseProjectArtifact( false );
- }
-
- // TODO: The following should be moved into a shared component, cause this
- // test is the same as in maven-enforce rules ReactorModuleConvergence.
- List<MavenProject> validateModuleVersions = validateModuleVersions( moduleProjects );
- if ( !validateModuleVersions.isEmpty() )
- {
-
- StringBuilder sb =
- new StringBuilder().append( "The current modules seemed to be having different versions." );
- sb.append( LINE_SEPARATOR );
- for ( MavenProject mavenProject : validateModuleVersions )
- {
- sb.append( " --> " );
- sb.append( mavenProject.getId() );
- sb.append( LINE_SEPARATOR );
- }
- getLogger().warn( sb.toString() );
- }
-
- for ( final MavenProject moduleProject : moduleProjects )
- {
- getLogger().debug( "Processing binary dependencies for module project: " + moduleProject.getId() );
-
- for ( Map.Entry<DependencySet, Set<Artifact>> dependencySetSetEntry : dependencySetSetMap.entrySet() )
- {
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( dependencySetSetEntry.getKey() ),
- dependencySetSetEntry.getValue(), moduleProject, projectBuilder,
- getLogger() );
-
- task.setModuleProject( moduleProject );
- task.setModuleArtifact( chosenModuleArtifacts.get( moduleProject ) );
- task.setDefaultOutputDirectory( binaries.getOutputDirectory() );
- task.setDefaultOutputFileNameMapping( binaries.getOutputFileNameMapping() );
-
- task.execute( archiver, configSource );
-
- }
- }
- }
- }
-
- private List<MavenProject> validateModuleVersions( Set<MavenProject> moduleProjects )
- {
- List<MavenProject> result = new ArrayList<MavenProject>();
-
- if ( moduleProjects != null && !moduleProjects.isEmpty() )
- {
- String version = moduleProjects.iterator().next().getVersion();
- getLogger().debug( "First version:" + version );
- for ( MavenProject mavenProject : moduleProjects )
- {
- getLogger().debug( " -> checking " + mavenProject.getId() );
- if ( !version.equals( mavenProject.getVersion() ) )
- {
- result.add( mavenProject );
- }
- }
- }
- return result;
- }
-
- public static List<DependencySet> getDependencySets( final ModuleBinaries binaries )
- {
- List<DependencySet> depSets = binaries.getDependencySets();
-
- if ( ( ( depSets == null ) || depSets.isEmpty() ) && binaries.isIncludeDependencies() )
- {
- final DependencySet impliedDependencySet = new DependencySet();
-
- impliedDependencySet.setOutputDirectory( binaries.getOutputDirectory() );
- //impliedDependencySet.setOutputFileNameMapping( binaries.getOutputFileNameMapping() );
- impliedDependencySet.setFileMode( binaries.getFileMode() );
- impliedDependencySet.setDirectoryMode( binaries.getDirectoryMode() );
- impliedDependencySet.setExcludes( binaries.getExcludes() );
- impliedDependencySet.setIncludes( binaries.getIncludes() );
- impliedDependencySet.setUnpack( binaries.isUnpack() );
- // unpackOptions is handled in the first stage of dependency-set handling, below.
-
- depSets = Collections.singletonList( impliedDependencySet );
- }
-
- return depSets;
- }
-
- void addModuleArtifact( final Artifact artifact, final MavenProject project, final Archiver archiver,
- final AssemblerConfigurationSource configSource, final ModuleBinaries binaries )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- if ( artifact.getFile() == null )
- {
- throw new ArchiveCreationException(
- "Artifact: " + artifact.getId() + " (included by module) does not have an artifact with a file. "
- + "Please ensure the package phase is run before the assembly is generated." );
- }
-
- final AddArtifactTask task = new AddArtifactTask( artifact, getLogger(), null );
-
- task.setFileNameMapping( binaries.getOutputFileNameMapping() );
- task.setOutputDirectory( binaries.getOutputDirectory() );
- task.setProject( project );
- task.setModuleProject( project );
- task.setModuleArtifact( artifact );
-
- final int dirMode = TypeConversionUtils.modeToInt( binaries.getDirectoryMode(), getLogger() );
- if ( dirMode != -1 )
- {
- task.setDirectoryMode( dirMode );
- }
-
- final int fileMode = TypeConversionUtils.modeToInt( binaries.getFileMode(), getLogger() );
- if ( fileMode != -1 )
- {
- task.setFileMode( fileMode );
- }
-
- task.setUnpack( binaries.isUnpack() );
-
- if ( binaries.isUnpack() && binaries.getUnpackOptions() != null )
- {
- task.setIncludes( binaries.getUnpackOptions().getIncludes() );
- task.setExcludes( binaries.getUnpackOptions().getExcludes() );
- }
-
- task.execute( archiver, configSource );
- }
-
- void addModuleSourceFileSets( final ModuleSources sources, final Set<MavenProject> moduleProjects,
- final Archiver archiver, final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- if ( sources == null )
- {
- return;
- }
-
- final List<FileSet> fileSets = new ArrayList<FileSet>();
-
- if ( isDeprecatedModuleSourcesConfigPresent( sources ) )
- {
- final FileSet fs = new FileSet();
- fs.setOutputDirectory( sources.getOutputDirectory() );
- fs.setIncludes( sources.getIncludes() );
- fs.setExcludes( sources.getExcludes() );
- fs.setUseDefaultExcludes( sources.isUseDefaultExcludes() );
-
- fileSets.add( fs );
- }
-
- List<FileSet> subFileSets = sources.getFileSets();
-
- if ( ( subFileSets == null ) || subFileSets.isEmpty() )
- {
- final FileSet fs = new FileSet();
- fs.setDirectory( "src" );
-
- subFileSets = Collections.singletonList( fs );
- }
-
- fileSets.addAll( subFileSets );
-
- for ( final MavenProject moduleProject : moduleProjects )
- {
- getLogger().info( "Processing sources for module project: " + moduleProject.getId() );
-
- final List<FileSet> moduleFileSets = new ArrayList<FileSet>();
-
- for ( final FileSet fileSet : fileSets )
- {
- moduleFileSets.add( createFileSet( fileSet, sources, moduleProject, configSource ) );
- }
-
- final AddFileSetsTask task = new AddFileSetsTask( moduleFileSets );
-
- task.setProject( moduleProject );
- task.setModuleProject( moduleProject );
- task.setLogger( getLogger() );
-
- task.execute( archiver, configSource );
- }
- }
-
- /**
- * Determine whether the deprecated file-set configuration directly within the ModuleSources object is present.
- */
- boolean isDeprecatedModuleSourcesConfigPresent( @Nonnull final ModuleSources sources )
- {
- boolean result = false;
-
- if ( sources.getOutputDirectory() != null )
- {
- result = true;
- }
- else if ( ( sources.getIncludes() != null ) && !sources.getIncludes().isEmpty() )
- {
- result = true;
- }
- else if ( ( sources.getExcludes() != null ) && !sources.getExcludes().isEmpty() )
- {
- result = true;
- }
-
- return result;
- }
-
- @Nonnull
- FileSet createFileSet( @Nonnull final FileSet fileSet, @Nonnull final ModuleSources sources,
- @Nonnull final MavenProject moduleProject,
- @Nonnull final AssemblerConfigurationSource configSource )
- throws AssemblyFormattingException
- {
- final FileSet fs = new FileSet();
-
- String sourcePath = fileSet.getDirectory();
-
- final File moduleBasedir = moduleProject.getBasedir();
-
- if ( sourcePath != null )
- {
- final File sourceDir = new File( sourcePath );
-
- if ( !sourceDir.isAbsolute() )
- {
- sourcePath = new File( moduleBasedir, sourcePath ).getAbsolutePath();
- }
- }
- else
- {
- sourcePath = moduleBasedir.getAbsolutePath();
- }
-
- fs.setDirectory( sourcePath );
- fs.setDirectoryMode( fileSet.getDirectoryMode() );
-
- final List<String> excludes = new ArrayList<String>();
-
- final List<String> originalExcludes = fileSet.getExcludes();
- if ( ( originalExcludes != null ) && !originalExcludes.isEmpty() )
- {
- excludes.addAll( originalExcludes );
- }
-
- if ( sources.isExcludeSubModuleDirectories() )
- {
- @SuppressWarnings( "unchecked" ) final List<String> modules = moduleProject.getModules();
- for ( final String moduleSubPath : modules )
- {
- excludes.add( moduleSubPath + "/**" );
- }
- }
-
- fs.setExcludes( excludes );
- fs.setFiltered( fileSet.isFiltered() );
- fs.setFileMode( fileSet.getFileMode() );
- fs.setIncludes( fileSet.getIncludes() );
- fs.setLineEnding( fileSet.getLineEnding() );
-
- FixedStringSearchInterpolator moduleProjectInterpolator = moduleProjectInterpolator( moduleProject );
- FixedStringSearchInterpolator artifactProjectInterpolator = artifactProjectInterpolator( moduleProject );
- String destPathPrefix = "";
- if ( sources.isIncludeModuleDirectory() )
- {
- destPathPrefix = AssemblyFormatUtils.evaluateFileNameMapping( sources.getOutputDirectoryMapping(),
- moduleProject.getArtifact(),
- configSource.getProject(),
- moduleProject.getArtifact(), configSource,
- moduleProjectInterpolator,
- artifactProjectInterpolator );
-
- if ( !destPathPrefix.endsWith( "/" ) )
- {
- destPathPrefix += "/";
- }
- }
-
- String destPath = fileSet.getOutputDirectory();
-
- if ( destPath == null )
- {
- destPath = destPathPrefix;
- }
- else
- {
- destPath = destPathPrefix + destPath;
- }
-
- destPath = AssemblyFormatUtils.getOutputDirectory( destPath, configSource.getFinalName(), configSource,
- moduleProjectInterpolator, artifactProjectInterpolator );
-
- fs.setOutputDirectory( destPath );
-
- getLogger().debug( "module source directory is: " + sourcePath );
- getLogger().debug( "module dest directory is: " + destPath + " (assembly basedir may be prepended)" );
-
- return fs;
- }
-
- @Nonnull
- public static Set<MavenProject> getModuleProjects( final ModuleSet moduleSet,
- final AssemblerConfigurationSource configSource,
- final Logger logger )
- throws ArchiveCreationException
- {
- MavenProject project = configSource.getProject();
- Set<MavenProject> moduleProjects = null;
-
- if ( moduleSet.isUseAllReactorProjects() )
- {
- if ( !moduleSet.isIncludeSubModules() )
- {
- moduleProjects = new LinkedHashSet<MavenProject>( configSource.getReactorProjects() );
- }
-
- project = configSource.getReactorProjects().get( 0 );
- }
-
- if ( moduleProjects == null )
- {
- try
- {
- moduleProjects = ProjectUtils.getProjectModules( project, configSource.getReactorProjects(),
- moduleSet.isIncludeSubModules(), logger );
- }
- catch ( final IOException e )
- {
- throw new ArchiveCreationException(
- "Error retrieving module-set for project: " + project.getId() + ": " + e.getMessage(), e );
- }
- }
-
- return FilterUtils.filterProjects( moduleProjects, moduleSet.getIncludes(), moduleSet.getExcludes(), true,
- logger );
- }
-
-
- public int order()
- {
- // CHECKSTYLE_OFF: MagicNumber
- return 30;
- // CHECKSTYLE_ON: MagicNumber
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
deleted file mode 100644
index 74d78d1..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Indicates the order of a phase
- * Elements without order will come before the ordered elements
- */
-public interface PhaseOrder
-{
- int order();
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
deleted file mode 100644
index 5c47210..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper;
-import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoInfoWrapper;
-import org.apache.maven.plugin.assembly.archive.task.AddDirectoryTask;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.shared.repository.RepositoryAssembler;
-import org.apache.maven.shared.repository.RepositoryAssemblyException;
-import org.apache.maven.shared.repository.RepositoryBuilderConfigSource;
-import org.apache.maven.shared.repository.model.RepositoryInfo;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-@Component( role = AssemblyArchiverPhase.class, hint = "repositories" )
-public class RepositoryAssemblyPhase
- extends AbstractLogEnabled
- implements AssemblyArchiverPhase, PhaseOrder
-{
-
- @Requirement
- private RepositoryAssembler repositoryAssembler;
-
- public RepositoryAssemblyPhase()
- {
- // used for plexus.
- }
-
- // introduced for testing.
- public RepositoryAssemblyPhase( final RepositoryAssembler repositoryAssembler )
- {
- this.repositoryAssembler = repositoryAssembler;
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
- public void execute( final Assembly assembly, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
- {
- final List<Repository> repositoriesList = assembly.getRepositories();
-
- final File tempRoot = configSource.getTemporaryRootDirectory();
-
- for ( final Repository repository : repositoriesList )
- {
- final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( repository.getOutputDirectory(), configSource.getFinalName(),
- configSource, AssemblyFormatUtils.moduleProjectInterpolator(
- configSource.getProject() ), AssemblyFormatUtils.artifactProjectInterpolator( null ) );
-
- final File repositoryDirectory = new File( tempRoot, outputDirectory );
-
- if ( !repositoryDirectory.exists() )
- {
- repositoryDirectory.mkdirs();
- }
-
- try
- {
- getLogger().debug( "Assembling repository to: " + repositoryDirectory );
- repositoryAssembler.buildRemoteRepository( repositoryDirectory, wrap( repository ),
- wrap( configSource ) );
- getLogger().debug( "Finished assembling repository to: " + repositoryDirectory );
- }
- catch ( final RepositoryAssemblyException e )
- {
- throw new ArchiveCreationException( "Failed to assemble repository: " + e.getMessage(), e );
- }
-
- final AddDirectoryTask task = new AddDirectoryTask( repositoryDirectory );
-
- final int dirMode = TypeConversionUtils.modeToInt( repository.getDirectoryMode(), getLogger() );
- if ( dirMode != -1 )
- {
- task.setDirectoryMode( dirMode );
- }
-
- final int fileMode = TypeConversionUtils.modeToInt( repository.getFileMode(), getLogger() );
- if ( fileMode != -1 )
- {
- task.setFileMode( fileMode );
- }
-
- task.setOutputDirectory( outputDirectory );
-
- task.execute( archiver );
- }
- }
-
- private RepositoryBuilderConfigSource wrap( final AssemblerConfigurationSource configSource )
- {
- return new RepoBuilderConfigSourceWrapper( configSource );
- }
-
- private RepositoryInfo wrap( final Repository repository )
- {
- return new RepoInfoWrapper( repository );
- }
-
- public int order()
- {
- // CHECKSTYLE_OFF: MagicNumber
- return 50;
- // CHECKSTYLE_ON: MagicNumber
- }
-}
-
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
deleted file mode 100644
index aa1751f..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase.wrappers;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.model.GroupVersionAlignment;
-
-import java.util.List;
-
-/**
- * @version $Id$
- */
-class GroupVersionAlignmentWrapper
- implements org.apache.maven.shared.repository.model.GroupVersionAlignment
-{
-
- private final GroupVersionAlignment alignment;
-
- /**
- * @param alignment @{link {@link GroupVersionAlignment}
- */
- public GroupVersionAlignmentWrapper( final GroupVersionAlignment alignment )
- {
- this.alignment = alignment;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<String> getExcludes()
- {
- return alignment.getExcludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getId()
- {
- return alignment.getId();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getVersion()
- {
- return alignment.getVersion();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java
deleted file mode 100644
index 6f10519..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase.wrappers;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.repository.RepositoryBuilderConfigSource;
-
-/**
- * @version $Id$
- */
-public class RepoBuilderConfigSourceWrapper
- implements RepositoryBuilderConfigSource
-{
-
- private final AssemblerConfigurationSource configSource;
-
- public RepoBuilderConfigSourceWrapper( AssemblerConfigurationSource configSource )
- {
- this.configSource = configSource;
- }
-
- public ArtifactRepository getLocalRepository()
- {
- return configSource.getLocalRepository();
- }
-
- public MavenProject getProject()
- {
- return configSource.getProject();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
deleted file mode 100644
index 7cf5061..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase.wrappers;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.model.GroupVersionAlignment;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.shared.repository.model.RepositoryInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public class RepoInfoWrapper
- implements RepositoryInfo
-{
-
- private final Repository repo;
-
- private List<GroupVersionAlignmentWrapper> convertedAlignments;
-
- /**
- * @param repo The {@link Repository}
- */
- public RepoInfoWrapper( final Repository repo )
- {
- this.repo = repo;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<String> getExcludes()
- {
- return repo.getExcludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public List<GroupVersionAlignmentWrapper> getGroupVersionAlignments()
- {
- final List<GroupVersionAlignment> alignments = repo.getGroupVersionAlignments();
-
- if ( convertedAlignments == null || alignments.size() != convertedAlignments.size() )
- {
- final List<GroupVersionAlignmentWrapper> l =
- new ArrayList<GroupVersionAlignmentWrapper>( alignments.size() );
-
- for ( final GroupVersionAlignment alignment : alignments )
- {
- l.add( new GroupVersionAlignmentWrapper( alignment ) );
- }
-
- convertedAlignments = l;
- }
-
- return convertedAlignments;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<String> getIncludes()
- {
- return repo.getIncludes();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getScope()
- {
- return repo.getScope();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isIncludeMetadata()
- {
- return repo.isIncludeMetadata();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
deleted file mode 100644
index 8d06ff7..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
-import org.codehaus.plexus.archiver.util.DefaultFileSet;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator;
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator;
-
-/**
- * @version $Id$
- */
-public class AddArtifactTask
-{
-
- public static final String[] DEFAULT_INCLUDES_ARRAY = { "**/*" };
-
- private int directoryMode = -1;
-
- private int fileMode = -1;
-
- private boolean unpack = false;
-
- private List<String> includes;
-
- private List<String> excludes;
-
- private final Artifact artifact;
-
- private MavenProject project;
-
- private MavenProject moduleProject;
-
- private Artifact moduleArtifact;
-
- private String outputDirectory;
-
- private String outputFileNameMapping;
-
- private final Logger logger;
-
- private final InputStreamTransformer transformer;
-
- private final Charset encoding;
-
- public AddArtifactTask( final Artifact artifact, final Logger logger, InputStreamTransformer transformer,
- Charset encoding )
- {
- this.artifact = artifact;
- this.logger = logger;
- this.transformer = transformer;
- this.encoding = encoding;
- }
-
- public AddArtifactTask( final Artifact artifact, final Logger logger, Charset encoding )
- {
- this( artifact, logger, null, encoding );
- }
-
- public void execute( final Archiver archiver, final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- if ( artifactIsArchiverDestination( archiver ) )
- {
- artifact.setFile( moveArtifactSomewhereElse( configSource ) );
- }
-
- String destDirectory =
- AssemblyFormatUtils.getOutputDirectory( outputDirectory, configSource.getFinalName(), configSource,
- moduleProjectInterpolator( moduleProject ),
- artifactProjectInterpolator( project ) );
-
- boolean fileModeSet = false;
- boolean dirModeSet = false;
-
- final int oldDirMode = archiver.getOverrideDirectoryMode();
- final int oldFileMode = archiver.getOverrideFileMode();
-
- if ( fileMode != -1 )
- {
- archiver.setFileMode( fileMode );
- fileModeSet = true;
- }
-
- if ( directoryMode != -1 )
- {
- archiver.setDirectoryMode( directoryMode );
- dirModeSet = true;
- }
- try
- {
-
- if ( unpack )
- {
- unpacked( archiver, destDirectory );
- }
- else
- {
- asFile( archiver, configSource, destDirectory );
- }
- }
- finally
- {
- if ( dirModeSet )
- {
- archiver.setDirectoryMode( oldDirMode );
- }
-
- if ( fileModeSet )
- {
- archiver.setFileMode( oldFileMode );
- }
- }
-
- }
-
- private void asFile( Archiver archiver, AssemblerConfigurationSource configSource, String destDirectory )
- throws AssemblyFormattingException, ArchiveCreationException
- {
- final String tempMapping =
- AssemblyFormatUtils.evaluateFileNameMapping( outputFileNameMapping, artifact, configSource.getProject(),
- moduleArtifact, configSource,
- moduleProjectInterpolator( moduleProject ),
- artifactProjectInterpolator( project ) );
-
- final String outputLocation = destDirectory + tempMapping;
-
- try
- {
- final File artifactFile = artifact.getFile();
-
- logger.debug(
- "Adding artifact: " + artifact.getId() + " with file: " + artifactFile + " to assembly location: "
- + outputLocation + "." );
-
- if ( fileMode != -1 )
- {
- archiver.addFile( artifactFile, outputLocation, fileMode );
- }
- else
- {
- archiver.addFile( artifactFile, outputLocation );
- }
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException(
- "Error adding file '" + artifact.getId() + "' to archive: " + e.getMessage(), e );
- }
- }
-
- private void unpacked( Archiver archiver, String destDirectory )
- throws ArchiveCreationException
- {
- String outputLocation = destDirectory;
-
- if ( ( outputLocation.length() > 0 ) && !outputLocation.endsWith( "/" ) )
- {
- outputLocation += "/";
- }
-
- String[] includesArray = TypeConversionUtils.toStringArray( includes );
- if ( includesArray == null )
- {
- includesArray = DEFAULT_INCLUDES_ARRAY;
- }
- final String[] excludesArray = TypeConversionUtils.toStringArray( excludes );
-
- try
- {
-
- final File artifactFile = artifact.getFile();
- if ( artifactFile == null )
- {
- logger.warn(
- "Skipping artifact: " + artifact.getId() + "; it does not have an associated file or directory." );
- }
- else if ( artifactFile.isDirectory() )
- {
- logger.debug( "Adding artifact directory contents for: " + artifact + " to: " + outputLocation );
-
- DefaultFileSet fs = DefaultFileSet.fileSet( artifactFile );
- fs.setIncludes( includesArray );
- fs.setExcludes( excludesArray );
- fs.setPrefix( outputLocation );
- fs.setStreamTransformer( transformer );
- archiver.addFileSet( fs );
- }
- else
- {
- logger.debug( "Unpacking artifact contents for: " + artifact + " to: " + outputLocation );
- logger.debug( "includes:\n" + StringUtils.join( includesArray, "\n" ) + "\n" );
- logger.debug(
- "excludes:\n" + ( excludesArray == null ? "none" : StringUtils.join( excludesArray, "\n" ) )
- + "\n" );
- DefaultArchivedFileSet afs = DefaultArchivedFileSet.archivedFileSet( artifactFile );
- afs.setIncludes( includesArray );
- afs.setExcludes( excludesArray );
- afs.setPrefix( outputLocation );
- afs.setStreamTransformer( transformer );
- archiver.addArchivedFileSet( afs, encoding );
- }
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException(
- "Error adding file-set for '" + artifact.getId() + "' to archive: " + e.getMessage(), e );
- }
- }
-
- private File moveArtifactSomewhereElse( AssemblerConfigurationSource configSource )
- throws ArchiveCreationException
- {
- final File tempRoot = configSource.getTemporaryRootDirectory();
- final File tempArtifactFile = new File( tempRoot, artifact.getFile().getName() );
-
- logger.warn( "Artifact: " + artifact.getId() + " references the same file as the assembly destination file. "
- + "Moving it to a temporary location for inclusion." );
- try
- {
- FileUtils.copyFile( artifact.getFile(), tempArtifactFile );
- }
- catch ( final IOException e )
- {
- throw new ArchiveCreationException(
- "Error moving artifact file: '" + artifact.getFile() + "' to temporary location: " + tempArtifactFile
- + ". Reason: " + e.getMessage(), e );
- }
- return tempArtifactFile;
- }
-
- private boolean artifactIsArchiverDestination( Archiver archiver )
- {
- return ( ( artifact.getFile() != null ) && ( archiver.getDestFile() != null ) ) && artifact.getFile().equals(
- archiver.getDestFile() );
- }
-
- public void setDirectoryMode( final int directoryMode )
- {
- this.directoryMode = directoryMode;
- }
-
- public void setFileMode( final int fileMode )
- {
- this.fileMode = fileMode;
- }
-
- public void setExcludes( final List<String> excludes )
- {
- this.excludes = excludes;
- }
-
- public void setIncludes( final List<String> includes )
- {
- this.includes = includes;
- }
-
- public void setUnpack( final boolean unpack )
- {
- this.unpack = unpack;
- }
-
- public void setProject( final MavenProject project )
- {
- this.project = project;
- }
-
- public void setOutputDirectory( final String outputDirectory )
- {
- this.outputDirectory = outputDirectory;
- }
-
- public void setFileNameMapping( final String outputFileNameMapping )
- {
- this.outputFileNameMapping = outputFileNameMapping;
- }
-
- public void setOutputDirectory( final String outputDirectory, final String defaultOutputDirectory )
- {
- setOutputDirectory( outputDirectory == null ? defaultOutputDirectory : outputDirectory );
- }
-
- public void setFileNameMapping( final String outputFileNameMapping, final String defaultOutputFileNameMapping )
- {
- setFileNameMapping( outputFileNameMapping == null ? defaultOutputFileNameMapping : outputFileNameMapping );
- }
-
- public void setModuleProject( final MavenProject moduleProject )
- {
- this.moduleProject = moduleProject;
- }
-
- public void setModuleArtifact( final Artifact moduleArtifact )
- {
- this.moduleArtifact = moduleArtifact;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
deleted file mode 100644
index 461bbf7..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
+++ /dev/null
@@ -1,418 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.format.ReaderFormatter;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.UnpackOptions;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.FilterUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator;
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator;
-
-/**
- * @version $Id$
- */
-public class AddDependencySetsTask
-{
-
- private static final List<String> NON_ARCHIVE_DEPENDENCY_TYPES;
-
- static
- {
- final List<String> nonArch = new ArrayList<String>();
-
- nonArch.add( "pom" );
-
- NON_ARCHIVE_DEPENDENCY_TYPES = Collections.unmodifiableList( nonArch );
- }
-
- private final List<DependencySet> dependencySets;
-
- private final Logger logger;
-
- private final MavenProject project;
-
- private MavenProject moduleProject;
-
- private final MavenProjectBuilder projectBuilder;
-
- private String defaultOutputDirectory;
-
- private String defaultOutputFileNameMapping;
-
- private Artifact moduleArtifact;
-
- private final Set<Artifact> resolvedArtifacts;
-
-
- public AddDependencySetsTask( final List<DependencySet> dependencySets, final Set<Artifact> resolvedArtifacts,
- final MavenProject project, final MavenProjectBuilder projectBuilder,
- final Logger logger )
- {
- this.dependencySets = dependencySets;
- this.resolvedArtifacts = resolvedArtifacts;
- this.project = project;
- this.projectBuilder = projectBuilder;
- this.logger = logger;
- }
-
- public void execute( final Archiver archiver, final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
- {
- if ( ( dependencySets == null ) || dependencySets.isEmpty() )
- {
- logger.debug( "No dependency sets specified." );
- return;
- }
-
- @SuppressWarnings( "unchecked" ) final List<Dependency> deps = project.getDependencies();
- if ( ( deps == null ) || deps.isEmpty() )
- {
- logger.debug( "Project " + project.getId() + " has no dependencies. Skipping dependency set addition." );
- }
-
- for ( final DependencySet dependencySet : dependencySets )
- {
- addDependencySet( dependencySet, archiver, configSource );
- }
- }
-
- void addDependencySet( final DependencySet dependencySet, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException
- {
- logger.debug( "Processing DependencySet (output=" + dependencySet.getOutputDirectory() + ")" );
-
- if ( !dependencySet.isUseTransitiveDependencies() && dependencySet.isUseTransitiveFiltering() )
- {
- logger.warn( "DependencySet has nonsensical configuration: useTransitiveDependencies == false "
- + "AND useTransitiveFiltering == true. Transitive filtering flag will be ignored." );
- }
-
- final Set<Artifact> dependencyArtifacts = resolveDependencyArtifacts( dependencySet );
-
- if ( !unpackTransformsContent( dependencySet ) && dependencyArtifacts.size() > 1 )
- {
- checkMultiArtifactOutputConfig( dependencySet );
- }
-
- logger.debug( "Adding " + dependencyArtifacts.size() + " dependency artifacts." );
-
- InputStreamTransformer fileSetTransformers =
- isUnpackWithOptions( dependencySet )
- ? ReaderFormatter.getFileSetTransformers( configSource, dependencySet.getUnpackOptions().isFiltered(),
- dependencySet.getUnpackOptions().getLineEnding() )
- : null;
-
- for ( final Artifact depArtifact : dependencyArtifacts )
- {
- MavenProject depProject;
- try
- {
- depProject = projectBuilder.buildFromRepository( depArtifact, configSource.getRemoteRepositories(),
- configSource.getLocalRepository() );
- }
- catch ( final ProjectBuildingException e )
- {
- logger.debug(
- "Error retrieving POM of module-dependency: " + depArtifact.getId() + "; Reason: " + e.getMessage()
- + "\n\nBuilding stub project instance." );
-
- depProject = buildProjectStub( depArtifact );
- }
-
- if ( NON_ARCHIVE_DEPENDENCY_TYPES.contains( depArtifact.getType() ) )
- {
- addNonArchiveDependency( depArtifact, depProject, dependencySet, archiver, configSource );
- }
- else
- {
- addNormalArtifact( dependencySet, depArtifact, depProject, archiver, configSource,
- fileSetTransformers );
- }
- }
- }
-
- private boolean isUnpackWithOptions( DependencySet dependencySet )
- {
- return dependencySet.isUnpack() && dependencySet.getUnpackOptions() != null;
- }
-
- private boolean unpackTransformsContent( DependencySet dependencySet )
- {
- return isUnpackWithOptions( dependencySet ) && isConentModifyingOption( dependencySet.getUnpackOptions() );
- }
-
- private boolean isConentModifyingOption( UnpackOptions opts )
- {
- return ( opts.isFiltered() || opts.getLineEnding() != null );
- }
-
- private void checkMultiArtifactOutputConfig( final DependencySet dependencySet )
- {
- String dir = dependencySet.getOutputDirectory();
- if ( dir == null )
- {
- dir = defaultOutputDirectory;
- }
-
- String mapping = dependencySet.getOutputFileNameMapping();
- if ( mapping == null )
- {
- mapping = defaultOutputFileNameMapping;
- }
-
- if ( ( dir == null || !dir.contains( "${" ) ) && ( mapping == null || !mapping.contains( "${" ) ) )
- {
- logger.warn( "NOTE: Your assembly specifies a dependencySet that matches multiple artifacts, but "
- + "specifies a concrete output format. THIS MAY RESULT IN ONE OR MORE ARTIFACTS BEING "
- + "OBSCURED!\n\n" + "Output directory: '" + dir + "'\nOutput filename mapping: '" + mapping
- + "'" );
- }
- }
-
- private void addNormalArtifact( final DependencySet dependencySet, final Artifact depArtifact,
- final MavenProject depProject, final Archiver archiver,
- final AssemblerConfigurationSource configSource,
- InputStreamTransformer fileSetTransformers )
- throws AssemblyFormattingException, ArchiveCreationException
- {
- logger.debug( "Adding dependency artifact " + depArtifact.getId() + "." );
-
- String encoding = isUnpackWithOptions( dependencySet ) ? dependencySet.getUnpackOptions().getEncoding() : null;
- Charset charset = encoding != null ? Charset.forName( encoding ) : null;
- final AddArtifactTask task = new AddArtifactTask( depArtifact, logger, fileSetTransformers, charset );
-
- task.setProject( depProject );
- task.setModuleProject( moduleProject );
- task.setModuleArtifact( moduleArtifact );
- task.setOutputDirectory( dependencySet.getOutputDirectory(), defaultOutputDirectory );
- task.setFileNameMapping( dependencySet.getOutputFileNameMapping(), defaultOutputFileNameMapping );
-
- final int dirMode = TypeConversionUtils.modeToInt( dependencySet.getDirectoryMode(), logger );
- if ( dirMode != -1 )
- {
- task.setDirectoryMode( dirMode );
- }
-
- final int fileMode = TypeConversionUtils.modeToInt( dependencySet.getFileMode(), logger );
- if ( fileMode != -1 )
- {
- task.setFileMode( fileMode );
- }
-
- task.setUnpack( dependencySet.isUnpack() );
-
- final UnpackOptions opts = dependencySet.getUnpackOptions();
- if ( isUnpackWithOptions( dependencySet ) )
- {
- task.setIncludes( opts.getIncludes() );
- task.setExcludes( opts.getExcludes() );
- }
-
- task.execute( archiver, configSource );
-
- }
-
- private MavenProject buildProjectStub( final Artifact depArtifact )
- {
- final Model model = new Model();
- model.setGroupId( depArtifact.getGroupId() );
- model.setArtifactId( depArtifact.getArtifactId() );
- model.setVersion( depArtifact.getBaseVersion() );
- model.setPackaging( depArtifact.getType() );
-
- model.setDescription( "Stub for " + depArtifact.getId() );
-
- final MavenProject project = new MavenProject( model );
- project.setArtifact( depArtifact );
-
- return project;
- }
-
- Set<Artifact> resolveDependencyArtifacts( final DependencySet dependencySet )
- throws InvalidAssemblerConfigurationException
- {
- final Set<Artifact> dependencyArtifacts = new LinkedHashSet<Artifact>();
- if ( resolvedArtifacts != null )
- {
- dependencyArtifacts.addAll( resolvedArtifacts );
- }
-
- if ( dependencySet.isUseProjectArtifact() )
- {
- final Artifact projectArtifact = project.getArtifact();
- if ( ( projectArtifact != null ) && ( projectArtifact.getFile() != null ) )
- {
- dependencyArtifacts.add( projectArtifact );
- }
- else
- {
- logger.warn( "Cannot include project artifact: " + projectArtifact
- + "; it doesn't have an associated file or directory." );
- }
- }
-
- if ( dependencySet.isUseProjectAttachments() )
- {
- @SuppressWarnings( "unchecked" ) final List<Artifact> attachments = project.getAttachedArtifacts();
- if ( attachments != null )
- {
- for ( final Artifact attachment : attachments )
- {
- if ( attachment.getFile() != null )
- {
- dependencyArtifacts.add( attachment );
- }
- else
- {
- logger.warn(
- "Cannot include attached artifact: " + project.getId() + " for project: " + project.getId()
- + "; it doesn't have an associated file or directory." );
- }
- }
- }
- }
-
- if ( dependencySet.isUseTransitiveFiltering() )
- {
- logger.debug( "Filtering dependency artifacts USING transitive dependency path information." );
- }
- else
- {
- logger.debug( "Filtering dependency artifacts WITHOUT transitive dependency path information." );
- }
-
- final ScopeArtifactFilter filter = new ScopeArtifactFilter( dependencySet.getScope() );
-
- FilterUtils.filterArtifacts( dependencyArtifacts, dependencySet.getIncludes(), dependencySet.getExcludes(),
- dependencySet.isUseStrictFiltering(), dependencySet.isUseTransitiveFiltering(),
- logger, filter );
-
- return dependencyArtifacts;
- }
-
- private void addNonArchiveDependency( final Artifact depArtifact, final MavenProject depProject,
- final DependencySet dependencySet, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
- throws AssemblyFormattingException, ArchiveCreationException
- {
- final File source = depArtifact.getFile();
-
- String outputDirectory = dependencySet.getOutputDirectory();
-
- FixedStringSearchInterpolator moduleProjectInterpolator = moduleProjectInterpolator( moduleProject );
- FixedStringSearchInterpolator artifactProjectInterpolator = artifactProjectInterpolator( depProject );
- outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( outputDirectory, depProject.getBuild().getFinalName(), configSource,
- moduleProjectInterpolator, artifactProjectInterpolator );
-
- final String destName =
- AssemblyFormatUtils.evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), depArtifact,
- configSource.getProject(), moduleArtifact, configSource,
- moduleProjectInterpolator, artifactProjectInterpolator );
-
- String target;
-
- // omit the last char if ends with / or \\
- if ( outputDirectory.endsWith( "/" ) || outputDirectory.endsWith( "\\" ) )
- {
- target = outputDirectory + destName;
- }
- else
- {
- target = outputDirectory + "/" + destName;
- }
-
- try
- {
- final int mode = TypeConversionUtils.modeToInt( dependencySet.getFileMode(), logger );
- if ( mode > -1 )
- {
- archiver.addFile( source, target, mode );
- }
- else
- {
- archiver.addFile( source, target );
- }
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e );
- }
- }
-
- public List<DependencySet> getDependencySets()
- {
- return dependencySets;
- }
-
- public Logger getLogger()
- {
- return logger;
- }
-
- public void setDefaultOutputDirectory( final String defaultOutputDirectory )
- {
- this.defaultOutputDirectory = defaultOutputDirectory;
- }
-
- public void setDefaultOutputFileNameMapping( final String defaultOutputFileNameMapping )
- {
- this.defaultOutputFileNameMapping = defaultOutputFileNameMapping;
- }
-
- public void setModuleProject( final MavenProject moduleProject )
- {
- this.moduleProject = moduleProject;
- }
-
- public void setModuleArtifact( final Artifact moduleArtifact )
- {
- this.moduleArtifact = moduleArtifact;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
deleted file mode 100644
index a95181e..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.util.DefaultFileSet;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public class AddDirectoryTask
-{
-
- private final File directory;
-
- private final InputStreamTransformer transformer;
-
- private List<String> includes;
-
- private List<String> excludes;
-
- private String outputDirectory;
-
- private boolean useDefaultExcludes = true;
-
- private int directoryMode = -1;
-
- private int fileMode = -1;
-
- public AddDirectoryTask( final File directory, InputStreamTransformer transformers )
- {
- this.directory = directory;
-
- this.transformer = transformers;
- }
-
- public AddDirectoryTask( final File directory )
- {
- this( directory, null );
- }
-
- public void execute( final Archiver archiver )
- throws ArchiveCreationException
- {
- if ( ".".equals( outputDirectory ) )
- {
- outputDirectory = "";
- }
- else if ( "..".equals( outputDirectory ) )
- {
- throw new ArchiveCreationException(
- "Cannot add source directory: " + directory + " to archive-path: " + outputDirectory
- + ". All paths must be within the archive root directory." );
- }
-
- final int oldDirMode = archiver.getOverrideDirectoryMode();
- final int oldFileMode = archiver.getOverrideFileMode();
-
- boolean fileModeSet = false;
- boolean dirModeSet = false;
-
- try
- {
- if ( directoryMode != -1 )
- {
- archiver.setDirectoryMode( directoryMode );
- dirModeSet = true;
- }
-
- if ( fileMode != -1 )
- {
- archiver.setFileMode( fileMode );
- fileModeSet = true;
- }
-
- if ( directory.exists() )
- {
- List<String> directoryExcludes;
- if ( excludes != null && !excludes.isEmpty() )
- {
- directoryExcludes = new ArrayList<String>( excludes );
- }
- else
- {
- directoryExcludes = new ArrayList<String>();
- }
-
- try
- {
- String[] includesArray = null;
- if ( includes != null && !includes.isEmpty() )
- {
- includesArray = new String[includes.size()];
-
- int i = 0;
- for ( String include : includes )
- {
- includesArray[i++] = normalize( include );
- }
- }
-
- // this one is guaranteed to be non-null by code above.
- final String[] excludesArray = new String[directoryExcludes.size()];
-
- int i = 0;
- for ( String directoryExclude : directoryExcludes )
- {
- excludesArray[i++] = normalize( directoryExclude );
- }
-
- final DefaultFileSet fs = new DefaultFileSet();
- fs.setUsingDefaultExcludes( useDefaultExcludes );
- fs.setPrefix( outputDirectory );
- fs.setDirectory( directory );
- fs.setIncludes( includesArray );
- fs.setExcludes( excludesArray );
- if ( transformer != null )
- {
- fs.setStreamTransformer( transformer );
- }
-
- archiver.addFileSet( fs );
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException( "Error adding directory to archive: " + e.getMessage(), e );
- }
- }
- }
- finally
- {
- if ( dirModeSet )
- {
- archiver.setDirectoryMode( oldDirMode );
- }
-
- if ( fileModeSet )
- {
- archiver.setFileMode( oldFileMode );
- }
- }
- }
-
- private String normalize( String include )
- {
- String value = AssemblyFormatUtils.fixRelativeRefs( include );
-
- if ( value.startsWith( "/" ) || value.startsWith( "\\" ) )
- {
- value = value.substring( 1 );
- }
- return value;
- }
-
- public void setExcludes( final List<String> excludes )
- {
- this.excludes = excludes;
- }
-
- public void setIncludes( final List<String> includes )
- {
- this.includes = includes;
- }
-
- public void setOutputDirectory( final String outputDirectory )
- {
- this.outputDirectory = outputDirectory;
- }
-
- public void setDirectoryMode( final int directoryMode )
- {
- this.directoryMode = directoryMode;
- }
-
- public void setFileMode( final int fileMode )
- {
- this.fileMode = fileMode;
- }
-
- public void setUseDefaultExcludes( final boolean useDefaultExcludes )
- {
- this.useDefaultExcludes = useDefaultExcludes;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
deleted file mode 100644
index 1e49e65..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.format.ReaderFormatter;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public class AddFileSetsTask
-{
-
- private final List<FileSet> fileSets;
-
- private Logger logger;
-
- private MavenProject project;
-
- private MavenProject moduleProject;
-
- public AddFileSetsTask( final List<FileSet> fileSets )
- {
- this.fileSets = fileSets;
- }
-
- public AddFileSetsTask( final FileSet... fileSets )
- {
- this.fileSets = new ArrayList<FileSet>( Arrays.asList( fileSets ) );
- }
-
- public void execute( final Archiver archiver, final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- // don't need this check here. it's more efficient here, but the logger is not actually
- // used until addFileSet(..)...and the check should be there in case someone extends the
- // class.
- // checkLogger();
-
- final File archiveBaseDir = configSource.getArchiveBaseDirectory();
-
- if ( archiveBaseDir != null )
- {
- if ( !archiveBaseDir.exists() )
- {
- throw new ArchiveCreationException(
- "The archive base directory '" + archiveBaseDir.getAbsolutePath() + "' does not exist" );
- }
- else if ( !archiveBaseDir.isDirectory() )
- {
- throw new ArchiveCreationException( "The archive base directory '" + archiveBaseDir.getAbsolutePath()
- + "' exists, but it is not a directory" );
- }
- }
-
- for ( final FileSet fileSet : fileSets )
- {
- addFileSet( fileSet, archiver, configSource, archiveBaseDir );
- }
- }
-
- void addFileSet( final FileSet fileSet, final Archiver archiver, final AssemblerConfigurationSource configSource,
- final File archiveBaseDir )
- throws AssemblyFormattingException, ArchiveCreationException
- {
- // throw this check in just in case someone extends this class...
- checkLogger();
-
- if ( project == null )
- {
- project = configSource.getProject();
- }
-
- final File basedir = project.getBasedir();
-
- String destDirectory = fileSet.getOutputDirectory();
-
- if ( destDirectory == null )
- {
- destDirectory = fileSet.getDirectory();
- }
-
- AssemblyFormatUtils.warnForPlatformSpecifics( logger, destDirectory );
-
- destDirectory =
- AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getFinalName(), configSource,
- AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ),
- AssemblyFormatUtils.artifactProjectInterpolator( project ) );
-
- if ( logger.isDebugEnabled() )
- {
- logger.debug( "FileSet[" + destDirectory + "]" + " dir perms: " + Integer.toString(
- archiver.getOverrideDirectoryMode(), 8 ) + " file perms: " + Integer.toString(
- archiver.getOverrideFileMode(), 8 ) + ( fileSet.getLineEnding() == null
- ? ""
- : " lineEndings: " + fileSet.getLineEnding() ) );
- }
-
- logger.debug( "The archive base directory is '" + archiveBaseDir + "'" );
-
- File fileSetDir = getFileSetDirectory( fileSet, basedir, archiveBaseDir );
-
- if ( fileSetDir.exists() )
- {
- InputStreamTransformer fileSetTransformers =
- ReaderFormatter.getFileSetTransformers( configSource, fileSet.isFiltered(), fileSet.getLineEnding() );
- if ( fileSetTransformers == null )
- {
- logger.debug( "NOT reformatting any files in " + fileSetDir );
- }
-
- if ( fileSetDir.getPath().equals( File.separator ) )
- {
- throw new AssemblyFormattingException(
- "Your assembly descriptor specifies a directory of " + File.separator
- + ", which is your *entire* file system.\nThese are not the files you are looking for" );
- }
- final AddDirectoryTask task = new AddDirectoryTask( fileSetDir, fileSetTransformers );
-
- final int dirMode = TypeConversionUtils.modeToInt( fileSet.getDirectoryMode(), logger );
- if ( dirMode != -1 )
- {
- task.setDirectoryMode( dirMode );
- }
-
- final int fileMode = TypeConversionUtils.modeToInt( fileSet.getFileMode(), logger );
- if ( fileMode != -1 )
- {
- task.setFileMode( fileMode );
- }
-
- task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() );
-
- final List<String> excludes = fileSet.getExcludes();
- excludes.add( "**/*.filtered" );
- excludes.add( "**/*.formatted" );
- task.setExcludes( excludes );
-
- task.setIncludes( fileSet.getIncludes() );
- task.setOutputDirectory( destDirectory );
-
- task.execute( archiver );
- }
- }
-
- File getFileSetDirectory( final FileSet fileSet, final File basedir, final File archiveBaseDir )
- throws ArchiveCreationException, AssemblyFormattingException
- {
- String sourceDirectory = fileSet.getDirectory();
-
- if ( sourceDirectory == null || sourceDirectory.trim().length() < 1 )
- {
- sourceDirectory = basedir.getAbsolutePath();
- }
-
- File fileSetDir;
-
- if ( archiveBaseDir == null )
- {
- fileSetDir = new File( sourceDirectory );
-
- if ( !fileSetDir.isAbsolute() )
- {
- fileSetDir = new File( basedir, sourceDirectory );
- }
- }
- else
- {
- fileSetDir = new File( archiveBaseDir, sourceDirectory );
- }
-
- return fileSetDir;
- }
-
- private void checkLogger()
- {
- if ( logger == null )
- {
- logger = new ConsoleLogger( Logger.LEVEL_INFO, "AddFileSetsTask-internal" );
- }
- }
-
- public void setLogger( final Logger logger )
- {
- this.logger = logger;
- }
-
- public void setProject( final MavenProject project )
- {
- this.project = project;
- }
-
- public void setModuleProject( final MavenProject moduleProject )
- {
- this.moduleProject = moduleProject;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/ArchiverTask.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/ArchiverTask.java
deleted file mode 100644
index 0e2e68e..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/task/ArchiverTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.archiver.Archiver;
-
-/**
- * @version $Id$
- */
-public interface ArchiverTask
-{
-
- void execute( Archiver archiver, AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException;
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
deleted file mode 100644
index 29612f4..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
+++ /dev/null
@@ -1,431 +0,0 @@
-package org.apache.maven.plugin.assembly.artifact;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.phase.ModuleSetAssemblyPhase;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.ModuleBinaries;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.resolved.AssemblyId;
-import org.apache.maven.plugin.assembly.utils.FilterUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author jdcasey
- * @version $Id$
- */
-@Component( role = DependencyResolver.class )
-public class DefaultDependencyResolver
- extends AbstractLogEnabled
- implements DependencyResolver
-{
-
- @Requirement
- private ArtifactResolver resolver;
-
- @Requirement
- private ArtifactMetadataSource metadataSource;
-
- @Requirement
- private ArtifactFactory factory;
-
- @SuppressWarnings( "UnusedDeclaration" )
- public DefaultDependencyResolver()
- {
- // for plexus init
- }
-
- protected DefaultDependencyResolver( final ArtifactResolver resolver, final ArtifactMetadataSource metadataSource,
- final ArtifactFactory factory, final Logger logger )
- {
- this.resolver = resolver;
- this.metadataSource = metadataSource;
- this.factory = factory;
- enableLogging( logger );
- }
-
- public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly, ModuleSet moduleSet,
- final AssemblerConfigurationSource configSource,
- List<DependencySet> dependencySets )
- throws DependencyResolutionException
- {
- Map<DependencySet, Set<Artifact>> result = new LinkedHashMap<DependencySet, Set<Artifact>>();
-
- for ( DependencySet dependencySet : dependencySets )
- {
-
- final MavenProject currentProject = configSource.getProject();
-
- final ResolutionManagementInfo info = new ResolutionManagementInfo( currentProject );
- updateRepositoryResolutionRequirements( assembly, info );
- final AssemblyId assemblyId = AssemblyId.createAssemblyId( assembly );
- updateDependencySetResolutionRequirements( dependencySet, info, assemblyId, currentProject );
- updateModuleSetResolutionRequirements( assemblyId, moduleSet, dependencySet, info, configSource );
-
- Set<Artifact> artifacts;
- if ( info.isResolutionRequired() )
- {
- final List<ArtifactRepository> repos =
- aggregateRemoteArtifactRepositories( configSource.getRemoteRepositories(),
- info.getEnabledProjects() );
-
- artifacts = info.getArtifacts();
- if ( info.isResolvedTransitively() )
- {
- getLogger().debug( "Resolving project dependencies transitively." );
- artifacts = resolveTransitively( artifacts, repos, info, configSource );
- }
- else
- {
- getLogger().debug( "Resolving project dependencies ONLY. "
- + "Transitive dependencies WILL NOT be included in the results." );
- artifacts = resolveNonTransitively( assembly, artifacts, configSource, repos );
- }
- }
- else
- {
- artifacts = new HashSet<Artifact>();
- }
- result.put( dependencySet, artifacts );
-
- }
- return result;
- }
-
- public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly,
- final AssemblerConfigurationSource configSource,
- List<DependencySet> dependencySets )
- throws DependencyResolutionException
- {
- Map<DependencySet, Set<Artifact>> result = new LinkedHashMap<DependencySet, Set<Artifact>>();
-
- for ( DependencySet dependencySet : dependencySets )
- {
-
- final MavenProject currentProject = configSource.getProject();
-
- final ResolutionManagementInfo info = new ResolutionManagementInfo( currentProject );
- updateRepositoryResolutionRequirements( assembly, info );
- final AssemblyId assemblyId = AssemblyId.createAssemblyId( assembly );
- updateDependencySetResolutionRequirements( dependencySet, info, assemblyId, currentProject );
-
- Set<Artifact> artifacts;
- if ( info.isResolutionRequired() )
- {
- final List<ArtifactRepository> repos =
- aggregateRemoteArtifactRepositories( configSource.getRemoteRepositories(),
- info.getEnabledProjects() );
-
- artifacts = info.getArtifacts();
- if ( info.isResolvedTransitively() )
- {
- getLogger().debug( "Resolving project dependencies transitively." );
- artifacts = resolveTransitively( artifacts, repos, info, configSource );
- }
- else
- {
- getLogger().debug( "Resolving project dependencies ONLY. "
- + "Transitive dependencies WILL NOT be included in the results." );
- artifacts = resolveNonTransitively( assembly, artifacts, configSource, repos );
- }
- }
- else
- {
- artifacts = new HashSet<Artifact>();
- }
- result.put( dependencySet, artifacts );
-
- }
- return result;
- }
-
- Set<Artifact> resolveNonTransitively( final Assembly assembly, final Set<Artifact> dependencyArtifacts,
- final AssemblerConfigurationSource configSource,
- final List<ArtifactRepository> repos )
- throws DependencyResolutionException
- {
-
- final List<Artifact> missing = new ArrayList<Artifact>();
- final Set<Artifact> resolved = new LinkedHashSet<Artifact>();
- for ( final Artifact depArtifact : dependencyArtifacts )
- {
- try
- {
- resolver.resolve( depArtifact, repos, configSource.getLocalRepository() );
- resolved.add( depArtifact );
- }
- catch ( final ArtifactResolutionException e )
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug(
- "Failed to resolve: " + depArtifact.getId() + " for assembly: " + assembly.getId() );
- }
- missing.add( depArtifact );
- }
- catch ( final ArtifactNotFoundException e )
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug(
- "Failed to resolve: " + depArtifact.getId() + " for assembly: " + assembly.getId() );
- }
- missing.add( depArtifact );
- }
- }
-
- if ( !missing.isEmpty() )
- {
- final MavenProject project = configSource.getProject();
- final Artifact rootArtifact = project.getArtifact();
-
- final Throwable error =
- new MultipleArtifactsNotFoundException( rootArtifact, new ArrayList<Artifact>( resolved ), missing,
- repos );
-
- throw new DependencyResolutionException( "Failed to resolve dependencies for: " + assembly.getId(), error );
- }
-
- return resolved;
- }
-
- @SuppressWarnings( "unchecked" )
- private Set<Artifact> resolveTransitively( final Set<Artifact> dependencyArtifacts,
- final List<ArtifactRepository> repos,
- final ResolutionManagementInfo info,
- final AssemblerConfigurationSource configSource )
- throws DependencyResolutionException
- {
- final MavenProject project = configSource.getProject();
-
- final ArtifactFilter filter = info.getScopeFilter();
- final ArtifactRepository localRepository = configSource.getLocalRepository();
-
- ArtifactResolutionResult result;
- try
- {
- result = resolver.resolveTransitively( dependencyArtifacts, project.getArtifact(),
- project.getManagedVersionMap(), localRepository, repos,
- metadataSource, filter );
- }
- catch ( final ArtifactResolutionException e )
- {
- throw new DependencyResolutionException( "Failed to resolve dependencies for assembly: ", e );
- }
- catch ( final ArtifactNotFoundException e )
- {
- throw new DependencyResolutionException( "Failed to resolve dependencies for assembly: ", e );
- }
-
- getLogger().debug( "While resolving dependencies of " + project.getId() + ":" );
-
- FilterUtils.reportFilteringStatistics( Collections.singleton( filter ), getLogger() );
-
- return result.getArtifacts();
- }
-
- void updateRepositoryResolutionRequirements( final Assembly assembly, final ResolutionManagementInfo requirements )
- {
- final List<Repository> repositories = assembly.getRepositories();
-
- if ( repositories != null && !repositories.isEmpty() )
- {
- requirements.setResolutionRequired( true );
- for ( final Repository repo : repositories )
- {
- enableScope( repo.getScope(), requirements );
- }
- }
- }
-
-
- void updateModuleSetResolutionRequirements( AssemblyId assemblyId, ModuleSet set, DependencySet dependencySet,
- final ResolutionManagementInfo requirements,
- final AssemblerConfigurationSource configSource )
- throws DependencyResolutionException
- {
- final ModuleBinaries binaries = set.getBinaries();
- if ( binaries != null )
- {
- Set<MavenProject> projects;
- try
- {
- projects = ModuleSetAssemblyPhase.getModuleProjects( set, configSource, getLogger() );
- }
- catch ( final ArchiveCreationException e )
- {
- throw new DependencyResolutionException( "Error determining project-set for moduleSet with binaries.",
- e );
- }
-
- if ( !projects.isEmpty() )
- {
- for ( final MavenProject p : projects )
- {
- requirements.enableProjectResolution( p );
-
- if ( p.getArtifact() == null )
- {
- // TODO: such a call in MavenMetadataSource too - packaging not really the intention of
- // type
- final Artifact artifact =
- factory.createBuildArtifact( p.getGroupId(), p.getArtifactId(), p.getVersion(),
- p.getPackaging() );
- p.setArtifact( artifact );
- }
- }
- }
-
- if ( binaries.isIncludeDependencies() )
- {
- updateDependencySetResolutionRequirements( dependencySet, requirements, assemblyId,
- projects.toArray( new MavenProject[projects.size()] ) );
- }
- }
- }
-
-
- @SuppressWarnings( "unchecked" )
- void updateDependencySetResolutionRequirements( final DependencySet set,
- final ResolutionManagementInfo requirements, AssemblyId assemblyId,
- final MavenProject... projects )
- throws DependencyResolutionException
- {
- requirements.setResolutionRequired( true );
-
- requirements.setResolvedTransitively( set.isUseTransitiveDependencies() );
-
- enableScope( set.getScope(), requirements );
-
- for ( final MavenProject project : projects )
- {
- if ( project == null )
- {
- continue;
- }
-
- Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
- if ( dependencyArtifacts == null )
- {
- try
- {
- dependencyArtifacts = project.createArtifacts( factory, null, requirements.getScopeFilter() );
- project.setDependencyArtifacts( dependencyArtifacts );
- }
- catch ( final InvalidDependencyVersionException e )
- {
- throw new DependencyResolutionException(
- "Failed to create dependency artifacts for resolution. Assembly: " + assemblyId, e );
- }
- }
-
- requirements.addArtifacts( dependencyArtifacts );
- getLogger().debug( "Dependencies for project: " + project.getId() + " are:\n" + StringUtils.join(
- dependencyArtifacts.iterator(), "\n" ) );
- }
- }
-
- private void enableScope( final String scope, final ResolutionManagementInfo requirements )
- {
- if ( Artifact.SCOPE_COMPILE.equals( scope ) )
- {
- requirements.enableCompileScope();
- }
- else if ( Artifact.SCOPE_PROVIDED.equals( scope ) )
- {
- requirements.enableProvidedScope();
- }
- else if ( Artifact.SCOPE_RUNTIME.equals( scope ) )
- {
- requirements.enableRuntimeScope();
- }
- else if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
- {
- requirements.enableSystemScope();
- }
- else if ( Artifact.SCOPE_TEST.equals( scope ) )
- {
- requirements.enableTestScope();
- }
- }
-
- @SuppressWarnings( "unchecked" )
- List<ArtifactRepository> aggregateRemoteArtifactRepositories( final List<ArtifactRepository> remoteRepositories,
- final Set<MavenProject> projects )
- {
- final List<List<ArtifactRepository>> repoLists = new ArrayList<List<ArtifactRepository>>();
-
- repoLists.add( remoteRepositories );
- for ( final MavenProject project : projects )
- {
- repoLists.add( project.getRemoteArtifactRepositories() );
- }
-
- final List<ArtifactRepository> remoteRepos = new ArrayList<ArtifactRepository>();
- final Set<String> encounteredUrls = new HashSet<String>();
-
- for ( final List<ArtifactRepository> repositoryList : repoLists )
- {
- if ( ( repositoryList != null ) && !repositoryList.isEmpty() )
- {
- for ( final ArtifactRepository repo : repositoryList )
- {
- if ( !encounteredUrls.contains( repo.getUrl() ) )
- {
- remoteRepos.add( repo );
- encounteredUrls.add( repo.getUrl() );
- }
- }
- }
- }
-
- return remoteRepos;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
deleted file mode 100644
index 52f219f..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.plugin.assembly.artifact;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class DependencyResolutionException
- extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- public DependencyResolutionException( final String message, final Throwable error )
- {
- super( message, error );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java
deleted file mode 100644
index 0c0976e..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.maven.plugin.assembly.artifact;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Convenience component that aids in the resolution of dependency artifacts, according to various configurations such
- * as transitivity flag and scope.
- *
- * @version $Id$
- */
-public interface DependencyResolver
-{
-
- Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly, ModuleSet moduleSet,
- final AssemblerConfigurationSource configSource,
- List<DependencySet> dependencySets )
- throws DependencyResolutionException;
-
- Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly,
- final AssemblerConfigurationSource configSource,
- List<DependencySet> dependencySets )
- throws DependencyResolutionException;
-
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java
deleted file mode 100644
index b06378b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.apache.maven.plugin.assembly.artifact;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * Helper class used to accumulate scopes and modules (with binaries included) that are used in an assembly, for the
- * purposes of creating an aggregated managed-version map with dependency version conflicts resolved.
- *
- * @author jdcasey
- */
-class ResolutionManagementInfo
-{
- private boolean resolutionRequired;
-
- private final ScopeArtifactFilter scopeFilter = new ScopeArtifactFilter();
-
- private boolean resolvedTransitively;
-
- private final Set<MavenProject> enabledProjects = new LinkedHashSet<MavenProject>();
-
- private final LinkedHashSet<Artifact> artifacts = new LinkedHashSet<Artifact>();
-
- ResolutionManagementInfo( final MavenProject currentProject )
- {
- enabledProjects.add( currentProject );
- }
-
- boolean isResolutionRequired()
- {
- return resolutionRequired;
- }
-
- void setResolutionRequired( final boolean resolutionRequired )
- {
- this.resolutionRequired = resolutionRequired;
- }
-
- boolean isResolvedTransitively()
- {
- return resolvedTransitively;
- }
-
- void setResolvedTransitively( final boolean resolvedTransitively )
- {
- this.resolvedTransitively = this.resolvedTransitively || resolvedTransitively;
- }
-
- ScopeArtifactFilter getScopeFilter()
- {
- return scopeFilter;
- }
-
- void enableCompileScope()
- {
- scopeFilter.setIncludeCompileScope( true );
- scopeFilter.setIncludeProvidedScope( true );
- scopeFilter.setIncludeSystemScope( true );
- }
-
- void enableProvidedScope()
- {
- scopeFilter.setIncludeProvidedScope( true );
- }
-
- void enableRuntimeScope()
- {
- scopeFilter.setIncludeRuntimeScope( true );
- scopeFilter.setIncludeCompileScope( true );
- }
-
- void enableTestScope()
- {
- scopeFilter.setIncludeTestScope( true );
- scopeFilter.setIncludeCompileScope( true );
- scopeFilter.setIncludeProvidedScope( true );
- scopeFilter.setIncludeSystemScope( true );
- scopeFilter.setIncludeRuntimeScope( true );
- }
-
- void enableSystemScope()
- {
- scopeFilter.setIncludeSystemScope( true );
- }
-
- void enableProjectResolution( final MavenProject project )
- {
- if ( !enabledProjects.contains( project ) )
- {
- enabledProjects.add( project );
- }
- }
-
- Set<MavenProject> getEnabledProjects()
- {
- return enabledProjects;
- }
-
- Set<Artifact> getArtifacts()
- {
- return artifacts;
- }
-
- void addArtifacts( final Set<Artifact> a )
- {
- for ( Artifact artifact : a )
- {
- addOneArtifact( artifact );
- }
- artifacts.addAll( a );
- }
-
- private void addOneArtifact( Artifact artifact )
- {
- for ( Artifact existing : artifacts )
- {
- if ( existing.equals( artifact ) )
- {
- if ( isScopeUpgrade( artifact, existing ) )
- {
- artifacts.remove( existing );
- artifacts.add( artifact );
- return;
- }
- }
- }
- }
-
- private boolean isScopeUpgrade( Artifact a, Artifact existing )
- {
- return scopeValue( a.getScope() ) > scopeValue( existing.getScope() );
- }
-
- private int scopeValue( final String scope )
- {
- if ( Artifact.SCOPE_COMPILE.equals( scope ) )
- {
- return 5;
- }
- else if ( Artifact.SCOPE_PROVIDED.equals( scope ) )
- {
- return 4;
- }
- else if ( Artifact.SCOPE_RUNTIME.equals( scope ) )
- {
- return 3;
- }
- else if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
- {
- return 2;
- }
- else if ( Artifact.SCOPE_TEST.equals( scope ) )
- {
- return 1;
- }
- return 0;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
deleted file mode 100644
index 267075b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.ResourceIterator;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.util.IOUtil;
-
-import javax.annotation.Nonnull;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-abstract class AbstractLineAggregatingHandler
- implements ContainerDescriptorHandler
-{
-
- private Map<String, List<String>> catalog = new HashMap<String, List<String>>();
-
- private boolean excludeOverride = false;
-
- protected abstract String getOutputPathPrefix( final FileInfo fileInfo );
-
- protected abstract boolean fileMatches( final FileInfo fileInfo );
-
- String getEncoding()
- {
- return "UTF-8";
- }
-
- public void finalizeArchiveCreation( final Archiver archiver )
- {
- // this will prompt the isSelected() call, below, for all resources added to the archive.
- // FIXME: This needs to be corrected in the AbstractArchiver, where
- // runArchiveFinalizers() is called before regular resources are added...
- // which is done because the manifest needs to be added first, and the
- // manifest-creation component is a finalizer in the assembly plugin...
- for ( final ResourceIterator it = archiver.getResources(); it.hasNext(); )
- {
- it.next();
- }
-
- addToArchive( archiver );
- }
-
- void addToArchive( final Archiver archiver )
- {
- for ( final Map.Entry<String, List<String>> entry : catalog.entrySet() )
- {
- final String name = entry.getKey();
- final String fname = new File( name ).getName();
-
- PrintWriter writer = null;
- File f;
- try
- {
- f = File.createTempFile( "assembly-" + fname, ".tmp" );
- f.deleteOnExit();
-
- writer = new PrintWriter( new OutputStreamWriter( new FileOutputStream( f ), getEncoding() ) );
- for ( final String line : entry.getValue() )
- {
- writer.println( line );
- }
- }
- catch ( final IOException e )
- {
- throw new ArchiverException(
- "Error adding aggregated content for: " + fname + " to finalize archive creation. Reason: "
- + e.getMessage(), e );
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- excludeOverride = true;
- archiver.addFile( f, name );
- excludeOverride = false;
- }
- }
-
- public void finalizeArchiveExtraction( final UnArchiver unArchiver )
- {
- }
-
- public List<String> getVirtualFiles()
- {
- return new ArrayList<String>( catalog.keySet() );
- }
-
- public boolean isSelected( @Nonnull final FileInfo fileInfo )
- throws IOException
- {
- if ( excludeOverride )
- {
- return true;
- }
-
- String name = AssemblyFileUtils.normalizeFileInfo( fileInfo );
-
- if ( fileInfo.isFile() && fileMatches( fileInfo ) )
- {
- name = getOutputPathPrefix( fileInfo ) + new File( name ).getName();
-
- List<String> lines = catalog.get( name );
- if ( lines == null )
- {
- lines = new ArrayList<String>();
- catalog.put( name, lines );
- }
-
- readLines( fileInfo, lines );
-
- return false;
- }
-
- return true;
- }
-
- void readLines( final FileInfo fileInfo, final List<String> lines )
- throws IOException
- {
- BufferedReader reader = null;
- try
- {
- reader = new BufferedReader( new InputStreamReader( fileInfo.getContents(), getEncoding() ) );
-
- String line;
- while ( ( line = reader.readLine() ) != null )
- {
- if ( !lines.contains( line ) )
- {
- lines.add( line );
- }
- }
- }
- finally
- {
- IOUtil.close( reader );
- }
- }
-
- protected final Map<String, List<String>> getCatalog()
- {
- return catalog;
- }
-
- protected final void setCatalog( final Map<String, List<String>> catalog )
- {
- this.catalog = catalog;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
deleted file mode 100644
index b7d9522..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.shared.utils.ReaderFactory;
-import org.apache.maven.shared.utils.WriterFactory;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.ResourceIterator;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.Xpp3DomWriter;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import javax.annotation.Nonnull;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Components XML file filter.
- *
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
- */
-@Component( role = ContainerDescriptorHandler.class, hint = "plexus", instantiationStrategy = "per-lookup" )
-public class ComponentsXmlArchiverFileFilter
- implements ContainerDescriptorHandler
-{
- // [jdcasey] Switched visibility to protected to allow testing. Also, because this class isn't final, it should
- // allow
- // some minimal access to the components accumulated for extending classes.
- Map<String, Xpp3Dom> components;
-
- private boolean excludeOverride = false;
-
- public static final String COMPONENTS_XML_PATH = "META-INF/plexus/components.xml";
-
- void addComponentsXml( final Reader componentsReader )
- throws XmlPullParserException, IOException
- {
- Xpp3Dom newDom = Xpp3DomBuilder.build( componentsReader );
-
- if ( newDom != null )
- {
- newDom = newDom.getChild( "components" );
- }
-
- if ( newDom != null )
- {
- final Xpp3Dom[] children = newDom.getChildren();
-
- for ( final Xpp3Dom component : children )
- {
- if ( components == null )
- {
- components = new LinkedHashMap<String, Xpp3Dom>();
- }
-
- final String role = component.getChild( "role" ).getValue();
- final Xpp3Dom child = component.getChild( "role-hint" );
- final String roleHint = child != null ? child.getValue() : "";
-
- final String key = role + roleHint;
- if ( !components.containsKey( key ) )
- {
- System.out.println( "Adding " + key );
- components.put( key, component );
- }
- else
- {
- System.out.println( "Component: " + key + " is already defined. Skipping." );
- }
- }
- }
- }
-
- private void addToArchive( final Archiver archiver )
- throws IOException
- {
- if ( components != null )
- {
- final File f = File.createTempFile( "maven-assembly-plugin", "tmp" );
- f.deleteOnExit();
-
- final Writer fileWriter = WriterFactory.newXmlWriter( new FileOutputStream( f ) );
- try
- {
- final Xpp3Dom dom = new Xpp3Dom( "component-set" );
- final Xpp3Dom componentDom = new Xpp3Dom( "components" );
- dom.addChild( componentDom );
-
- for ( final Xpp3Dom component : components.values() )
- {
- componentDom.addChild( component );
- }
-
- Xpp3DomWriter.write( fileWriter, dom );
- }
- finally
- {
- IOUtil.close( fileWriter );
- }
-
- excludeOverride = true;
-
- archiver.addFile( f, COMPONENTS_XML_PATH );
-
- excludeOverride = false;
- }
- }
-
- public void finalizeArchiveCreation( final Archiver archiver )
- {
- // this will prompt the isSelected() call, below, for all resources added to the archive.
- // FIXME: This needs to be corrected in the AbstractArchiver, where
- // runArchiveFinalizers() is called before regular resources are added...
- // which is done because the manifest needs to be added first, and the
- // manifest-creation component is a finalizer in the assembly plugin...
- for ( final ResourceIterator it = archiver.getResources(); it.hasNext(); )
- {
- it.next();
- }
-
- try
- {
- addToArchive( archiver );
- }
- catch ( final IOException e )
- {
- throw new ArchiverException( "Error finalizing component-set for archive. Reason: " + e.getMessage(), e );
- }
- }
-
- public List<String> getVirtualFiles()
- {
- if ( ( components != null ) && !components.isEmpty() )
- {
- return Collections.singletonList( COMPONENTS_XML_PATH );
- }
-
- return null;
- }
-
- public boolean isSelected( @Nonnull final FileInfo fileInfo )
- throws IOException
- {
- if ( fileInfo.isFile() )
- {
- if ( excludeOverride )
- {
- return true;
- }
-
- String entry = fileInfo.getName().replace( '\\', '/' );
-
- if ( entry.startsWith( "/" ) )
- {
- entry = entry.substring( 1 );
- }
-
- if ( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH.equals( entry ) )
- {
- InputStream stream = null;
- Reader reader = null;
-
- try
- {
- stream = fileInfo.getContents();
- reader = ReaderFactory.newXmlReader( stream );
- addComponentsXml( new BufferedReader( reader ) );
- }
- catch ( final XmlPullParserException e )
- {
- final IOException error =
- new IOException( "Error finalizing component-set for archive. Reason: " + e.getMessage() );
- error.initCause( e );
-
- throw error;
- }
- finally
- {
- IOUtil.close( stream );
- IOUtil.close( reader );
- }
-
- return false;
- }
- else
- {
- return true;
- }
- }
- else
- {
- return true;
- }
- }
-
- public void finalizeArchiveExtraction( final UnArchiver unarchiver )
- {
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/ContainerDescriptorHandler.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/ContainerDescriptorHandler.java
deleted file mode 100644
index d6e8134..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/ContainerDescriptorHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.archiver.ArchiveFinalizer;
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-
-/**
- * @version $Id$
- */
-public interface ContainerDescriptorHandler
- extends ArchiveFinalizer, FileSelector
-{
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java
deleted file mode 100644
index 73bc2e9..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-
-/**
- *
- */
-@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-services", instantiationStrategy = "per-lookup" )
-public class MetaInfServicesHandler
- extends AbstractLineAggregatingHandler
-{
-
- private static final String SERVICES_PATH_PREFIX = "META-INF/services/";
-
- @Override
- protected String getOutputPathPrefix( final FileInfo fileInfo )
- {
- return SERVICES_PATH_PREFIX;
- }
-
- @Override
- protected boolean fileMatches( final FileInfo fileInfo )
- {
- final String path = fileInfo.getName();
-
- String leftover = null;
- if ( path.startsWith( SERVICES_PATH_PREFIX ) )
- {
- leftover = path.substring( SERVICES_PATH_PREFIX.length() );
- }
- else if ( path.startsWith( "/META-INF/services/" ) )
- {
- leftover = path.substring( SERVICES_PATH_PREFIX.length() - 1 );
- }
-
- return leftover != null && leftover.length() > 0;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
deleted file mode 100644
index 89e760c..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-
-/**
- *
- */
-@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-spring", instantiationStrategy = "per-lookup" )
-public class MetaInfSpringHandler
- extends AbstractLineAggregatingHandler
-{
-
- private static final String SPRING_PATH_PREFIX = "META-INF/";
-
- @Override
- protected String getOutputPathPrefix( final FileInfo fileInfo )
- {
- return SPRING_PATH_PREFIX;
- }
-
- @Override
- protected boolean fileMatches( final FileInfo fileInfo )
- {
- final String path = fileInfo.getName();
-
- String leftover = null;
- if ( path.startsWith( "/META-INF/spring." ) )
- {
- leftover = path.substring( "/META-INF/spring.".length() );
- }
- else if ( path.startsWith( "META-INF/spring." ) )
- {
- leftover = path.substring( "META-INF/spring.".length() - 1 );
- }
-
- return leftover != null && leftover.length() > 0;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
deleted file mode 100644
index 42976fe..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.logging.LogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.IOUtil;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-@Component( role = ContainerDescriptorHandler.class, hint = "file-aggregator", instantiationStrategy = "per-lookup" )
-public class SimpleAggregatingDescriptorHandler
- implements ContainerDescriptorHandler, LogEnabled
-{
-
- // component configuration.
-
- private String filePattern;
-
- private String outputPath;
-
- @SuppressWarnings( "FieldCanBeLocal" )
- private final String commentChars = "#";
-
- // calculated, temporary values.
-
- private boolean overrideFilterAction;
-
- private final StringWriter aggregateWriter = new StringWriter();
-
- private final List<String> filenames = new ArrayList<String>();
-
- // injected by the container.
-
- private Logger logger;
-
- public void finalizeArchiveCreation( final Archiver archiver )
- {
- checkConfig();
-
- if ( outputPath.endsWith( "/" ) )
- {
- throw new ArchiverException( "Cannot write aggregated properties to a directory. "
- + "You must specify a file name in the outputPath configuration for this handler. (handler: "
- + getClass().getName() );
- }
-
- if ( outputPath.startsWith( "/" ) )
- {
- outputPath = outputPath.substring( 1 );
- }
-
- final File temp = writePropertiesFile();
-
- overrideFilterAction = true;
-
- archiver.addFile( temp, outputPath );
-
- overrideFilterAction = false;
- }
-
- private File writePropertiesFile()
- {
- File f;
-
- Writer writer = null;
- try
- {
- f = File.createTempFile( "maven-assembly-plugin", "tmp" );
- f.deleteOnExit();
-
- boolean isProperty = AssemblyFileUtils.isPropertyFile( f );
- FileOutputStream fos = new FileOutputStream( f );
- writer = isProperty
- ? new OutputStreamWriter( fos, "ISO-8859-1" )
- : new OutputStreamWriter( fos ); // Still platform encoding
-
- writer.write( commentChars + " Aggregated on " + new Date() + " from: " );
-
- for ( final String filename : filenames )
- {
- writer.write( "\n" + commentChars + " " + filename );
- }
-
- writer.write( "\n\n" );
-
- writer.write( aggregateWriter.toString() );
- }
- catch ( final IOException e )
- {
- throw new ArchiverException(
- "Error adding aggregated properties to finalize archive creation. Reason: " + e.getMessage(), e );
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- return f;
- }
-
- public void finalizeArchiveExtraction( final UnArchiver unarchiver )
- {
- }
-
- public List<String> getVirtualFiles()
- {
- checkConfig();
-
- return Collections.singletonList( outputPath );
- }
-
- public boolean isSelected( @Nonnull final FileInfo fileInfo )
- throws IOException
- {
- checkConfig();
-
- if ( overrideFilterAction )
- {
- System.out.println( "Filtering overridden. Returning true." );
- return true;
- }
-
- String name = AssemblyFileUtils.normalizeFileInfo( fileInfo );
-
- if ( fileInfo.isFile() && name.matches( filePattern ) )
- {
- readProperties( fileInfo );
- filenames.add( name );
-
- return false;
- }
-
- return true;
- }
-
- private void checkConfig()
- {
- if ( filePattern == null || outputPath == null )
- {
- throw new IllegalStateException(
- "You must configure filePattern and outputPath in your containerDescriptorHandler declaration." );
- }
- }
-
- private void readProperties( final FileInfo fileInfo )
- throws IOException
- {
- final StringWriter writer = new StringWriter();
- Reader reader = null;
- try
- {
- boolean isProperty = AssemblyFileUtils.isPropertyFile( fileInfo.getName() );
-
- reader = isProperty
- ? new InputStreamReader( fileInfo.getContents(), "ISO-8859-1" )
- : new InputStreamReader( fileInfo.getContents() ); // platform encoding
-
- IOUtil.copy( reader, writer );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- final String content = writer.toString();
-
- aggregateWriter.write( "\n" );
- aggregateWriter.write( content );
- }
-
- protected final Logger getLogger()
- {
- if ( logger == null )
- {
- logger = new ConsoleLogger( Logger.LEVEL_INFO, "" );
- }
-
- return logger;
- }
-
- public void enableLogging( final Logger logger )
- {
- this.logger = logger;
- }
-
- @SuppressWarnings( "UnusedDeclaration" )
- public String getFilePattern()
- {
- return filePattern;
- }
-
- @SuppressWarnings( "UnusedDeclaration" )
- public void setFilePattern( final String filePattern )
- {
- this.filePattern = filePattern;
- }
-
- @SuppressWarnings( "UnusedDeclaration" )
- public String getOutputPath()
- {
- return outputPath;
- }
-
- @SuppressWarnings( "UnusedDeclaration" )
- public void setOutputPath( final String outputPath )
- {
- this.outputPath = outputPath;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java
deleted file mode 100644
index 025c03d..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.plugin.assembly.format;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class AssemblyFormattingException
- extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- public AssemblyFormattingException( final String message, final Throwable error )
- {
- super( message, error );
- }
-
- public AssemblyFormattingException( final String message )
- {
- super( message );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
deleted file mode 100644
index b87ebf2..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.apache.maven.plugin.assembly.format;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.io.input.ReaderInputStream;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
-import org.apache.maven.plugin.assembly.utils.LineEndings;
-import org.apache.maven.plugin.assembly.utils.LineEndingsUtils;
-import org.apache.maven.shared.filtering.MavenFilteringException;
-import org.apache.maven.shared.filtering.MavenReaderFilterRequest;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-/**
- *
- */
-public class ReaderFormatter
-{
- private static Reader createReaderFilter( @Nonnull Reader source, String escapeString, List<String> delimiters,
- AssemblerConfigurationSource configSource, boolean isPropertiesFile )
- throws IOException
- {
- try
- {
-
- MavenReaderFilterRequest filterRequest =
- new MavenReaderFilterRequest( source, true, configSource.getProject(), configSource.getFilters(),
- isPropertiesFile, null, configSource.getMavenSession(), null );
- filterRequest.setEscapeString( escapeString );
-
- // if these are NOT set, just use the defaults, which are '${*}' and '@'.
- if ( delimiters != null && !delimiters.isEmpty() )
- {
- LinkedHashSet<String> delims = new LinkedHashSet<String>();
- for ( String delim : delimiters )
- {
- if ( delim == null )
- {
- // FIXME: ${filter:*} could also trigger this condition. Need a better long-term solution.
- delims.add( "${*}" );
- }
- else
- {
- delims.add( delim );
- }
- }
-
- filterRequest.setDelimiters( delims );
- }
- else
- {
- filterRequest.setDelimiters( filterRequest.getDelimiters() );
- }
-
- filterRequest.setInjectProjectBuildFilters( configSource.isIncludeProjectBuildFilters() );
- return configSource.getMavenReaderFilter().filter( filterRequest );
- }
- catch ( MavenFilteringException e )
- {
- IOException ioe = new IOException( "Error filtering file '" + source + "': " + e.getMessage() );
- ioe.initCause( e ); // plain old Java 5...
- throw ioe;
- }
- }
-
-
- private static boolean isForbiddenFiletypes( PlexusIoResource plexusIoResource )
- throws IOException
- {
- String fileName = plexusIoResource.getName().toLowerCase();
- return ( fileName.endsWith( ".zip" ) || fileName.endsWith( ".jar" ) );
- }
-
- private static void checkifFileTypeIsAppropriateForLineEndingTransformation( PlexusIoResource plexusIoResource )
- throws IOException
- {
- if ( isForbiddenFiletypes( plexusIoResource ) )
- {
- throw new IOException( "Cannot transform line endings on this kind of file: " + plexusIoResource.getName()
- + "\nDoing so is more or less guaranteed to destroy the file, and it indicates"
- + " a problem with your assembly descriptor."
- + "\nThis error message is new as of 2.5.3. "
- + "\nEarlier versions of assembly-plugin will silently destroy your file. "
- + "Fix your descriptor" );
- }
-
- }
-
- @Nullable
- public static InputStreamTransformer getFileSetTransformers( final AssemblerConfigurationSource configSource,
- final boolean isFiltered, String fileSetLineEnding )
- throws AssemblyFormattingException
- {
- final LineEndings lineEndingToUse = LineEndingsUtils.getLineEnding( fileSetLineEnding );
-
- final boolean transformLineEndings = !LineEndings.keep.equals( lineEndingToUse );
-
- if ( transformLineEndings || isFiltered )
- {
- return new InputStreamTransformer()
- {
- @Nonnull
- public InputStream transform( @Nonnull PlexusIoResource plexusIoResource,
- @Nonnull InputStream inputStream )
- throws IOException
- {
- InputStream result = inputStream;
- if ( isFiltered )
- {
- boolean isPropertyFile = AssemblyFileUtils.isPropertyFile( plexusIoResource.getName() );
- final String encoding = isPropertyFile ? "ISO-8859-1" : configSource.getEncoding();
-
- Reader source = encoding != null
- ? new InputStreamReader( inputStream, encoding )
- : new InputStreamReader( inputStream ); // wtf platform encoding ? TODO: Fix this
- Reader filtered =
- createReaderFilter( source, configSource.getEscapeString(), configSource.getDelimiters(),
- configSource, isPropertyFile );
- result = encoding != null
- ? new ReaderInputStream( filtered, encoding )
- : new ReaderInputStream( filtered );
- }
- if ( transformLineEndings )
- {
- checkifFileTypeIsAppropriateForLineEndingTransformation( plexusIoResource );
- result = LineEndingsUtils.lineEndingConverter( result, lineEndingToUse );
- }
- return result;
- }
- };
- }
- return null;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
deleted file mode 100644
index bf42b6b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.apache.maven.plugin.assembly.format;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
-
-import java.util.Properties;
-
-/**
- * @author Andreas Hoheneder (ahoh_at_inode.at)
- * @version $Id$
- * @deprecated
- */
-@Deprecated
-public class ReflectionProperties
- extends Properties
-{
-
- private static final long serialVersionUID = 1L;
-
- private final MavenProject project;
-
- final boolean escapedBackslashesInFilePath;
-
- public ReflectionProperties( final MavenProject aProject, final boolean escapedBackslashesInFilePath )
- {
- super();
-
- project = aProject;
-
- this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
- }
-
- @Override
- public Object get( final Object key )
- {
- Object value = null;
- try
- {
- value = ReflectionValueExtractor.evaluate( "" + key, project );
-
- if ( escapedBackslashesInFilePath && value != null && "java.lang.String".equals(
- value.getClass().getName() ) )
- {
- final String val = (String) value;
-
- // Check if it's a windows path
- if ( val.indexOf( ":\\" ) == 1 )
- {
- value = StringUtils.replace( (String) value, "\\", "\\\\" );
- value = StringUtils.replace( (String) value, ":", "\\:" );
- }
- }
- }
- catch ( final Exception e )
- {
- // TODO: remove the try-catch block when ReflectionValueExtractor.evaluate() throws no more exceptions
- }
- return value;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
deleted file mode 100644
index a5c7fd0..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.maven.plugin.assembly.functions;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.project.MavenProject;
-
-/**
- *
- */
-public interface MavenProjectConsumer
-{
- void accept( MavenProject project );
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
deleted file mode 100644
index 77dcee9..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.apache.maven.plugin.assembly.functions;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Set;
-
-/**
- *
- */
-public class MavenProjects
-{
- public static void without( Iterable<MavenProject> source, String packagingType, MavenProjectConsumer consumer )
- {
- for ( MavenProject project : source )
- {
- if ( !packagingType.equals( project.getPackaging() ) )
- {
- consumer.accept( project );
- }
- }
- }
-
- public static void select( Iterable<MavenProject> source, String packagingType, MavenProjectConsumer consumer )
- {
- for ( MavenProject project : source )
- {
- if ( packagingType.equals( project.getPackaging() ) )
- {
- consumer.accept( project );
- }
- }
- }
-
- public static void select( Iterable<MavenProject> source, String packagingType, MavenProjectConsumer include,
- MavenProjectConsumer excluded )
- {
- for ( MavenProject project : source )
- {
- if ( packagingType.equals( project.getPackaging() ) )
- {
- include.accept( project );
- }
- else
- {
- excluded.accept( project );
- }
- }
- }
-
- @Nullable
- public static Artifact findArtifactByClassifier( MavenProject mavenProject, String classifier )
- {
- @SuppressWarnings( "unchecked" ) final List<Artifact> attachments = mavenProject.getAttachedArtifacts();
- if ( ( attachments != null ) && !attachments.isEmpty() )
- {
- for ( final Artifact attachment : attachments )
- {
- if ( classifier.equals( attachment.getClassifier() ) )
- {
- return attachment;
- }
- }
- }
- return null;
- }
-
-
- public static MavenProjectConsumer log( final Logger logger )
- {
- return new MavenProjectConsumer()
- {
- public void accept( MavenProject project )
- {
- final String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
-
- logger.debug( "Excluding POM-packaging module: " + projectId );
- }
- };
- }
-
- public static MavenProjectConsumer addTo( final Set<MavenProject> set )
- {
- return new MavenProjectConsumer()
- {
- public void accept( MavenProject project )
- {
- set.add( project );
- }
- };
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
deleted file mode 100644
index f914161..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.plugin.assembly.functions;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-
-/**
- *
- */
-public interface ModuleSetConsumer
-{
- void accept( ModuleSet resolvedModule )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException;
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java
deleted file mode 100644
index 8a5e835..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.apache.maven.plugin.assembly.interpolation;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.io.DefaultAssemblyReader;
-import org.apache.maven.plugin.assembly.utils.InterpolationConstants;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.InterpolationState;
-
-import java.io.File;
-
-/**
- *
- */
-public class AssemblyExpressionEvaluator
- implements ExpressionEvaluator
-{
-
- private final AssemblerConfigurationSource configSource;
-
- private final FixedStringSearchInterpolator interpolator;
-
- private final PrefixAwareRecursionInterceptor interceptor;
-
- public AssemblyExpressionEvaluator( AssemblerConfigurationSource configSource )
- {
- this.configSource = configSource;
-
- final MavenProject project = configSource.getProject();
- final FixedStringSearchInterpolator projectInterpolator =
- DefaultAssemblyReader.createProjectInterpolator( project );
- interpolator = AssemblyInterpolator.fullInterpolator( project, projectInterpolator, configSource );
- interceptor = new PrefixAwareRecursionInterceptor( InterpolationConstants.PROJECT_PREFIXES, true );
- }
-
- public File alignToBaseDirectory( File f )
- {
- String basePath = configSource.getBasedir().getAbsolutePath();
- String path = f.getPath();
-
- if ( !f.isAbsolute() && !path.startsWith( basePath ) )
- {
- return new File( configSource.getBasedir(), path );
- }
- else
- {
- return f;
- }
- }
-
- public Object evaluate( String expression )
- throws ExpressionEvaluationException
- {
- InterpolationState is = new InterpolationState();
- is.setRecursionInterceptor( interceptor );
- return interpolator.interpolate( expression, is );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
deleted file mode 100644
index 90e5cfe..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.maven.plugin.assembly.interpolation;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class AssemblyInterpolationException
- extends Exception
-{
- private static final long serialVersionUID = 1L;
-
- public AssemblyInterpolationException( final String message, final Throwable cause )
- {
- super( message, cause );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
deleted file mode 100644
index 170a79d..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.apache.maven.plugin.assembly.interpolation;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Reader;
-import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader;
-import org.apache.maven.plugin.assembly.resolved.AssemblyId;
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.InterpolationState;
-import org.codehaus.plexus.interpolation.object.FieldBasedObjectInterpolator;
-import org.codehaus.plexus.logging.Logger;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @version $Id$
- */
-public class AssemblyInterpolator
-{
- private static final Set<String> INTERPOLATION_BLACKLIST;
-
- static
- {
- final Set<String> blacklist = new HashSet<String>();
-
- blacklist.add( "outputFileNameMapping" );
- blacklist.add( "outputDirectoryMapping" );
- blacklist.add( "outputDirectory" );
-
- INTERPOLATION_BLACKLIST = blacklist;
- }
-
- public AssemblyInterpolator()
- throws IOException
- {
- }
-
- public static AssemblyXpp3Reader.ContentTransformer assemblyInterpolator(
- final FixedStringSearchInterpolator interpolator, final InterpolationState is, final Logger logger )
- {
- @SuppressWarnings( "unchecked" ) final Set<String> blacklistFields =
- new HashSet<String>( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES );
- blacklistFields.addAll( INTERPOLATION_BLACKLIST );
-
- return new AssemblyXpp3Reader.ContentTransformer()
- {
- public String transform( String source, String contextDescription )
- {
- if ( blacklistFields.contains( contextDescription ) )
- {
- return source;
- }
-
- String interpolated = interpolator.interpolate( source, is );
- if ( !source.equals( interpolated ) && logger.isDebugEnabled() )
- {
- logger.debug(
- "Field " + contextDescription + " source: " + source + " interpolated to: " + interpolated );
- }
- return interpolated;
- }
- };
- }
-
- public static ComponentXpp3Reader.ContentTransformer componentInterpolator(
- final FixedStringSearchInterpolator interpolator, final InterpolationState is, final Logger logger )
- {
- @SuppressWarnings( "unchecked" ) final Set<String> blacklistFields =
- new HashSet<String>( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES );
- blacklistFields.addAll( INTERPOLATION_BLACKLIST );
-
- return new ComponentXpp3Reader.ContentTransformer()
- {
- public String transform( String source, String contextDescription )
- {
- if ( blacklistFields.contains( contextDescription ) )
- {
- return source;
- }
-
- String interpolated = interpolator.interpolate( source, is );
- if ( !source.equals( interpolated ) )
- {
- logger.debug(
- "Field " + contextDescription + " source: " + source + " interpolated to: " + interpolated );
- }
- return interpolated;
- }
- };
- }
-
-
- public static void checkErrors( AssemblyId assemblyId, InterpolationState interpolationState, Logger logger )
- {
- if ( interpolationState.asList() != null && interpolationState.asList().size() > 0 && logger.isDebugEnabled() )
- {
- final StringBuilder sb = new StringBuilder();
-
- sb.append( "One or more minor errors occurred while interpolating the assembly with ID: " ).append(
- assemblyId ).append( ":\n" );
-
- @SuppressWarnings( "unchecked" ) final List<Object> warnings = interpolationState.asList();
- for ( final Object warning : warnings )
- {
- sb.append( '\n' ).append( warning );
- }
-
- sb.append( "\n\nThese values were SKIPPED, but the assembly process will continue.\n" );
-
- logger.debug( sb.toString() );
- }
- }
-
- public static FixedStringSearchInterpolator fullInterpolator( final MavenProject project,
- @Nonnull FixedStringSearchInterpolator projectIp,
- final AssemblerConfigurationSource configSource )
- {
- FixedStringSearchInterpolator fixedStringSearchInterpolator =
- FixedStringSearchInterpolator.create( configSource.getRepositoryInterpolator(),
- configSource.getCommandLinePropsInterpolator(),
- configSource.getEnvInterpolator(), projectIp );
- return fixedStringSearchInterpolator.withPostProcessor(
- new PathTranslatingPostProcessor( project.getBasedir() ) );
-
- }
-
- private static final class PathTranslatingPostProcessor
- implements InterpolationPostProcessor
- {
-
- private final File basedir;
-
- public PathTranslatingPostProcessor( final File basedir )
- {
- this.basedir = basedir;
- }
-
- public Object execute( final String expression, final Object value )
- {
- final String path = String.valueOf( value );
- return AssemblyFileUtils.makePathRelativeTo( path, basedir );
- }
-
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReadException.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReadException.java
deleted file mode 100644
index 36481a2..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReadException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @version $Id$
- */
-public class AssemblyReadException
- extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- public AssemblyReadException( final String message, final Throwable cause )
- {
- super( message, cause );
- }
-
- public AssemblyReadException( final String message )
- {
- super( message );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java
deleted file mode 100644
index ea88128..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public interface AssemblyReader
-{
-
- List<Assembly> readAssemblies( AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException;
-
- Assembly getAssemblyForDescriptorReference( String ref, AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException;
-
- Assembly getAssemblyFromDescriptorFile( File file, AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException;
-
- void includeSiteInAssembly( Assembly assembly, AssemblerConfigurationSource configSource )
- throws MojoFailureException, InvalidAssemblerConfigurationException;
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
deleted file mode 100644
index ecd08b5..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
+++ /dev/null
@@ -1,564 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.Component;
-import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.FileItem;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Reader;
-import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer;
-import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader;
-import org.apache.maven.plugin.assembly.resolved.AssemblyId;
-import org.apache.maven.plugin.assembly.utils.InterpolationConstants;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.io.location.ClasspathResourceLocatorStrategy;
-import org.apache.maven.shared.io.location.FileLocatorStrategy;
-import org.apache.maven.shared.io.location.Location;
-import org.apache.maven.shared.io.location.Locator;
-import org.apache.maven.shared.io.location.LocatorStrategy;
-import org.apache.maven.shared.utils.ReaderFactory;
-import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
-import org.codehaus.plexus.interpolation.RecursionInterceptor;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.InterpolationState;
-import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
-import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.componentInterpolator;
-import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.assemblyInterpolator;
-import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.fullInterpolator;
-import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.checkErrors;
-
-
-/**
- * @version $Id$
- */
-@org.codehaus.plexus.component.annotations.Component( role = AssemblyReader.class )
-public class DefaultAssemblyReader
- extends AbstractLogEnabled
- implements AssemblyReader
-{
-
- public List<Assembly> readAssemblies( final AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Locator locator = new Locator();
-
- final List<LocatorStrategy> strategies = new ArrayList<LocatorStrategy>();
- strategies.add( new RelativeFileLocatorStrategy( configSource.getBasedir() ) );
- strategies.add( new FileLocatorStrategy() );
-
- final List<LocatorStrategy> refStrategies = new ArrayList<LocatorStrategy>();
- refStrategies.add( new PrefixedClasspathLocatorStrategy( "/assemblies/" ) );
-
- final List<Assembly> assemblies = new ArrayList<Assembly>();
-
- final String descriptor = configSource.getDescriptor();
- final String descriptorId = configSource.getDescriptorId();
- final String[] descriptors = configSource.getDescriptors();
- final String[] descriptorRefs = configSource.getDescriptorReferences();
- final File descriptorSourceDirectory = configSource.getDescriptorSourceDirectory();
-
- if ( descriptor != null )
- {
- locator.setStrategies( strategies );
- addAssemblyFromDescriptor( descriptor, locator, configSource, assemblies );
- }
-
- if ( descriptorId != null )
- {
- locator.setStrategies( refStrategies );
- addAssemblyForDescriptorReference( descriptorId, configSource, assemblies );
- }
-
- if ( ( descriptors != null ) && ( descriptors.length > 0 ) )
- {
- locator.setStrategies( strategies );
- for ( String descriptor1 : descriptors )
- {
- getLogger().info( "Reading assembly descriptor: " + descriptor1 );
- addAssemblyFromDescriptor( descriptor1, locator, configSource, assemblies );
- }
- }
-
- if ( ( descriptorRefs != null ) && ( descriptorRefs.length > 0 ) )
- {
- locator.setStrategies( refStrategies );
- for ( String descriptorRef : descriptorRefs )
- {
- addAssemblyForDescriptorReference( descriptorRef, configSource, assemblies );
- }
- }
-
- if ( ( descriptorSourceDirectory != null ) && descriptorSourceDirectory.isDirectory() )
- {
- locator.setStrategies(
- Collections.singletonList( new RelativeFileLocatorStrategy( descriptorSourceDirectory ) ) );
-
- final DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( descriptorSourceDirectory );
- scanner.setIncludes( new String[]{ "**/*.xml" } );
- scanner.addDefaultExcludes();
-
- scanner.scan();
-
- final String[] paths = scanner.getIncludedFiles();
-
- for ( String path : paths )
- {
- addAssemblyFromDescriptor( path, locator, configSource, assemblies );
- }
- }
-
- if ( assemblies.isEmpty() )
- {
- if ( configSource.isIgnoreMissingDescriptor() )
- {
- getLogger().debug(
- "Ignoring missing assembly descriptors per configuration. See messages above for specifics." );
- }
- else
- {
- throw new AssemblyReadException( "No assembly descriptors found." );
- }
- }
-
- // check unique IDs
- final Set<String> ids = new HashSet<String>();
- for ( final Assembly assembly : assemblies )
- {
- if ( !ids.add( assembly.getId() ) )
- {
- getLogger().warn( "The assembly id " + assembly.getId() + " is used more than once." );
- }
-
- }
- return assemblies;
- }
-
- public Assembly getAssemblyForDescriptorReference( final String ref,
- final AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- return addAssemblyForDescriptorReference( ref, configSource, new ArrayList<Assembly>( 1 ) );
- }
-
- public Assembly getAssemblyFromDescriptorFile( final File file, final AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- return addAssemblyFromDescriptorFile( file, configSource, new ArrayList<Assembly>( 1 ) );
- }
-
- private Assembly addAssemblyForDescriptorReference( final String ref,
- final AssemblerConfigurationSource configSource,
- final List<Assembly> assemblies )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final InputStream resourceAsStream =
- Thread.currentThread().getContextClassLoader().getResourceAsStream( "assemblies/" + ref + ".xml" );
-
- if ( resourceAsStream == null )
- {
- if ( configSource.isIgnoreMissingDescriptor() )
- {
- getLogger().debug( "Ignoring missing assembly descriptor with ID '" + ref + "' per configuration." );
- return null;
- }
- else
- {
- throw new AssemblyReadException( "Descriptor with ID '" + ref + "' not found" );
- }
- }
-
- Reader reader = null;
- try
- {
- reader = ReaderFactory.newXmlReader( resourceAsStream );
- final Assembly assembly = readAssembly( reader, ref, null, configSource );
-
- assemblies.add( assembly );
- return assembly;
- }
- catch ( final IOException e )
- {
- throw new AssemblyReadException( "Problem with descriptor with ID '" + ref + "'", e );
- }
- finally
- {
- IOUtils.closeQuietly( reader );
- }
- }
-
- private Assembly addAssemblyFromDescriptorFile( final File descriptor,
- final AssemblerConfigurationSource configSource,
- final List<Assembly> assemblies )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- if ( !descriptor.exists() )
- {
- if ( configSource.isIgnoreMissingDescriptor() )
- {
- getLogger().debug( "Ignoring missing assembly descriptor: '" + descriptor + "' per configuration." );
- return null;
- }
- else
- {
- throw new AssemblyReadException( "Descriptor: '" + descriptor + "' not found" );
- }
- }
-
- Reader r = null;
- try
- {
- r = ReaderFactory.newXmlReader( descriptor );
- final Assembly assembly =
- readAssembly( r, descriptor.getAbsolutePath(), descriptor.getParentFile(), configSource );
-
- assemblies.add( assembly );
-
- return assembly;
- }
- catch ( final IOException e )
- {
- throw new AssemblyReadException( "Error reading assembly descriptor: " + descriptor, e );
- }
- finally
- {
- IOUtil.close( r );
- }
- }
-
- private Assembly addAssemblyFromDescriptor( final String spec, final Locator locator,
- final AssemblerConfigurationSource configSource,
- final List<Assembly> assemblies )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Location location = locator.resolve( spec );
-
- if ( location == null )
- {
- if ( configSource.isIgnoreMissingDescriptor() )
- {
- getLogger().debug( "Ignoring missing assembly descriptor with ID '" + spec
- + "' per configuration.\nLocator output was:\n\n"
- + locator.getMessageHolder().render() );
- return null;
- }
- else
- {
- throw new AssemblyReadException(
- "Error locating assembly descriptor: " + spec + "\n\n" + locator.getMessageHolder().render() );
- }
- }
-
- Reader r = null;
- try
- {
- r = ReaderFactory.newXmlReader( location.getInputStream() );
-
- File dir = null;
- if ( location.getFile() != null )
- {
- dir = location.getFile().getParentFile();
- }
-
- final Assembly assembly = readAssembly( r, spec, dir, configSource );
-
- assemblies.add( assembly );
-
- return assembly;
- }
- catch ( final IOException e )
- {
- throw new AssemblyReadException( "Error reading assembly descriptor: " + spec, e );
- }
- finally
- {
- IOUtil.close( r );
- }
-
- }
-
- public Assembly readAssembly( final Reader reader, final String locationDescription, final File assemblyDir,
- final AssemblerConfigurationSource configSource )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- Assembly assembly;
-
- final MavenProject project = configSource.getProject();
- try
- {
-
- InterpolationState is = new InterpolationState();
- final RecursionInterceptor interceptor =
- new PrefixAwareRecursionInterceptor( InterpolationConstants.PROJECT_PREFIXES, true );
- is.setRecursionInterceptor( interceptor );
-
- FixedStringSearchInterpolator interpolator =
- fullInterpolator( project, createProjectInterpolator( project ), configSource );
- AssemblyXpp3Reader.ContentTransformer transformer = assemblyInterpolator( interpolator, is, getLogger() );
-
- final AssemblyXpp3Reader r = new AssemblyXpp3Reader( transformer );
- assembly = r.read( reader );
-
- ComponentXpp3Reader.ContentTransformer ctrans = componentInterpolator( interpolator, is, getLogger() );
- mergeComponentsWithMainAssembly( assembly, assemblyDir, configSource, ctrans );
- debugPrintAssembly( "After assembly is interpolated:", assembly );
-
- checkErrors( AssemblyId.createAssemblyId( assembly ), is, getLogger() );
-
- }
- catch ( final IOException e )
- {
- throw new AssemblyReadException( "Error reading descriptor: " + locationDescription + ": " + e.getMessage(),
- e );
- }
- catch ( final XmlPullParserException e )
- {
- throw new AssemblyReadException( "Error reading descriptor: " + locationDescription + ": " + e.getMessage(),
- e );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- if ( configSource.isSiteIncluded() || assembly.isIncludeSiteDirectory() )
- {
- includeSiteInAssembly( assembly, configSource );
- }
-
- return assembly;
- }
-
-
- public static FixedStringSearchInterpolator createProjectInterpolator( MavenProject project )
- {
- return FixedStringSearchInterpolator.create(
- new PrefixedPropertiesValueSource( InterpolationConstants.PROJECT_PROPERTIES_PREFIXES,
- project.getProperties(), true ),
- new PrefixedObjectValueSource( InterpolationConstants.PROJECT_PREFIXES, project, true ) );
- }
-
- private void debugPrintAssembly( final String message, final Assembly assembly )
- {
- final StringWriter sWriter = new StringWriter();
- try
- {
- new AssemblyXpp3Writer().write( sWriter, assembly );
- }
- catch ( final IOException e )
- {
- getLogger().debug(
- "Failed to print debug message with assembly descriptor listing, and message: " + message, e );
- }
-
- getLogger().debug( message + "\n\n" + sWriter.toString() + "\n\n" );
- }
-
- /**
- * Add the contents of all included components to main assembly
- *
- * @param assembly The assembly
- * @param assemblyDir The assembly directory
- * @param transformer The component interpolator
- * @throws AssemblyReadException .
- */
- protected void mergeComponentsWithMainAssembly( final Assembly assembly, final File assemblyDir,
- final AssemblerConfigurationSource configSource,
- ComponentXpp3Reader.ContentTransformer transformer )
- throws AssemblyReadException
- {
- final Locator locator = new Locator();
-
- if ( assemblyDir != null && assemblyDir.exists() && assemblyDir.isDirectory() )
- {
- locator.addStrategy( new RelativeFileLocatorStrategy( assemblyDir ) );
- }
-
- // allow absolute paths in componentDescriptor... MASSEMBLY-486
- locator.addStrategy( new RelativeFileLocatorStrategy( configSource.getBasedir() ) );
- locator.addStrategy( new FileLocatorStrategy() );
- locator.addStrategy( new ClasspathResourceLocatorStrategy() );
-
- final AssemblyExpressionEvaluator aee = new AssemblyExpressionEvaluator( configSource );
-
- final List<String> componentLocations = assembly.getComponentDescriptors();
-
- for ( String location : componentLocations )
- {
- // allow expressions in path to component descriptor... MASSEMBLY-486
- try
- {
- location = aee.evaluate( location ).toString();
- }
- catch ( final Exception eee )
- {
- getLogger().error( "Error interpolating componentDescriptor: " + location, eee );
- }
-
- final Location resolvedLocation = locator.resolve( location );
-
- if ( resolvedLocation == null )
- {
- throw new AssemblyReadException( "Failed to locate component descriptor: " + location );
- }
-
- Component component = null;
- Reader reader = null;
- try
- {
- reader = new InputStreamReader( resolvedLocation.getInputStream() );
- component = new ComponentXpp3Reader( transformer ).read( reader );
- }
- catch ( final IOException e )
- {
- throw new AssemblyReadException( "Error reading component descriptor: " + location + " (resolved to: "
- + resolvedLocation.getSpecification() + ")", e );
- }
- catch ( final XmlPullParserException e )
- {
- throw new AssemblyReadException( "Error reading component descriptor: " + location + " (resolved to: "
- + resolvedLocation.getSpecification() + ")", e );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- mergeComponentWithAssembly( component, assembly );
- }
- }
-
- /**
- * Add the content of a single Component to main assembly
- *
- * @param component The component
- * @param assembly The assembly
- */
- protected void mergeComponentWithAssembly( final Component component, final Assembly assembly )
- {
- final List<ContainerDescriptorHandlerConfig> containerHandlerDescriptors =
- component.getContainerDescriptorHandlers();
-
- for ( final ContainerDescriptorHandlerConfig cfg : containerHandlerDescriptors )
- {
- assembly.addContainerDescriptorHandler( cfg );
- }
-
- final List<DependencySet> dependencySetList = component.getDependencySets();
-
- for ( final DependencySet dependencySet : dependencySetList )
- {
- assembly.addDependencySet( dependencySet );
- }
-
- final List<FileSet> fileSetList = component.getFileSets();
-
- for ( final FileSet fileSet : fileSetList )
- {
- assembly.addFileSet( fileSet );
- }
-
- final List<FileItem> fileList = component.getFiles();
-
- for ( final FileItem fileItem : fileList )
- {
- assembly.addFile( fileItem );
- }
-
- final List<Repository> repositoriesList = component.getRepositories();
-
- for ( final Repository repository : repositoriesList )
- {
- assembly.addRepository( repository );
- }
-
- final List<ModuleSet> moduleSets = component.getModuleSets();
- for ( final ModuleSet moduleSet : moduleSets )
- {
- assembly.addModuleSet( moduleSet );
- }
- }
-
- public void includeSiteInAssembly( final Assembly assembly, final AssemblerConfigurationSource configSource )
- throws InvalidAssemblerConfigurationException
- {
- final File siteDirectory = configSource.getSiteDirectory();
-
- if ( !siteDirectory.exists() )
- {
- throw new InvalidAssemblerConfigurationException(
- "site did not exist in the target directory - please run site:site before creating the assembly" );
- }
-
- getLogger().info( "Adding site directory to assembly : " + siteDirectory );
-
- final FileSet siteFileSet = new FileSet();
-
- siteFileSet.setDirectory( siteDirectory.getPath() );
-
- siteFileSet.setOutputDirectory( "/site" );
-
- assembly.addFileSet( siteFileSet );
- }
-
- @Override
- protected Logger getLogger()
- {
- Logger logger = super.getLogger();
-
- if ( logger == null )
- {
- logger = new ConsoleLogger( Logger.LEVEL_INFO, "assemblyReader-internal" );
- enableLogging( logger );
- }
-
- return logger;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
deleted file mode 100644
index 4870170..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.shared.io.location.ClasspathResourceLocatorStrategy;
-import org.apache.maven.shared.io.location.Location;
-import org.apache.maven.shared.io.logging.MessageHolder;
-
-/**
- * @version $Id$
- */
-class PrefixedClasspathLocatorStrategy
- extends ClasspathResourceLocatorStrategy
-{
-
- private final String prefix;
-
- public PrefixedClasspathLocatorStrategy( String prefix )
- {
- this.prefix = formatPrefix( prefix );
- }
-
- private String formatPrefix( String prefix )
- {
- if ( prefix.startsWith( "/" ) )
- {
- prefix = prefix.substring( 1 );
- }
-
- if ( prefix.length() > 0 && !prefix.endsWith( "/" ) )
- {
- prefix += "/";
- }
-
- return prefix;
- }
-
- public Location resolve( String locationSpecification, MessageHolder messageHolder )
- {
- String spec = formatLocation( locationSpecification );
-
- return super.resolve( spec, messageHolder );
- }
-
- private String formatLocation( String location )
- {
- if ( location.startsWith( "/" ) )
- {
- location = location.substring( 1 );
- }
-
- return prefix + location;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
deleted file mode 100644
index 5930d4d..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.shared.io.location.FileLocation;
-import org.apache.maven.shared.io.location.Location;
-import org.apache.maven.shared.io.location.LocatorStrategy;
-import org.apache.maven.shared.io.logging.MessageHolder;
-
-import java.io.File;
-
-/**
- * @version $Id$
- */
-class RelativeFileLocatorStrategy
- implements LocatorStrategy
-{
-
- private final File basedir;
-
- public RelativeFileLocatorStrategy( File basedir )
- {
- this.basedir = basedir;
- }
-
- public Location resolve( String locationSpecification, MessageHolder messageHolder )
- {
- File file = new File( basedir, locationSpecification );
- messageHolder.addInfoMessage( "Searching for file location: " + file.getAbsolutePath() );
-
- Location location = null;
-
- if ( file.exists() )
- {
- location = new FileLocation( file, locationSpecification );
- }
- else
- {
- messageHolder.addMessage( "File: " + file.getAbsolutePath() + " does not exist." );
- }
-
- return location;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
deleted file mode 100644
index 14a5f41..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.maven.plugin.assembly.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
-
-/**
- *
- */
-public class Assemblies
-{
-
- public static void forEachModuleSet( Assembly assembly, ModuleSetConsumer moduleSetConsumer )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
- for ( ModuleSet resolvedModuleSet : assembly.getModuleSets() )
- {
- moduleSetConsumer.accept( resolvedModuleSet );
- }
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
deleted file mode 100644
index c9939c0..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.AssemblyArchiver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.io.AssemblyReadException;
-import org.apache.maven.plugin.assembly.io.AssemblyReader;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.InterpolationConstants;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.shared.filtering.MavenReaderFilter;
-import org.apache.maven.shared.utils.cli.CommandLineUtils;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
-import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
- * @threadSafe
- */
-public abstract class AbstractAssemblyMojo
- extends AbstractMojo
- implements AssemblerConfigurationSource
-{
- /**
- * The character encoding scheme to be applied when filtering resources.
- */
- @Parameter( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
- private String encoding;
-
- /**
- * Expressions preceded with this String won't be interpolated.
- * If you use "\" as the escape string then \${foo} will be replaced with ${foo}.
- *
- * @since 2.4
- */
- @Parameter( property = "assembly.escapeString" )
- private String escapeString;
-
- /**
- * Flag allowing one or more executions of the assembly plugin to be configured as skipped for a particular build.
- * This makes the assembly plugin more controllable from profiles.
- */
- @Parameter( property = "assembly.skipAssembly", defaultValue = "false" )
- private boolean skipAssembly;
-
- /**
- * If this flag is set, everything up to the call to Archiver.createArchive() will be executed.
- */
- @Parameter( property = "assembly.dryRun", defaultValue = "false" )
- private boolean dryRun;
-
- /**
- * If this flag is set, the ".dir" suffix will be suppressed in the output directory name when using assembly/format
- * == 'dir' and other formats that begin with 'dir'. <br/>
- * <b>NOTE:</b> Since 2.2-beta-3, the default-value for this is true, NOT false as it used to be.
- */
- @Parameter( defaultValue = "true" )
- private boolean ignoreDirFormatExtensions;
-
- /**
- * Local Maven repository where artifacts are cached during the build process.
- */
- @Parameter( defaultValue = "${localRepository}", required = true, readonly = true )
- private ArtifactRepository localRepository;
-
- /**
- */
- @Parameter( defaultValue = "${project.remoteArtifactRepositories}", required = true, readonly = true )
- private List<ArtifactRepository> remoteRepositories;
-
- /**
- * Contains the full list of projects in the reactor.
- */
- @Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true )
- private List<MavenProject> reactorProjects;
-
- /**
- * The output directory of the assembled distribution file.
- */
- @Parameter( defaultValue = "${project.build.directory}", required = true )
- private File outputDirectory;
-
- /**
- * The filename of the assembled distribution file.
- */
- @Parameter( defaultValue = "${project.build.finalName}", required = true )
- private String finalName;
-
- /**
- * Directory to unpack JARs into if needed
- */
- @Parameter( defaultValue = "${project.build.directory}/assembly/work", required = true )
- private File workDirectory;
-
- /**
- * Specifies the formats of the assembly.
- * Multiple formats can be supplied and the Assembly Plugin will generate an archive for each desired formats.
- * When deploying your project, all file formats specified will also be deployed. A format is specified by supplying
- * one of the following
- * values in a <format> subelement:
- * <ul>
- * <li><em>dir</em> - Creates a directory</li>
- * <li><em>zip</em> - Creates a ZIP file format</li>
- * <li><em>tar</em> - Creates a TAR format</li>
- * <li><em>tar.gz</em> or <em>tgz</em> - Creates a gzip'd TAR format</li>
- * <li><em>tar.bz2</em> or <em>tbz2</em> - Creates a bzip'd TAR format</li>
- * </ul>
- */
- @Parameter
- private List<String> formats;
-
- /**
- * This is the artifact classifier to be used for the resultant assembly artifact. Normally, you would use the
- * assembly-id instead of specifying this here.
- *
- * @deprecated Please use the Assembly's id for classifier instead
- */
- @Deprecated
- @Parameter( property = "classifier" )
- private String classifier;
-
- /**
- * A list of descriptor files to generate from.
- */
- @Parameter
- private String[] descriptors;
-
- /**
- * A list of references to assembly descriptors available on the plugin's classpath. The default classpath
- * includes these built-in descriptors: <code>bin</code>, <code>jar-with-dependencies</code>, <code>src</code>, and
- * <code>project</code>. You can add others by adding dependencies
- * to the plugin.
- */
- @Parameter
- private String[] descriptorRefs;
-
- /**
- * Directory to scan for descriptor files in. <b>NOTE:</b> This may not work correctly with assembly components.
- */
- @Parameter
- private File descriptorSourceDirectory;
-
- /**
- * This is the base directory from which archive files are created. This base directory pre-pended to any
- * <code><directory></code> specifications in the assembly descriptor. This is an optional parameter.
- */
- @Parameter
- private File archiveBaseDirectory;
-
- /**
- * Predefined Assembly Descriptor Id's. You can select bin, jar-with-dependencies, or src.
- *
- * @deprecated Please use descriptorRefs instead
- */
- @Deprecated
- @Parameter( property = "descriptorId" )
- private String descriptorId;
-
- /**
- * Assembly XML Descriptor file. This must be the path to your customized descriptor file.
- *
- * @deprecated Please use descriptors instead
- */
- @Deprecated
- @Parameter( property = "descriptor" )
- private String descriptor;
-
- /**
- * Sets the TarArchiver behavior on file paths with more than 100 characters length. Valid values are: "warn"
- * (default), "fail", "truncate", "gnu", "posix", "posix_warn" or "omit".
- */
- @Parameter( property = "assembly.tarLongFileMode", defaultValue = "warn" )
- private String tarLongFileMode;
-
- /**
- * Base directory of the project.
- */
- @Parameter( defaultValue = "${project.basedir}", required = true, readonly = true )
- private File basedir;
-
- /**
- * Maven ProjectHelper.
- */
- @Component
- private MavenProjectHelper projectHelper;
-
- /**
- * Maven shared filtering utility.
- */
- @Component
- private MavenReaderFilter mavenReaderFilter;
-
- /**
- * The Maven Session Object
- */
- @Parameter( defaultValue = "${session}", readonly = true, required = true )
- private MavenSession mavenSession;
-
- /**
- * Temporary directory that contain the files to be assembled.
- */
- @Parameter( defaultValue = "${project.build.directory}/archive-tmp", required = true, readonly = true )
- private File tempRoot;
-
- /**
- * Directory for site generated.
- */
- @Parameter( defaultValue = "${project.reporting.outputDirectory}", readonly = true )
- private File siteDirectory;
-
- /**
- * Set to true to include the site generated by site:site goal.
- *
- * @deprecated Please set this variable in the assembly descriptor instead
- */
- @Deprecated
- @Parameter( property = "includeSite", defaultValue = "false" )
- private boolean includeSite;
-
- /**
- * Set to false to exclude the assembly id from the assembly final name.
- */
- @Parameter( property = "assembly.appendAssemblyId", defaultValue = "true" )
- boolean appendAssemblyId;
-
- /**
- * Set to true in order to not fail when a descriptor is missing.
- */
- @Parameter( property = "assembly.ignoreMissingDescriptor", defaultValue = "false" )
- private boolean ignoreMissingDescriptor;
-
- /**
- * This is a set of instructions to the archive builder, especially for building .jar files. It enables you to
- * specify a Manifest file for the jar, in addition to other options.
- * See <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven Archiver Reference</a>.
- */
- @Parameter
- private MavenArchiveConfiguration archive;
-
- /**
- * The list of extra filter properties files to be used along with System properties, project
- * properties, and filter properties files specified in the POM build/filters section, which
- * should be used for the filtering during the current mojo execution. <br/>
- * Normally, these will be configured from a plugin's execution section, to provide a different
- * set of filters for a particular execution.
- */
- @Parameter
- private List<String> filters;
-
- /**
- * If True (default) then the ${project.build.filters} are also used in addition to any
- * further filters defined for the Assembly.
- *
- * @since 2.4.2
- */
- @Parameter( property = "assembly.includeProjectBuildFilters", defaultValue = "true" )
- private boolean includeProjectBuildFilters;
-
- /**
- * Controls whether the assembly plugin tries to attach the resulting assembly to the project.
- *
- * @since 2.2-beta-1
- */
- @Parameter( property = "assembly.attach", defaultValue = "true" )
- private boolean attach;
-
- /**
- * Indicates if zip archives (jar,zip etc) being added to the assembly should be compressed again.
- * Compressing again can result in smaller archive size, but gives noticeably longer execution time.
- *
- * @since 2.4
- */
- @Parameter( defaultValue = "true" )
- private boolean recompressZippedFiles;
-
- /**
- */
- @Component
- private AssemblyArchiver assemblyArchiver;
-
- /**
- */
- @Component
- private AssemblyReader assemblyReader;
-
- /**
- * Allows additional configuration options that are specific to a particular type of archive format. This is
- * intended to capture an XML configuration that will be used to reflectively setup the options on the archiver
- * instance. <br/>
- * For instance, to direct an assembly with the "ear" format to use a particular deployment descriptor, you should
- * specify the following for the archiverConfig value in your plugin configuration: <br/>
- * <p/>
- * <p/>
- * <pre>
- * <appxml>${project.basedir}/somepath/app.xml</appxml>
- * </pre>
- *
- * @since 2.2-beta-3
- */
- @Parameter
- private PlexusConfiguration archiverConfig;
-
- /**
- * This will cause the assembly to run only at the top of a given module tree. That is, run in the project contained
- * in the same folder where the mvn execution was launched.
- *
- * @since 2.2-beta-4
- */
- @Parameter( property = "assembly.runOnlyAtExecutionRoot", defaultValue = "false" )
- private boolean runOnlyAtExecutionRoot;
-
- /**
- * This will cause the assembly to only update an existing archive, if it exists.
- * <p>
- * <strong>Note:</strong> The property that can be used on the command line was misspelled as "assembly.updatOnly"
- * in versions prior to version 2.4.
- * </p>
- *
- * @since 2.2
- */
- @Parameter( property = "assembly.updateOnly", defaultValue = "false" )
- private boolean updateOnly;
-
- /**
- * <p>
- * will use the jvm chmod, this is available for user and all level group level will be ignored As of
- * assembly-plugin 2.5, this flag is ignored for users of java7+
- * </p>
- *
- * @since 2.2
- */
- @Parameter( property = "assembly.useJvmChmod", defaultValue = "false" )
- private boolean useJvmChmod;
-
- /**
- * <p>
- * Set to <code>true</code> in order to avoid all chmod calls.
- * </p>
- * <p/>
- * <p>
- * <b>NOTE:</b> This will cause the assembly plugin to <b>DISREGARD</b> all fileMode/directoryMode settings in the
- * assembly descriptor, and all file permissions in unpacked dependencies!
- * </p>
- *
- * @since 2.2
- */
- @Parameter( property = "assembly.ignorePermissions", defaultValue = "false" )
- private boolean ignorePermissions;
-
- /**
- * <p>
- * Set of delimiters for expressions to filter within the resources. These delimiters are specified in the form
- * 'beginToken*endToken'. If no '*' is given, the delimiter is assumed to be the same for start and end.
- * </p>
- * <p>
- * So, the default filtering delimiters might be specified as:
- * </p>
- * <p/>
- * <pre>
- * <delimiters>
- * <delimiter>${*}</delimiter>
- * <delimiter>@</delimiter>
- * </delimiters>
- * </pre>
- * <p>
- * Since the '@' delimiter is the same on both ends, we don't need to specify '@*@' (though we can).
- * </p>
- *
- * @since 2.4
- */
- @Parameter
- private List<String> delimiters;
-
- protected FixedStringSearchInterpolator commanndLinePropertiesInterpolator;
-
- protected FixedStringSearchInterpolator envInterpolator;
-
- protected FixedStringSearchInterpolator mainProjectInterpolator;
-
- protected FixedStringSearchInterpolator rootInterpolator;
-
- /**
- * Create the binary distribution.
- *
- * @throws org.apache.maven.plugin.MojoExecutionException
- */
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
-
- if ( skipAssembly )
- {
- getLog().info( "Assemblies have been skipped per configuration of the skipAssembly parameter." );
- return;
- }
-
- // run only at the execution root.
- if ( runOnlyAtExecutionRoot && !isThisTheExecutionRoot() )
- {
- getLog().info( "Skipping the assembly in this project because it's not the Execution Root" );
- return;
- }
-
- List<Assembly> assemblies;
- try
- {
- assemblies = assemblyReader.readAssemblies( this );
- }
- catch ( final AssemblyReadException e )
- {
- throw new MojoExecutionException( "Error reading assemblies: " + e.getMessage(), e );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- throw new MojoFailureException( assemblyReader, e.getMessage(),
- "Mojo configuration is invalid: " + e.getMessage() );
- }
-
- // TODO: include dependencies marked for distribution under certain formats
- // TODO: how, might we plug this into an installer, such as NSIS?
-
- boolean warnedAboutMainProjectArtifact = false;
- for ( final Assembly assembly : assemblies )
- {
- try
- {
- final String fullName = AssemblyFormatUtils.getDistributionName( assembly, this );
-
- List<String> effectiveFormats = formats;
- if ( effectiveFormats == null || effectiveFormats.size() == 0 )
- {
- effectiveFormats = assembly.getFormats();
- }
- if ( effectiveFormats == null || effectiveFormats.size() == 0 )
- {
- throw new MojoFailureException(
- "No formats specified in the execution parameters or the assembly descriptor." );
- }
-
- for ( final String format : effectiveFormats )
- {
- final File destFile =
- assemblyArchiver.createArchive( assembly, fullName, format, this, isRecompressZippedFiles() );
-
- final MavenProject project = getProject();
- final String classifier = getClassifier();
- final String type = project.getArtifact().getType();
-
- if ( attach && destFile.isFile() )
- {
- if ( isAssemblyIdAppended() )
- {
- projectHelper.attachArtifact( project, format, assembly.getId(), destFile );
- }
- else if ( classifier != null )
- {
- projectHelper.attachArtifact( project, format, classifier, destFile );
- }
- else if ( !"pom".equals( type ) && format.equals( type ) )
- {
- if ( !warnedAboutMainProjectArtifact )
- {
- final StringBuilder message = new StringBuilder();
-
- message.append( "Configuration options: 'appendAssemblyId' is set to false, "
- + "and 'classifier' is missing." );
- message.append( "\nInstead of attaching the assembly file: " ).append( destFile );
- message.append( ", it will become the file for main project artifact." );
- message.append( "\nNOTE: If multiple descriptors or descriptor-formats are provided "
- + "for this project, the value of this file will be non-deterministic!" );
-
- getLog().warn( message );
- warnedAboutMainProjectArtifact = true;
- }
-
- final File existingFile = project.getArtifact().getFile();
- if ( ( existingFile != null ) && existingFile.exists() )
- {
- getLog().warn( "Replacing pre-existing project main-artifact file: " + existingFile
- + "\nwith assembly file: " + destFile );
- }
-
- project.getArtifact().setFile( destFile );
- }
- else
- {
- projectHelper.attachArtifact( project, format, null, destFile );
- }
- }
- else if ( attach )
- {
- getLog().warn( "Assembly file: " + destFile + " is not a regular file (it may be a directory). "
- + "It cannot be attached to the project build for installation or deployment." );
- }
- }
- }
- catch ( final ArchiveCreationException e )
- {
- throw new MojoExecutionException( "Failed to create assembly: " + e.getMessage(), e );
- }
- catch ( final AssemblyFormattingException e )
- {
- throw new MojoExecutionException( "Failed to create assembly: " + e.getMessage(), e );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- throw new MojoFailureException( assembly, "Assembly is incorrectly configured: " + assembly.getId(),
- "Assembly: " + assembly.getId() + " is not configured correctly: "
- + e.getMessage() );
- }
- }
- }
-
- private FixedStringSearchInterpolator createRepositoryInterpolator()
- {
- final Properties settingsProperties = new Properties();
- final MavenSession session = getMavenSession();
-
- if ( getLocalRepository() != null )
- {
- settingsProperties.setProperty( "localRepository", getLocalRepository().getBasedir() );
- settingsProperties.setProperty( "settings.localRepository", getLocalRepository().getBasedir() );
- }
- else if ( session != null && session.getSettings() != null )
- {
- settingsProperties.setProperty( "localRepository", session.getSettings().getLocalRepository() );
- settingsProperties.setProperty( "settings.localRepository", getLocalRepository().getBasedir() );
- }
-
- return FixedStringSearchInterpolator.create( new PropertiesBasedValueSource( settingsProperties ) );
-
- }
-
- private FixedStringSearchInterpolator createCommandLinePropertiesInterpolator()
- {
- Properties commandLineProperties = System.getProperties();
- final MavenSession session = getMavenSession();
-
- if ( session != null )
- {
- commandLineProperties = new Properties();
- if ( session.getExecutionProperties() != null )
- {
- commandLineProperties.putAll( session.getExecutionProperties() );
- }
-
- if ( session.getUserProperties() != null )
- {
- commandLineProperties.putAll( session.getUserProperties() );
- }
- }
-
- PropertiesBasedValueSource cliProps = new PropertiesBasedValueSource( commandLineProperties );
- return FixedStringSearchInterpolator.create( cliProps );
-
- }
-
- private FixedStringSearchInterpolator createEnvInterpolator()
- {
- PrefixedPropertiesValueSource envProps = new PrefixedPropertiesValueSource( Collections.singletonList( "env." ),
- CommandLineUtils.getSystemEnvVars(
- false ), true );
- return FixedStringSearchInterpolator.create( envProps );
- }
-
- /**
- * Returns true if the current project is located at the Execution Root Directory (where mvn was launched)
- *
- * @return if this is the execution root
- */
- boolean isThisTheExecutionRoot()
- {
- final Log log = getLog();
- log.debug( "Root Folder:" + mavenSession.getExecutionRootDirectory() );
- log.debug( "Current Folder:" + basedir );
- final boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase( basedir.toString() );
- if ( result )
- {
- log.debug( "This is the execution root." );
- }
- else
- {
- log.debug( "This is NOT the execution root." );
- }
-
- return result;
- }
-
- AssemblyArchiver getAssemblyArchiver()
- {
- return assemblyArchiver;
- }
-
- AssemblyReader getAssemblyReader()
- {
- return assemblyReader;
- }
-
- public File getBasedir()
- {
- return basedir;
- }
-
- /**
- * {@inheritDoc}
- *
- * @deprecated This has been replaced by {@link #getDescriptors()}
- */
- @Deprecated
- public String getDescriptor()
- {
- return descriptor;
- }
-
- /**
- * {@inheritDoc}
- *
- * @deprecated This has been replaced by {@link #getDescriptorReferences()}
- */
- @Deprecated
- public String getDescriptorId()
- {
- return descriptorId;
- }
-
- public String[] getDescriptorReferences()
- {
- return descriptorRefs;
- }
-
- public File getDescriptorSourceDirectory()
- {
- return descriptorSourceDirectory;
- }
-
- public String[] getDescriptors()
- {
- return descriptors;
- }
-
- public abstract MavenProject getProject();
-
- public File getSiteDirectory()
- {
- return siteDirectory;
- }
-
- public boolean isSiteIncluded()
- {
- return includeSite;
- }
-
- public String getFinalName()
- {
- return finalName;
- }
-
- public boolean isAssemblyIdAppended()
- {
- return appendAssemblyId;
- }
-
- public String getTarLongFileMode()
- {
- return tarLongFileMode;
- }
-
- public File getOutputDirectory()
- {
- return outputDirectory;
- }
-
- public MavenArchiveConfiguration getJarArchiveConfiguration()
- {
- return archive;
- }
-
- public File getWorkingDirectory()
- {
- return workDirectory;
- }
-
- public ArtifactRepository getLocalRepository()
- {
- return localRepository;
- }
-
- public File getTemporaryRootDirectory()
- {
- return tempRoot;
- }
-
- public File getArchiveBaseDirectory()
- {
- return archiveBaseDirectory;
- }
-
- public List<String> getFilters()
- {
- if ( filters == null )
- {
- filters = getProject().getBuild().getFilters();
- if ( filters == null )
- {
- filters = Collections.emptyList();
- }
- }
- return filters;
- }
-
- public boolean isIncludeProjectBuildFilters()
- {
- return includeProjectBuildFilters;
- }
-
- public List<MavenProject> getReactorProjects()
- {
- return reactorProjects;
- }
-
- public String getClassifier()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected MavenProjectHelper getProjectHelper()
- {
- return projectHelper;
- }
-
- public void setAppendAssemblyId( final boolean appendAssemblyId )
- {
- this.appendAssemblyId = appendAssemblyId;
- }
-
- public void setArchive( final MavenArchiveConfiguration archive )
- {
- this.archive = archive;
- }
-
-
- public void setBasedir( final File basedir )
- {
- this.basedir = basedir;
- }
-
- public void setClassifier( final String classifier )
- {
- this.classifier = classifier;
- }
-
- /**
- * {@inheritDoc}
- *
- * @deprecated This has been replaced by {@link #setDescriptors(String[])}
- */
- @Deprecated
- public void setDescriptor( final String descriptor )
- {
- this.descriptor = descriptor;
- }
-
- /**
- * {@inheritDoc}
- *
- * @deprecated This has been replaced by {@link #setDescriptorRefs(String[])}
- */
- @Deprecated
- public void setDescriptorId( final String descriptorId )
- {
- this.descriptorId = descriptorId;
- }
-
- public void setDescriptorRefs( final String[] descriptorRefs )
- {
- this.descriptorRefs = descriptorRefs;
- }
-
- public void setDescriptors( final String[] descriptors )
- {
- this.descriptors = descriptors;
- }
-
- public void setDescriptorSourceDirectory( final File descriptorSourceDirectory )
- {
- this.descriptorSourceDirectory = descriptorSourceDirectory;
- }
-
- public void setFilters( final List<String> filters )
- {
- this.filters = filters;
- }
-
- public void setFinalName( final String finalName )
- {
- this.finalName = finalName;
- }
-
- public void setIncludeSite( final boolean includeSite )
- {
- this.includeSite = includeSite;
- }
-
- public void setLocalRepository( final ArtifactRepository localRepository )
- {
- this.localRepository = localRepository;
- }
-
- public void setOutputDirectory( final File outputDirectory )
- {
- this.outputDirectory = outputDirectory;
- }
-
- public void setProjectHelper( final MavenProjectHelper projectHelper )
- {
- this.projectHelper = projectHelper;
- }
-
- public void setReactorProjects( final List<MavenProject> reactorProjects )
- {
- this.reactorProjects = reactorProjects;
- }
-
- public void setSiteDirectory( final File siteDirectory )
- {
- this.siteDirectory = siteDirectory;
- }
-
- public void setTarLongFileMode( final String tarLongFileMode )
- {
- this.tarLongFileMode = tarLongFileMode;
- }
-
- public void setTempRoot( final File tempRoot )
- {
- this.tempRoot = tempRoot;
- }
-
- public void setWorkDirectory( final File workDirectory )
- {
- this.workDirectory = workDirectory;
- }
-
- public List<ArtifactRepository> getRemoteRepositories()
- {
- return remoteRepositories;
- }
-
- public boolean isDryRun()
- {
- return dryRun;
- }
-
- public boolean isIgnoreDirFormatExtensions()
- {
- return ignoreDirFormatExtensions;
- }
-
- public boolean isIgnoreMissingDescriptor()
- {
- return ignoreMissingDescriptor;
- }
-
- public void setIgnoreMissingDescriptor( final boolean ignoreMissingDescriptor )
- {
- this.ignoreMissingDescriptor = ignoreMissingDescriptor;
- }
-
- public MavenSession getMavenSession()
- {
- return mavenSession;
- }
-
- public String getArchiverConfig()
- {
- return archiverConfig == null ? null : archiverConfig.toString();
- }
-
- public MavenReaderFilter getMavenReaderFilter()
- {
- return mavenReaderFilter;
- }
-
- public boolean isUpdateOnly()
- {
- return updateOnly;
- }
-
- public boolean isUseJvmChmod()
- {
- return useJvmChmod;
- }
-
- public boolean isIgnorePermissions()
- {
- return ignorePermissions;
- }
-
- public String getEncoding()
- {
- return encoding;
- }
-
- boolean isRecompressZippedFiles()
- {
- return recompressZippedFiles;
- }
-
- public String getEscapeString()
- {
- return escapeString;
- }
-
- public List<String> getDelimiters()
- {
- return delimiters;
- }
-
- @Nonnull public FixedStringSearchInterpolator getCommandLinePropsInterpolator()
- {
- if ( commanndLinePropertiesInterpolator == null )
- {
- this.commanndLinePropertiesInterpolator = createCommandLinePropertiesInterpolator();
- }
- return commanndLinePropertiesInterpolator;
- }
-
- @Nonnull
- public FixedStringSearchInterpolator getEnvInterpolator()
- {
- if ( envInterpolator == null )
- {
- this.envInterpolator = createEnvInterpolator();
- }
- return envInterpolator;
- }
-
- @Nonnull public FixedStringSearchInterpolator getRepositoryInterpolator()
- {
- if ( rootInterpolator == null )
- {
- this.rootInterpolator = createRepositoryInterpolator();
- }
- return rootInterpolator;
- }
-
-
- @Nonnull
- public FixedStringSearchInterpolator getMainProjectInterpolator()
- {
- if ( mainProjectInterpolator == null )
- {
- this.mainProjectInterpolator = mainProjectInterpolator( getProject() );
- }
- return mainProjectInterpolator;
- }
-
- public static FixedStringSearchInterpolator mainProjectInterpolator( MavenProject mainProject )
- {
- if ( mainProject != null )
- {
- // 5
- return FixedStringSearchInterpolator.create(
- new org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource(
- InterpolationConstants.PROJECT_PREFIXES, mainProject, true ),
-
- // 6
- new org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource(
- InterpolationConstants.PROJECT_PROPERTIES_PREFIXES, mainProject.getProperties(), true ) );
- }
- else
- {
- return FixedStringSearchInterpolator.empty();
- }
- }
-
-
- public void setDelimiters( List<String> delimiters )
- {
- this.delimiters = delimiters;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java
deleted file mode 100644
index bbedf19..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.AssemblyArchiver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.io.AssemblyReadException;
-import org.apache.maven.plugin.assembly.io.AssemblyReader;
-import org.apache.maven.plugin.assembly.model.Assembly;
-
-import java.util.List;
-
-/**
- * @version $Id$
- */
-@Deprecated
-public abstract class AbstractDirectoryMojo
- extends AbstractAssemblyMojo
-{
- @Override
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- final AssemblyReader reader = getAssemblyReader();
-
- List<Assembly> assemblies;
- try
- {
- assemblies = reader.readAssemblies( this );
- }
- catch ( final AssemblyReadException e )
- {
- throw new MojoExecutionException( "Error reading assembly descriptors: " + e.getMessage(), e );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- throw new MojoFailureException( reader, e.getMessage(),
- "Mojo configuration is invalid: " + e.getMessage() );
- }
-
- for ( Assembly assembly : assemblies )
- {
- createDirectory( assembly );
- }
- }
-
- private void createDirectory( final Assembly assembly )
- throws MojoExecutionException, MojoFailureException
- {
- final AssemblyArchiver archiver = getAssemblyArchiver();
-
- String fullName = getFinalName();
-
- if ( appendAssemblyId )
- {
- fullName = fullName + "-" + assembly.getId();
- }
- else if ( getClassifier() != null )
- {
- fullName = fullName + "-" + getClassifier();
- }
-
- try
- {
- archiver.createArchive( assembly, fullName, "dir", this, isRecompressZippedFiles() );
- }
- catch ( final ArchiveCreationException e )
- {
- throw new MojoExecutionException( "Error creating assembly: " + e.getMessage(), e );
- }
- catch ( final AssemblyFormattingException e )
- {
- throw new MojoExecutionException( "Error creating assembly: " + e.getMessage(), e );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- throw new MojoFailureException( assembly, "Assembly is incorrectly configured: " + assembly.getId(),
- "Assembly: " + assembly.getId() + " is not configured correctly: "
- + e.getMessage() );
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
deleted file mode 100644
index 5ee3e62..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Assemble an application bundle or distribution using an assembly descriptor from the command line. This goal will
- * force Maven to build all included POMs up to the <code>package</code> phase BEFORE the assembly is processed. <br/>
- * <p/>
- * <b>NOTE:</b> This goal should ONLY be run from the command line, and if building a multimodule project it should be
- * used from the root POM. Use the <code>assembly:single</code> goal for binding your assembly to the lifecycle. <br/>
- *
- * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
- * @deprecated Use assembly:single instead! The assembly:assembly mojo leads to non-standard builds.
- */
-@Deprecated
-@Mojo( name = "assembly", aggregator = true, inheritByDefault = false )
-@Execute( phase = LifecyclePhase.PACKAGE )
-public class AssemblyMojo
- extends AbstractAssemblyMojo
-{
- /**
- * Get the executed project from the forked lifecycle.
- */
- @Parameter( property = "executedProject" )
- private MavenProject executedProject;
-
- @Override
- public MavenProject getProject()
- {
- return executedProject;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java
deleted file mode 100644
index 4ad3d5b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Assemble an application bundle or distribution from an assembly descriptor, WITHOUT first forcing Maven to build all
- * POMs to the <code>package</code> phase (as is required by the <code>assembly:assembly</code> goal). <br/>
- * <p/>
- * <b>NOTE:</b> This goal should ONLY be run from the command line, and if building a multimodule project it should be
- * used from the root POM. Use the <code>assembly:single</code> goal for binding your assembly to the lifecycle.
- *
- * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
- * @author <a href="mailto:jerome@coffeebreaks.org">Jerome Lacoste</a>
- * @version $Id$
- * @deprecated Use assembly:single instead! The assembly:attached mojo leads to non-standard builds.
- */
-@Mojo( name = "attached", aggregator = true, inheritByDefault = false )
-@Deprecated
-public class AttachedAssemblyMojo
- extends AbstractAssemblyMojo
-{
- /**
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- private MavenProject project;
-
- @Override
- public MavenProject getProject()
- {
- return project;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java
deleted file mode 100644
index dd67f96..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Like the <code>assembly:attached</code> goal, assemble an application bundle or distribution from an assembly
- * descriptor, WITHOUT first forcing Maven to build all POMs to the <code>package</code> phase (as is required by the
- * <code>assembly:assembly</code> goal). This goal differs from <code>assembly:attached</code> in that it ignores the
- * <formats/> section of the assembly descriptor, and forces the assembly to be created as a directory in the
- * project's build-output directory (usually <code>./target</code>). <br/>
- * <p/>
- * This goal is also functionally equivalent to using the <code>assembly:attached</code> goal in conjunction with the
- * <code>dir</code> assembly format. <br/>
- * <p/>
- * <b>NOTE:</b> This goal should ONLY be run from the command line, and if building a multimodule project it should be
- * used from the root POM. Use the <code>assembly:directory-single</code> goal for binding your assembly to the
- * lifecycle.
- *
- * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
- * @author <a href="mailto:gscokart@users.sourceforge.net">Gilles Scokart</a>
- * @version $Id$
- * @deprecated Use assembly:single and an assembly with format == dir instead! This mojo is redundant, and leads to
- * non-standard builds.
- */
-@Mojo( name = "directory-inline", aggregator = true, inheritByDefault = false )
-@Deprecated
-public class DirectoryInlineMojo
- extends AbstractDirectoryMojo
-{
- /**
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- private MavenProject project;
-
- @Override
- public MavenProject getProject()
- {
- return project;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java
deleted file mode 100644
index 03b459d..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Like the <code>assembly:attached</code> goal, assemble an application bundle or distribution using an assembly
- * descriptor from the command line. This goal will force Maven to build all included POMs up to the
- * <code>package</code> phase BEFORE the assembly is processed. This goal differs from <code>assembly:assembly</code> in
- * that it ignores the <formats/> section of the assembly descriptor, and forces the assembly to be created as a
- * directory in the project's build-output directory (usually <code>./target</code>). <br/>
- * <p/>
- * This goal is also functionally equivalent to using the <code>assembly:assembly</code> goal in conjunction with the
- * <code>dir</code> assembly format. <br/>
- * <p/>
- * <b>NOTE:</b> This goal should ONLY be run from the command line, and if building a multimodule project it should be
- * used from the root POM. Use the <code>assembly:directory-single</code> goal for binding your assembly to the
- * lifecycle.
- *
- * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
- * @version $Id$
- * @deprecated Use assembly:single and an assembly with format == dir instead! This mojo is redundant.
- */
-@Mojo( name = "directory", aggregator = true, inheritByDefault = false )
-@Execute( phase = LifecyclePhase.PACKAGE )
-@Deprecated
-public class DirectoryMojo
- extends AbstractDirectoryMojo
-{
- /**
- * Get the executed project from the forked lifecycle.
- */
- @Parameter( property = "executedProject" )
- private MavenProject executedProject;
-
- @Override
- public MavenProject getProject()
- {
- return executedProject;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java
deleted file mode 100644
index 479645b..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Like the <code>assembly:attached</code> goal, assemble an application bundle or distribution from an assembly
- * descriptor. This goal is suitable either for binding to the lifecycle or calling directly from the command line
- * (provided all required files are available before the build starts, or are produced by another goal specified before
- * this one on the command line). <br/>
- * <p/>
- * This goal differs from <code>assembly:single</code> in that it ignores the <formats/> section of the assembly
- * descriptor, and forces the assembly to be created as a directory in the project's build-output directory (usually
- * <code>./target</code>).
- *
- * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
- * @author <a href="mailto:gscokart@users.sourceforge.net">Gilles Scokart</a>
- * @version $Id$
- * @deprecated Use assembly:single and an assembly with format == dir instead! This mojo is redundant.
- */
-@Mojo( name = "directory-single", inheritByDefault = false )
-@Deprecated
-public class DirectorySingleMojo
- extends AbstractDirectoryMojo
-{
- /**
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- private MavenProject project;
-
- @Override
- public MavenProject getProject()
- {
- return project;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java
deleted file mode 100644
index ca3d91c..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Assemble an application bundle or distribution from an assembly descriptor. This goal is suitable either for binding
- * to the lifecycle or calling directly from the command line (provided all required files are available before the
- * build starts, or are produced by another goal specified before this one on the command line).
- *
- * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
- */
-@Mojo( name = "single", inheritByDefault = false, requiresDependencyResolution = ResolutionScope.COMPILE,
- threadSafe = true )
-public class SingleAssemblyMojo
- extends AbstractAssemblyMojo
-{
- /**
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- private MavenProject project;
-
- @Override
- public MavenProject getProject()
- {
- return project;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
deleted file mode 100644
index a5b8d4a..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.apache.maven.plugin.assembly.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException;
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-
-import java.io.File;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * Unpack project dependencies. Currently supports dependencies of type jar and zip.
- *
- * @version $Id$
- * @deprecated Use org.apache.maven.plugins:maven-dependency-plugin goal: unpack or unpack-dependencies instead.
- */
-@Mojo( name = "unpack", requiresDependencyResolution = ResolutionScope.TEST, inheritByDefault = false )
-@Deprecated
-public class UnpackMojo
- extends AbstractMojo
-{
-
- /**
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- private MavenProject project;
-
- /**
- */
- @Component
- private ArchiverManager archiverManager;
-
- /**
- * Directory to unpack JARs into if needed
- */
- @Parameter( defaultValue = "${project.build.directory}/assembly/work", required = true )
- protected File workDirectory;
-
- /**
- * Unpacks the archive file.
- *
- * @throws MojoExecutionException
- */
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- final Set<Artifact> dependencies = new LinkedHashSet<Artifact>();
-
- if ( project.getArtifact() != null && project.getArtifact().getFile() != null )
- {
- dependencies.add( project.getArtifact() );
- }
-
- @SuppressWarnings( "unchecked" ) final Set<Artifact> projectArtifacts = project.getArtifacts();
- if ( projectArtifacts != null )
- {
- dependencies.addAll( projectArtifacts );
- }
-
- for ( final Artifact artifact : dependencies )
- {
- final String name = artifact.getFile().getName();
-
- final File tempLocation = new File( workDirectory, name.substring( 0, name.lastIndexOf( '.' ) ) );
- boolean process = false;
- if ( !tempLocation.exists() )
- {
- tempLocation.mkdirs();
- process = true;
- }
- else if ( artifact.getFile().lastModified() > tempLocation.lastModified() )
- {
- process = true;
- }
-
- if ( process )
- {
- final File file = artifact.getFile();
- try
- {
- AssemblyFileUtils.unpack( file, tempLocation, archiverManager );
- }
- catch ( final NoSuchArchiverException e )
- {
- getLog().info( "Skip unpacking dependency file with unknown extension: " + file.getPath() );
- }
- catch ( final ArchiveExpansionException e )
- {
- throw new MojoExecutionException( "Error unpacking dependency file: " + file, e );
- }
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java
deleted file mode 100644
index 5c05635..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.maven.plugin.assembly.resolved;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.model.Assembly;
-
-/**
- *
- */
-public class AssemblyId
-{
- private final String id;
-
- private AssemblyId( String id )
- {
- this.id = id;
- }
-
- public static AssemblyId createAssemblyId( String id )
- {
- return new AssemblyId( id );
- }
-
- public static AssemblyId createAssemblyId( Assembly id )
- {
- return new AssemblyId( id.getId() );
- }
-
- @Override
- public String toString()
- {
- return id;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
deleted file mode 100644
index a64cc9a..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.util.Locale;
-
-/**
- * @version $Id$
- */
-public final class AssemblyFileUtils
-{
-
- private AssemblyFileUtils()
- {
- // no op
- }
-
- public static String makePathRelativeTo( String path, final File basedir )
- {
- if ( basedir == null )
- {
- return path;
- }
-
- if ( path == null )
- {
- return null;
- }
-
- path = path.trim();
-
- String base = basedir.getAbsolutePath();
- if ( path.startsWith( base ) )
- {
- path = path.substring( base.length() );
- if ( path.length() > 0 )
- {
- if ( path.startsWith( "/" ) || path.startsWith( "\\" ) )
- {
- path = path.substring( 1 );
- }
- }
-
- if ( path.length() == 0 )
- {
- path = ".";
- }
- }
-
- if ( !new File( path ).isAbsolute() )
- {
- path = path.replace( '\\', '/' );
- }
-
- return path;
- }
-
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
- public static void verifyTempDirectoryAvailability( @Nonnull final File tempDir )
- {
- if ( !tempDir.exists() )
- {
- tempDir.mkdirs();
- }
- }
-
- /**
- * Unpacks the archive file.
- *
- * @param source File to be unpacked.
- * @param destDir Location where to put the unpacked files.
- */
- public static void unpack( File source, File destDir, ArchiverManager archiverManager )
- throws ArchiveExpansionException, NoSuchArchiverException
- {
- try
- {
- UnArchiver unArchiver = archiverManager.getUnArchiver( source );
-
- unArchiver.setSourceFile( source );
-
- unArchiver.setDestDirectory( destDir );
-
- unArchiver.extract();
- }
- catch ( ArchiverException e )
- {
- throw new ArchiveExpansionException( "Error unpacking file: " + source + "to: " + destDir, e );
- }
- }
-
- @Nonnull
- private static String normalizePath( @Nonnull String path )
- {
- return path.replace( '\\', '/' );
- }
-
- @Nonnull
- public static String normalizeFileInfo( @Nonnull FileInfo fileInfo )
- {
- String name = fileInfo.getName();
- name = normalizePath( name );
- return name.replace( File.separatorChar, '/' ); // How can this be anything but a no-op
- }
-
- public static boolean isPropertyFile( String sourceName )
- {
- return sourceName.toLowerCase( Locale.ENGLISH ).endsWith( ".properties" );
- }
-
- public static boolean isPropertyFile( File file )
- {
- return isPropertyFile( file.getName() );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
deleted file mode 100644
index aa1a499..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
+++ /dev/null
@@ -1,528 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.Os;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
-import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
-import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Properties;
-
-/**
- * @version $Id$
- */
-public final class AssemblyFormatUtils
-{
-
- private AssemblyFormatUtils()
- {
- }
-
- /**
- * Get the full name of the distribution artifact
- *
- * @param assembly the assembly
- * @return the distribution name
- */
- public static String getDistributionName( final Assembly assembly, final AssemblerConfigurationSource configSource )
- {
- final String finalName = configSource.getFinalName();
- final boolean appendAssemblyId = configSource.isAssemblyIdAppended();
- final String classifier = configSource.getClassifier();
-
- String distributionName = finalName;
- if ( appendAssemblyId )
- {
- if ( !StringUtils.isEmpty( assembly.getId() ) )
- {
- distributionName = finalName + "-" + assembly.getId();
- }
- }
- else if ( classifier != null )
- {
- distributionName = finalName + "-" + classifier;
- }
-
- return distributionName;
- }
-
-
- @Nonnull
- public static FixedStringSearchInterpolator finalNameInterpolator( String finalName )
- {
- final Properties specialExpressionOverrides = new Properties();
-
- if ( finalName != null )
- {
- specialExpressionOverrides.setProperty( "finalName", finalName );
- specialExpressionOverrides.setProperty( "build.finalName", finalName );
- }
- else
- {
- return FixedStringSearchInterpolator.empty();
- }
-
- return FixedStringSearchInterpolator.create( new PropertiesBasedValueSource( specialExpressionOverrides ) );
- }
-
- @Nonnull
- public static FixedStringSearchInterpolator moduleProjectInterpolator( final MavenProject moduleProject )
- {
- if ( moduleProject != null )
- {
- return FixedStringSearchInterpolator.createWithPermittedNulls(
- new PrefixedObjectValueSource( "module.", moduleProject ),
- new PrefixedPropertiesValueSource( "module.properties.", moduleProject.getProperties() ),
- moduleProject.getArtifact() != null
- ? new PrefixedObjectValueSource( "module.", moduleProject.getArtifact() )
- : null );
- }
- else
- {
- return FixedStringSearchInterpolator.empty();
- }
-
- }
-
- public static FixedStringSearchInterpolator moduleArtifactInterpolator( Artifact moduleArtifact )
- {
- if ( moduleArtifact != null )
- {
- // CHECKSTYLE_OFF: LineLength
- return FixedStringSearchInterpolator.create( new PrefixedObjectValueSource( "module.", moduleArtifact ),
- new PrefixedObjectValueSource( "module.",
- moduleArtifact.getArtifactHandler() ),
- new PrefixedObjectValueSource( "module.handler.",
- moduleArtifact.getArtifactHandler() ) );
- // CHECKSTYLE_ON: LineLength
- }
- else
- {
- return FixedStringSearchInterpolator.empty();
- }
-
- }
-
- @Nonnull
- public static FixedStringSearchInterpolator artifactProjectInterpolator( final MavenProject artifactProject )
- {
- if ( artifactProject != null )
- {
- PrefixedObjectValueSource vs = null;
- if ( artifactProject.getArtifact() != null )
- {
- vs = new PrefixedObjectValueSource( "artifact.", artifactProject.getArtifact() );
- }
-
- return FixedStringSearchInterpolator.createWithPermittedNulls(
- new PrefixedObjectValueSource( "artifact.", artifactProject ),
- new PrefixedPropertiesValueSource( "artifact.properties.", artifactProject.getProperties() ), vs );
-
-
- }
- else
- {
- return FixedStringSearchInterpolator.empty();
- }
-
-
- }
-
- @Nonnull
- public static FixedStringSearchInterpolator artifactInterpolator( @Nonnull final Artifact artifact )
- {
- return FixedStringSearchInterpolator.create( new PrefixedObjectValueSource( "artifact.", artifact ),
- new PrefixedObjectValueSource( "artifact.",
- artifact.getArtifactHandler() ),
- new PrefixedObjectValueSource( "artifact.handler.",
- artifact.getArtifactHandler() ) );
- }
-
-
- @Nonnull
- public static FixedStringSearchInterpolator classifierRules( final Artifact artifact )
- {
- final Properties specialRules = new Properties();
-
- final String classifier = ProjectUtils.getClassifier( artifact );
- if ( classifier != null )
- {
- specialRules.setProperty( "dashClassifier?", "-" + classifier );
- specialRules.setProperty( "dashClassifier", "-" + classifier );
- }
- else
- {
- specialRules.setProperty( "dashClassifier?", "" );
- specialRules.setProperty( "dashClassifier", "" );
- }
-
- return FixedStringSearchInterpolator.create( new PropertiesBasedValueSource( specialRules ) );
- }
-
-
- /**
- * ORDER OF INTERPOLATION PRECEDENCE:
- * <ol>
- * <li>Support for special expressions, like ${finalName} (use the assembly plugin configuration not the build
- * config)</li>
- * <li>prefixed with "module." if moduleProject is non-null
- * <ol>
- * <li>MavenProject instance for module being assembled</li>
- * </ol>
- * </li>
- * <li>prefixed with "artifact." if artifactProject is non-null
- * <ol>
- * <li>MavenProject instance for artifact</li>
- * </ol>
- * </li>
- * <li>user-defined properties from the command line</li>
- * <li>prefixed with "pom." or "project.", or no prefix at all
- * <ol>
- * <li>MavenProject instance from current build</li>
- * </ol>
- * </li>
- * <li>properties from main project</li>
- * <li>system properties, from the MavenSession instance (to support IDEs)</li>
- * <li>environment variables.</li>
- * </ol>
- */
- public static String getOutputDirectory( final String output, final MavenProject artifactProject,
- final String finalName, final AssemblerConfigurationSource configSource )
- throws AssemblyFormattingException
- {
- return getOutputDirectory( output, finalName, configSource, moduleProjectInterpolator( null ),
- artifactProjectInterpolator( artifactProject ) );
- }
-
-
- private static FixedStringSearchInterpolator executionPropertiesInterpolator(
- AssemblerConfigurationSource configSource )
- {
- MavenSession session;
-
- if ( configSource != null )
- {
- session = configSource.getMavenSession();
-
- if ( session != null )
- {
- Properties userProperties = session.getExecutionProperties(); // this is added twice....
-
- if ( userProperties != null )
- {
- return FixedStringSearchInterpolator.create( new PropertiesBasedValueSource( userProperties ) );
- }
- }
- }
- return FixedStringSearchInterpolator.empty();
- }
-
- private static FixedStringSearchInterpolator mainProjectOnlyInterpolator( MavenProject mainProject )
- {
- if ( mainProject != null )
- {
- // 5
- return FixedStringSearchInterpolator.create(
- new org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource(
- InterpolationConstants.PROJECT_PREFIXES, mainProject, true ) );
- }
- else
- {
- return FixedStringSearchInterpolator.empty();
- }
- }
-
-
- /**
- * ORDER OF INTERPOLATION PRECEDENCE:
- * <ol>
- * <li>prefixed with "module.", if moduleProject != null
- * <ol>
- * <li>Artifact instance for module, if moduleArtifact != null</li>
- * <li>ArtifactHandler instance for module, if moduleArtifact != null</li>
- * <li>MavenProject instance for module</li>
- * </ol>
- * </li>
- * <li>prefixed with "artifact."
- * <ol>
- * <li>Artifact instance</li>
- * <li>ArtifactHandler instance for artifact</li>
- * <li>MavenProject instance for artifact</li>
- * </ol>
- * </li>
- * <li>prefixed with "pom." or "project."
- * <ol>
- * <li>MavenProject instance from current build</li>
- * </ol>
- * </li>
- * <li>no prefix, using main project instance
- * <ol>
- * <li>MavenProject instance from current build</li>
- * </ol>
- * </li>
- * <li>Support for special expressions, like ${dashClassifier?}</li>
- * <li>user-defined properties from the command line</li>
- * <li>properties from main project</li>
- * <li>system properties, from the MavenSession instance (to support IDEs)</li>
- * <li>environment variables.</li>
- * </ol>
- */
-
-
- @Nonnull
- public static String fixRelativeRefs( @Nonnull String src )
- {
- String value = src;
-
- String[] separators = { "/", "\\" };
-
- String finalSep = null;
- for ( String sep : separators )
- {
- if ( value.endsWith( sep ) )
- {
- finalSep = sep;
- }
-
- if ( value.contains( "." + sep ) )
- {
- List<String> parts = new ArrayList<String>();
- parts.addAll( Arrays.asList( value.split( sep.replace( "\\", "\\\\" ) ) ) );
-
- for ( ListIterator<String> it = parts.listIterator(); it.hasNext(); )
- {
- String part = it.next();
- if ( ".".equals( part ) )
- {
- it.remove();
- }
- else if ( "..".equals( part ) )
- {
- it.remove();
- if ( it.hasPrevious() )
- {
- it.previous();
- it.remove();
- }
- }
- }
-
- value = StringUtils.join( parts.iterator(), sep );
- }
- }
-
- if ( finalSep != null && value.length() > 0 && !value.endsWith( finalSep ) )
- {
- value += finalSep;
- }
-
- return value;
- }
-
-
- /**
- * ORDER OF INTERPOLATION PRECEDENCE:
- * <ol>
- * <li>prefixed with "module.", if moduleProject != null
- * <ol>
- * <li>Artifact instance for module, if moduleArtifact != null</li>
- * <li>ArtifactHandler instance for module, if moduleArtifact != null</li>
- * <li>MavenProject instance for module</li>
- * </ol>
- * </li>
- * <li>prefixed with "artifact."
- * <ol>
- * <li>Artifact instance</li>
- * <li>ArtifactHandler instance for artifact</li>
- * <li>MavenProject instance for artifact</li>
- * </ol>
- * </li>
- * <li>prefixed with "pom." or "project."
- * <ol>
- * <li>MavenProject instance from current build</li>
- * </ol>
- * </li>
- * <li>no prefix, using main project instance
- * <ol>
- * <li>MavenProject instance from current build</li>
- * </ol>
- * </li>
- * <li>Support for special expressions, like ${dashClassifier?}</li>
- * <li>user-defined properties from the command line</li>
- * <li>properties from main project</li>
- * <li>system properties, from the MavenSession instance (to support IDEs)</li>
- * <li>environment variables.</li>
- * </ol>
- */
- public static String evaluateFileNameMapping( final String expression, @Nonnull final Artifact artifact,
- @Nullable final MavenProject mainProject,
- @Nullable final Artifact moduleArtifact,
- @Nonnull final AssemblerConfigurationSource configSource,
- FixedStringSearchInterpolator moduleProjectInterpolator,
- FixedStringSearchInterpolator artifactProjectInterpolator )
- throws AssemblyFormattingException
- {
- String value = expression;
-
- final FixedStringSearchInterpolator interpolator =
- FixedStringSearchInterpolator.create( moduleArtifactInterpolator( moduleArtifact ),
- moduleProjectInterpolator, artifactInterpolator( artifact ),
- artifactProjectInterpolator,
- mainProjectOnlyInterpolator( mainProject ),
- classifierRules( artifact ),
- executionPropertiesInterpolator( configSource ),
- configSource.getMainProjectInterpolator(),
- configSource.getCommandLinePropsInterpolator(),
- configSource.getEnvInterpolator() );
-
- value = interpolator.interpolate( value );
-
- value = StringUtils.replace( value, "//", "/" );
- value = StringUtils.replace( value, "\\\\", "\\" );
- value = fixRelativeRefs( value );
-
- return value;
- }
-
- /**
- * ORDER OF INTERPOLATION PRECEDENCE:
- * <ol>
- * <li>Support for special expressions, like ${finalName} (use the assembly plugin configuration not the build
- * config)</li>
- * <li>prefixed with "module." if moduleProject is non-null
- * <ol>
- * <li>MavenProject instance for module being assembled</li>
- * </ol>
- * </li>
- * <li>prefixed with "artifact." if artifactProject is non-null
- * <ol>
- * <li>MavenProject instance for artifact</li>
- * </ol>
- * </li>
- * <li>user-defined properties from the command line</li>
- * <li>prefixed with "pom." or "project.", or no prefix at all
- * <ol>
- * <li>MavenProject instance from current build</li>
- * </ol>
- * </li>
- * <li>properties from main project</li>
- * <li>system properties, from the MavenSession instance (to support IDEs)</li>
- * <li>environment variables.</li>
- * </ol>
- */
- public static String getOutputDirectory( final String output, final String finalName,
- final AssemblerConfigurationSource configSource,
- FixedStringSearchInterpolator moduleProjectIntrpolator,
- FixedStringSearchInterpolator artifactProjectInterpolator )
- throws AssemblyFormattingException
- {
- String value = output;
- if ( value == null )
- {
- value = "";
- }
-
- final FixedStringSearchInterpolator interpolator =
- FixedStringSearchInterpolator.create( finalNameInterpolator( finalName ), moduleProjectIntrpolator,
- artifactProjectInterpolator,
- executionPropertiesInterpolator( configSource ),
- configSource.getMainProjectInterpolator(),
- configSource.getCommandLinePropsInterpolator(),
- configSource.getEnvInterpolator() );
-
- value = interpolator.interpolate( value );
-
- if ( ( value.length() > 0 ) && !value.endsWith( "/" ) && !value.endsWith( "\\" ) )
- {
- value += "/";
- }
-
- if ( ( value.length() > 0 ) && ( value.startsWith( "/" ) || value.startsWith( "\\" ) ) )
- {
- value = value.substring( 1 );
- }
-
- value = StringUtils.replace( value, "//", "/" );
- value = StringUtils.replace( value, "\\\\", "\\" );
- value = fixRelativeRefs( value );
-
- return value;
- }
-
- public static void warnForPlatformSpecifics( Logger logger, String destDirectory )
- {
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- if ( isLinuxRootReference( destDirectory ) )
- {
- logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific root-relative-reference"
- + " (starting with slash) " + destDirectory );
- }
- else if ( isWindowsPath( destDirectory ) )
- {
- logger.warn( "The assembly descriptor contains a *nix-specific root-relative-reference"
- + " (starting with slash). This is non-portable and will fail on windows "
- + destDirectory );
- }
- }
- else
- {
- if ( isWindowsPath( destDirectory ) )
- {
- logger.error(
- "OS=Non-Windows and the assembly descriptor contains a windows-specific directory reference"
- + " (with a drive letter) " + destDirectory );
- }
- else if ( isLinuxRootReference( destDirectory ) )
- {
- logger.warn( "The assembly descriptor contains a filesystem-root relative reference,"
- + " which is not cross platform compatible " + destDirectory );
- }
- }
- }
-
- static boolean isWindowsPath( String destDirectory )
- {
- return ( destDirectory != null && destDirectory.length() >= 2 && destDirectory.charAt( 1 ) == ':' );
- }
-
- static boolean isLinuxRootReference( String destDirectory )
- {
- return ( destDirectory != null && destDirectory.startsWith( "/" ) );
- }
-
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
deleted file mode 100644
index bf79b54..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
-import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
-import org.apache.maven.shared.artifact.filter.StatisticsReportingArtifactFilter;
-import org.codehaus.plexus.logging.Logger;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @version $Id$
- */
-public final class FilterUtils
-{
-
- private FilterUtils()
- {
- }
-
- public static Set<MavenProject> filterProjects( final Set<MavenProject> projects, final List<String> includes,
- final List<String> excludes, final boolean actTransitively,
- final Logger logger )
- {
- final List<PatternIncludesArtifactFilter> allFilters = new ArrayList<PatternIncludesArtifactFilter>();
-
- final AndArtifactFilter filter = new AndArtifactFilter();
-
- if ( !includes.isEmpty() )
- {
- final PatternIncludesArtifactFilter includeFilter =
- new PatternIncludesArtifactFilter( includes, actTransitively );
-
- filter.add( includeFilter );
- allFilters.add( includeFilter );
- }
- if ( !excludes.isEmpty() )
- {
- final PatternExcludesArtifactFilter excludeFilter =
- new PatternExcludesArtifactFilter( excludes, actTransitively );
-
- filter.add( excludeFilter );
- allFilters.add( excludeFilter );
- }
-
- Set<MavenProject> result = new LinkedHashSet<MavenProject>( projects.size() );
- for ( MavenProject project : projects )
- {
- final Artifact artifact = project.getArtifact();
-
- if ( filter.include( artifact ) )
- {
- result.add( project );
- }
- }
-
- for ( final PatternIncludesArtifactFilter f : allFilters )
- {
- if ( f != null )
- {
- f.reportMissedCriteria( logger );
- }
- }
- return result;
- }
-
- public static void filterArtifacts( final Set<Artifact> artifacts, final List<String> includes,
- final List<String> excludes, final boolean strictFiltering,
- final boolean actTransitively, final Logger logger,
- final ArtifactFilter... additionalFilters )
- throws InvalidAssemblerConfigurationException
- {
- final List<ArtifactFilter> allFilters = new ArrayList<ArtifactFilter>();
-
- final AndArtifactFilter filter = new AndArtifactFilter();
-
- if ( additionalFilters != null && additionalFilters.length > 0 )
- {
- for ( final ArtifactFilter additionalFilter : additionalFilters )
- {
- if ( additionalFilter != null )
- {
- filter.add( additionalFilter );
- }
- }
- }
-
- if ( !includes.isEmpty() )
- {
- final ArtifactFilter includeFilter = new PatternIncludesArtifactFilter( includes, actTransitively );
-
- filter.add( includeFilter );
-
- allFilters.add( includeFilter );
- }
-
- if ( !excludes.isEmpty() )
- {
- final ArtifactFilter excludeFilter = new PatternExcludesArtifactFilter( excludes, actTransitively );
-
- filter.add( excludeFilter );
-
- allFilters.add( excludeFilter );
- }
-
- // FIXME: Why is this added twice??
- // if ( additionalFilters != null && !additionalFilters.isEmpty() )
- // {
- // allFilters.addAll( additionalFilters );
- // }
-
- for ( final Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); )
- {
- final Artifact artifact = it.next();
-
- if ( !filter.include( artifact ) )
- {
- it.remove();
-
- if ( logger.isDebugEnabled() )
- {
- logger.debug( artifact.getId() + " was removed by one or more filters." );
- }
- }
- }
-
- reportFilteringStatistics( allFilters, logger );
-
- for ( final ArtifactFilter f : allFilters )
- {
- if ( f instanceof StatisticsReportingArtifactFilter )
- {
- final StatisticsReportingArtifactFilter sFilter = (StatisticsReportingArtifactFilter) f;
-
- if ( strictFiltering && sFilter.hasMissedCriteria() )
- {
- throw new InvalidAssemblerConfigurationException(
- "One or more filters had unmatched criteria. Check debug log for more information." );
- }
- }
- }
- }
-
- public static void reportFilteringStatistics( final Collection<ArtifactFilter> filters, final Logger logger )
- {
- for ( final ArtifactFilter f : filters )
- {
- if ( f instanceof StatisticsReportingArtifactFilter )
- {
- final StatisticsReportingArtifactFilter sFilter = (StatisticsReportingArtifactFilter) f;
-
- if ( logger.isDebugEnabled() )
- {
- logger.debug( "Statistics for " + sFilter + "\n" );
- }
-
- sFilter.reportMissedCriteria( logger );
- sFilter.reportFilteredArtifacts( logger );
- }
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java
deleted file mode 100644
index 87747dd..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- */
-public final class InterpolationConstants
-{
-
- public static final List<String> PROJECT_PREFIXES;
-
- public static final List<String> PROJECT_PROPERTIES_PREFIXES;
-
- public static final String SETTINGS_PREFIX = "settings.";
-
- static
- {
- final List<String> projectPrefixes = new ArrayList<String>();
- projectPrefixes.add( "pom." );
- projectPrefixes.add( "project." );
-
- PROJECT_PREFIXES = Collections.unmodifiableList( projectPrefixes );
-
- final List<String> projectPropertiesPrefixes = new ArrayList<String>();
-
- projectPropertiesPrefixes.add( "pom.properties." );
- projectPropertiesPrefixes.add( "project.properties." );
-
- PROJECT_PROPERTIES_PREFIXES = Collections.unmodifiableList( projectPropertiesPrefixes );
- }
-
- private InterpolationConstants()
- {
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java
deleted file mode 100644
index d85afd8..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Enumeration to keep the different line ending types we support.
- *
- * @author Karl-Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>
- */
-public enum LineEndings
-{
- keep( null ),
- dos( "\r\n" ),
- windows( "\r\n" ),
- unix( "\n" ),
- crlf( "\r\n" ),
- lf( "\n" );
-
- private final String lineEndingCharacters;
-
- private LineEndings( String lineEndingCharacters )
- {
- this.lineEndingCharacters = lineEndingCharacters;
- }
-
- public boolean isNewLine()
- {
- return this == unix || this == lf;
- }
-
- public boolean isCrLF()
- {
- return this == windows || this == crlf || this == dos;
- }
-
- public String getLineEndingCharacters()
- {
- return this.lineEndingCharacters;
- }
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java
deleted file mode 100644
index ef0f7ff..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.util.IOUtil;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.RandomAccessFile;
-
-/**
- * Line Ending class which contains convenience methods to change line endings.
- */
-public final class LineEndingsUtils
-{
-
- private LineEndingsUtils()
- {
- // prevent creations of instances.
- }
-
- /**
- * Converts the line endings of a file, writing a new file. The encoding of reading and writing can be specified.
- *
- * @param source The source file, not null
- * @param dest The destination file, not null
- * @param lineEndings This is the result of the getLineEndingChars(..) method in this utility class; the actual
- * line-ending characters, not null.
- * @param atEndOfFile The end-of-file line ending, if true then the resulting file will have a new line at the end
- * even if the input didn't have one, if false then the resulting file will have no new line at
- * the end even if the input did have one, null to determine whether to have a new line at the
- * end of the file based on the input file
- * @param encoding The encoding to use, null for platform encoding
- * @throws IOException .
- */
- public static void convertLineEndings( @Nonnull File source, @Nonnull File dest, LineEndings lineEndings,
- Boolean atEndOfFile, String encoding )
- throws IOException
- {
- // MASSEMBLY-637, MASSEMBLY-96
- // find characters at the end of the file
- // needed to preserve the last line ending
- // only check for LF (as CRLF also ends in LF)
- String eofChars = "";
- if ( atEndOfFile == null )
- {
- RandomAccessFile raf = null;
- try
- {
- if ( source.length() >= 1 )
- {
- raf = new RandomAccessFile( source, "r" );
- raf.seek( source.length() - 1 );
- byte last = raf.readByte();
- if ( last == '\n' )
- {
- eofChars = lineEndings.getLineEndingCharacters();
- }
- }
- }
- finally
- {
- if ( raf != null )
- {
- try
- {
- raf.close();
- }
- catch ( IOException ex )
- {
- // ignore
- }
- }
- }
- }
- else if ( atEndOfFile )
- {
- eofChars = lineEndings.getLineEndingCharacters();
- }
-
- BufferedReader in = null;
- BufferedWriter out = null;
- try
- {
- if ( encoding == null )
- {
- // platform encoding
- in = new BufferedReader( new InputStreamReader( new FileInputStream( source ) ) );
- out = new BufferedWriter( new OutputStreamWriter( new FileOutputStream( dest ) ) );
- }
- else
- {
- // MASSEMBLY-371
- in = new BufferedReader( new InputStreamReader( new FileInputStream( source ), encoding ) );
- out = new BufferedWriter( new OutputStreamWriter( new FileOutputStream( dest ), encoding ) );
- }
-
- String line;
-
- line = in.readLine();
- while ( line != null )
- {
- out.write( line );
- line = in.readLine();
- if ( line != null )
- {
- out.write( lineEndings.getLineEndingCharacters() );
- }
- else
- {
- out.write( eofChars );
- }
- }
-
- out.flush();
- }
- finally
- {
- IOUtil.close( in );
- IOUtil.close( out );
- }
- }
-
- /**
- * Converts the line endings of a file, writing a new file. The encoding of reading and writing can be specified.
- *
- * @param in The source reader
- * @param lineEndings This is the result of the getLineEndingChars(..) method in this utility class; the actual
- * line-ending characters, not null.
- * @return an input stream that enforces a specifi line ending style
- */
- public static InputStream lineEndingConverter( @Nonnull InputStream in, LineEndings lineEndings )
- throws IOException
- {
- return lineEndings.isNewLine()
- ? new LinuxLineFeedInputStream( in, false )
- : lineEndings.isCrLF() ? new WindowsLineFeedInputStream( in, false ) : in;
- }
-
- @Nonnull
- public static LineEndings getLineEnding( @Nullable String lineEnding )
- throws AssemblyFormattingException
- {
- LineEndings result = LineEndings.keep;
- if ( lineEnding != null )
- {
- try
- {
- result = LineEndings.valueOf( lineEnding );
- }
- catch ( IllegalArgumentException e )
- {
- throw new AssemblyFormattingException( "Illegal lineEnding specified: '" + lineEnding + "'", e );
- }
- }
- return result;
- }
-
- /**
- * Returns the appopriate line ending characters for the specified style
- *
- * @param lineEnding The name of the line ending style,
- * see org.apache.maven.plugin.assembly.utils.LineEndings#valueOf
- * @return The proper line ending characters
- * @throws AssemblyFormattingException
- */
- @Nullable
- public static String getLineEndingCharacters( @Nullable String lineEnding )
- throws AssemblyFormattingException
- {
-
- String value = lineEnding;
-
- if ( lineEnding != null )
- {
-
- try
- {
- value = LineEndings.valueOf( lineEnding ).getLineEndingCharacters();
- }
- catch ( IllegalArgumentException e )
- {
- throw new AssemblyFormattingException( "Illegal lineEnding specified: '" + lineEnding + "'", e );
- }
- }
-
- return value;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
deleted file mode 100644
index 5266224..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Kristian Rosenvold
- */
-class LinuxLineFeedInputStream
- extends InputStream
-{
-
- private boolean slashNSeen = false;
-
- private boolean slashRSeen = false;
-
- private boolean eofSeen = false;
-
- private final InputStream target;
-
- private final boolean ensureLineFeedAtEndOfFile;
-
- public LinuxLineFeedInputStream( InputStream in, boolean ensureLineFeedAtEndOfFile )
- {
- this.target = in;
- this.ensureLineFeedAtEndOfFile = ensureLineFeedAtEndOfFile;
- }
-
- private int readWithUpdate()
- throws IOException
- {
- final int target = this.target.read();
- eofSeen = target == -1;
- if ( eofSeen )
- {
- return target;
- }
- slashNSeen = target == '\n';
- slashRSeen = target == '\r';
- return target;
- }
-
- @Override
- public int read()
- throws IOException
- {
- boolean prevWasSlashR = slashRSeen;
- if ( eofSeen )
- {
- return eofGame( prevWasSlashR );
- }
- else
- {
- int target = readWithUpdate();
- if ( eofSeen )
- {
- return eofGame( prevWasSlashR );
- }
- if ( slashRSeen )
- {
- return '\n';
- }
-
- if ( prevWasSlashR && slashNSeen )
- { // Lone /r
- return read();
- }
- return target;
- }
- }
-
- private int eofGame( boolean previousWasSlashR )
- {
- if ( previousWasSlashR || !ensureLineFeedAtEndOfFile )
- {
- return -1;
- }
- if ( !slashNSeen )
- {
- slashNSeen = true;
- return '\n';
- }
- else
- {
- return -1;
- }
- }
-
- @Override
- public void close()
- throws IOException
- {
- super.close();
- target.close();
- }
-
- @Override
- public synchronized void mark( int readlimit )
- {
- throw new UnsupportedOperationException( "Mark not implemented yet" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
deleted file mode 100644
index 4408129..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @version $Id$
- */
-public final class ProjectUtils
-{
-
- private ProjectUtils()
- {
- }
-
- @Nullable
- public static String getClassifier( @Nonnull Artifact artifact )
- {
- String classifier = artifact.getClassifier();
- if ( classifier != null && classifier.length() == 0 )
- {
- classifier = null;
- }
- return classifier;
- }
-
- @Nonnull
- public static Set<MavenProject> getProjectModules( @Nonnull final MavenProject project,
- @Nonnull final List<MavenProject> reactorProjects,
- final boolean includeSubModules, @Nonnull final Logger logger )
- throws IOException
- {
- final Set<MavenProject> singleParentSet = Collections.singleton( project );
-
- final Set<MavenProject> moduleCandidates = new LinkedHashSet<MavenProject>( reactorProjects );
-
- final Set<MavenProject> modules = new LinkedHashSet<MavenProject>();
-
- // we temporarily add the master project to the modules set, since this
- // set is pulling double duty as a set of
- // potential module parents in the tree rooted at the master
- // project...this allows us to use the same looping
- // algorithm below to discover both direct modules of the master project
- // AND modules of those direct modules.
- modules.add( project );
-
- int changed;
-
- do
- {
- changed = 0;
-
- for ( final Iterator<MavenProject> candidateIterator = moduleCandidates.iterator();
- candidateIterator.hasNext(); )
- {
- final MavenProject moduleCandidate = candidateIterator.next();
-
- if ( moduleCandidate.getFile() == null )
- {
- logger.warn(
- "Cannot compute whether " + moduleCandidate.getId() + " is a module of: " + project.getId()
- + "; it does not have an associated POM file on the local filesystem." );
- continue;
- }
-
- Set<MavenProject> currentPotentialParents;
- if ( includeSubModules )
- {
- currentPotentialParents = new LinkedHashSet<MavenProject>( modules );
- }
- else
- {
- currentPotentialParents = singleParentSet;
- }
-
- for ( final MavenProject potentialParent : currentPotentialParents )
- {
- if ( potentialParent.getFile() == null )
- {
- logger.warn( "Cannot use: " + moduleCandidate.getId()
- + " as a potential module-parent while computing the module set for: "
- + project.getId()
- + "; it does not have an associated POM file on the local filesystem." );
- continue;
- }
-
- // if this parent has an entry for the module candidate in
- // the path adjustments map, it's a direct
- // module of that parent.
- if ( projectContainsModule( potentialParent, moduleCandidate ) )
- {
- // add the candidate to the list of modules (and
- // potential parents)
- modules.add( moduleCandidate );
-
- // remove the candidate from the candidate pool, because
- // it's been verified.
- candidateIterator.remove();
-
- // increment the change counter, to show that we
- // verified a new module on this pass.
- changed++;
- }
- }
- }
- }
- while ( changed != 0 );
-
- // remove the master project from the modules set, now that we're done
- // using it as a set of potential module
- // parents...
- modules.remove( project );
-
- return modules;
- }
-
- private static boolean projectContainsModule( @Nonnull final MavenProject mainProject,
- @Nonnull final MavenProject moduleProject )
- throws IOException
- {
- @SuppressWarnings( "unchecked" ) final List<String> modules = mainProject.getModules();
- final File basedir = mainProject.getBasedir();
-
- final File moduleFile = moduleProject.getFile().getCanonicalFile();
-
- File moduleBasedir = moduleProject.getBasedir();
-
- if ( moduleBasedir == null )
- {
- moduleBasedir = moduleFile.getParentFile();
-
- if ( moduleBasedir == null )
- {
- moduleBasedir = new File( "." );
- }
- }
-
- moduleBasedir = moduleBasedir.getCanonicalFile();
-
- for ( final String moduleSubpath : modules )
- {
- final File moduleDir = new File( basedir, moduleSubpath ).getCanonicalFile();
-
- if ( moduleDir.equals( moduleFile ) || moduleDir.equals( moduleBasedir ) )
- {
- return true;
- }
- }
-
- return false;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
deleted file mode 100644
index 7316b57..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.logging.Logger;
-
-import java.util.List;
-
-/**
- * @version $Id$
- */
-public final class TypeConversionUtils
-{
-
- private static final int U_R = 256;
-
- private static final int U_W = 128;
-
- private static final int U_X = 64;
-
- private static final int G_R = 32;
-
- private static final int G_W = 16;
-
- private static final int G_X = 8;
-
- private static final int W_R = 4;
-
- private static final int W_W = 2;
-
- private static final int W_X = 1;
-
- private TypeConversionUtils()
- {
- }
-
- public static String[] toStringArray( final List<String> list )
- {
- String[] result = null;
-
- if ( ( list != null ) && !list.isEmpty() )
- {
- result = list.toArray( new String[list.size()] );
- }
-
- return result;
- }
-
- public static int modeToInt( final String mode, final Logger logger )
- throws AssemblyFormattingException
- {
- if ( mode == null || mode.trim().length() < 1 )
- {
- return -1;
- }
-
- try
- {
- final int value = Integer.parseInt( mode, 8 );
-
- // discard sanity assessment here; we're pushing ahead.
- verifyModeSanity( value, logger );
-
- return value;
- }
- catch ( final NumberFormatException e )
- {
- throw new AssemblyFormattingException( "Failed to parse mode as an octal number: \'" + mode + "\'.", e );
- }
- }
-
- // the boolean return type is for people who want to make a decision based on the sanity
- // assessment.
- public static boolean verifyModeSanity( final int mode, final Logger logger )
- {
- final StringBuilder messages = new StringBuilder();
-
- messages.append( "The mode: " ).append( Integer.toString( mode, 8 ) ).append(
- " contains nonsensical permissions:" );
-
- boolean warn = false;
-
- // read-access checks.
- if ( ( ( mode & U_R ) == 0 ) && ( ( mode & G_R ) == G_R ) )
- {
- messages.append( "\n- Group has read access, but user does not." );
- warn = true;
- }
-
- if ( ( ( mode & U_R ) == 0 ) && ( ( mode & W_R ) == W_R ) )
- {
- messages.append( "\n- World has read access, but user does not." );
- warn = true;
- }
-
- if ( ( ( mode & G_R ) == 0 ) && ( ( mode & W_R ) == W_R ) )
- {
- messages.append( "\n- World has read access, but group does not." );
- warn = true;
- }
- // end read-access checks.
-
- // write-access checks.
- if ( ( ( mode & U_W ) == 0 ) && ( ( mode & G_W ) == G_W ) )
- {
- messages.append( "\n- Group has write access, but user does not." );
- warn = true;
- }
-
- if ( ( ( mode & U_W ) == 0 ) && ( ( mode & W_W ) == W_W ) )
- {
- messages.append( "\n- World has write access, but user does not." );
- warn = true;
- }
-
- if ( ( ( mode & G_W ) == 0 ) && ( ( mode & W_W ) == W_W ) )
- {
- messages.append( "\n- World has write access, but group does not." );
- warn = true;
- }
- // end write-access checks.
-
- // execute-/list-access checks.
- if ( ( ( mode & U_X ) == 0 ) && ( ( mode & G_X ) == G_X ) )
- {
- messages.append( "\n- Group has execute/list access, but user does not." );
- warn = true;
- }
-
- if ( ( ( mode & U_X ) == 0 ) && ( ( mode & W_X ) == W_X ) )
- {
- messages.append( "\n- World has execute/list access, but user does not." );
- warn = true;
- }
-
- if ( ( ( mode & G_X ) == 0 ) && ( ( mode & W_X ) == W_X ) )
- {
- messages.append( "\n- World has execute/list access, but group does not." );
- warn = true;
- }
- // end execute-/list-access checks.
-
- if ( warn )
- {
- logger.warn( messages.toString() );
- }
-
- return !warn;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java b/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java
deleted file mode 100644
index 538de5d..0000000
--- a/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Kristian Rosenvold
- */
-class WindowsLineFeedInputStream
- extends InputStream
-{
-
- private boolean slashRSeen = false;
-
- private boolean slashNSeen = false;
-
- private boolean injectSlashN = false;
-
- private boolean eofSeen = false;
-
- private final InputStream target;
-
- private final boolean ensureLineFeedAtEndOfFile;
-
- public WindowsLineFeedInputStream( InputStream in, boolean ensureLineFeedAtEndOfFile )
- {
- this.target = in;
- this.ensureLineFeedAtEndOfFile = ensureLineFeedAtEndOfFile;
- }
-
- private int readWithUpdate()
- throws IOException
- {
- final int target = this.target.read();
- eofSeen = target == -1;
- if ( eofSeen )
- {
- return target;
- }
- slashRSeen = target == '\r';
- slashNSeen = target == '\n';
- return target;
- }
-
- @Override
- public int read()
- throws IOException
- {
- if ( eofSeen )
- {
- return eofGame();
- }
- else if ( injectSlashN )
- {
- injectSlashN = false;
- return '\n';
- }
- else
- {
- boolean prevWasSlashR = slashRSeen;
- int target = readWithUpdate();
- if ( eofSeen )
- {
- return eofGame();
- }
- if ( target == '\n' )
- {
- if ( !prevWasSlashR )
- {
- injectSlashN = true;
- return '\r';
- }
- }
- return target;
- }
- }
-
- private int eofGame()
- {
- if ( !ensureLineFeedAtEndOfFile )
- {
- return -1;
- }
- if ( !slashNSeen && !slashRSeen )
- {
- slashRSeen = true;
- return '\r';
- }
- if ( !slashNSeen )
- {
- slashRSeen = false;
- slashNSeen = true;
- return '\n';
- }
- else
- {
- return -1;
- }
- }
-
- @Override
- public void close()
- throws IOException
- {
- super.close();
- target.close();
- }
-
- @Override
- public synchronized void mark( int readlimit )
- {
- throw new UnsupportedOperationException( "Mark not implemented yet" );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/main/mdo/component.mdo b/maven-assembly-plugin-2.x/src/main/mdo/component.mdo
deleted file mode 100644
index 5a1a0f4..0000000
--- a/maven-assembly-plugin-2.x/src/main/mdo/component.mdo
+++ /dev/null
@@ -1,1302 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ Copyright 2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!-- Note Definitions of FileSet, FileItem, and DependencySet are
- already defined in descriptor.mdo, but repeated here since
- Modello currently does not have capability to share files
--->
-
-<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd"
- xml.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/component-${version}.xsd">
-
- <id>component</id>
- <name>Component</name>
- <description>
- <![CDATA[
- <p>
- When creating several assemblies for a project with a custom assembly
- descriptor, it can't be helped that you will be duplicating some parts of
- a defined assembly. These duplicates can be extracted and placed in a
- separate file called a descriptor component.
- </p>
- <p>
- Descriptor components contain FileSets, Files, and DependencySets meant
- to be shared by assembly descriptors by referencing them using
- <componentDescriptors>. It allows multiple assemblies to share a set
- of user defined collections.
- </p>
- ]]>
- </description>
- <defaults>
- <default>
- <key>package</key>
- <value>org.apache.maven.plugin.assembly.model</value>
- </default>
- </defaults>
- <classes>
- <class rootElement="true" xml.tagName="component">
- <name>Component</name>
- <description>Describes the component layout and packaging.</description>
- <version>1.0.0+</version>
- <fields>
- <field>
- <name>moduleSets</name>
- <version>1.1.2+</version>
- <association>
- <type>ModuleSet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which module files to include in the assembly. A moduleSet
- is specified by providing one or more of <moduleSet>
- subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>fileSets</name>
- <version>1.0.0+</version>
- <association>
- <type>FileSet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which groups of files to include in the assembly. A
- fileSet is specified by providing one or more of <fileSet>
- subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>files</name>
- <version>1.0.0+</version>
- <association>
- <type>FileItem</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which single files to include in the assembly. A file
- is specified by providing one or more of <file>
- subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>dependencySets</name>
- <version>1.0.0+</version>
- <association>
- <type>DependencySet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which dependencies to include in the assembly. A
- dependencySet is specified by providing one or more of
- <dependencySet> subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>repositories</name>
- <version>1.1.0+</version>
- <association>
- <type>Repository</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies a set of repositories to include in the assembly. A
- repository is specified by providing one or more of
- <repository> subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>containerDescriptorHandlers</name>
- <version>1.1.0+</version>
- <association>
- <type>ContainerDescriptorHandlerConfig</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Set of components which filter various container descriptors out of
- the normal archive stream, so they can be aggregated then added.
- ]]>
- </description>
- </field>
- </fields>
- </class>
-
- <!-- Shared with component descriptor from here on. -->
- <class>
- <name>FileSet</name>
- <version>1.0.0+</version>
- <description>
- A fileSet allows the inclusion of groups of files into the assembly.
- </description>
- <fields>
- <field>
- <name>useDefaultExcludes</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Whether standard exclusion patterns, such as those matching CVS and Subversion
- metadata files, should be used when calculating the files affected by this set.
- For backward compatibility, the default value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- files and directory to include. If none is present, then
- <includes> represents all valid values.
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- files and directory to exclude. If none is present, then
- <excludes> represents no exclusions.
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the absolute or relative location from the module's
- directory. For example, "src/main/bin" would select this
- subdirectory of the project in which this dependency is defined.
- </description>
- <required>true</required>
- </field>
- <field>
- <name>lineEnding</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Sets the line-endings of the files in this fileSet.
- Valid values:
- <ul>
- <li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings</li>
- <li><b>"lf"</b> - Use a single line-feed line endings</li>
- <li><b>"dos"</b> - Use DOS-style line endings</li>
- <li><b>"crlf"</b> - Use Carraige-return, line-feed line endings</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>filtered</name>
- <version>1.1.0+</version>
- <description>
- Whether to filter symbols in the files as they are copied, using
- properties from the build configuration. (Since 2.2)
- </description>
- <defaultValue>false</defaultValue>
- <type>boolean</type>
- </field>
- </fields>
- </class>
- <class>
- <name>FileItem</name>
- <version>1.0.0+</version>
- <description>
- A file allows individual file inclusion with the option to change
- the destination filename not supported by fileSets.
- </description>
- <fields>
- <field>
- <name>source</name>
- <version>1.0.0+</version>
- <type>String</type>
- <required>true</required>
- <description>
- Sets the absolute or relative path from the module's directory
- of the file to be included in the assembly.
- </description>
- </field>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <required>false</required>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory.
- </description>
- </field>
- <field>
- <name>destName</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the destination filename in the outputDirectory.
- Default is the same name as the source's file.
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>lineEnding</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Sets the line-endings of the files in this file.
- Valid values are:
- <ul>
- <li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings</li>
- <li><b>"lf"</b> - Use a single line-feed line endings</li>
- <li><b>"dos"</b> - Use DOS-style line endings</li>
- <li><b>"crlf"</b> - Use Carraige-return, line-feed line endings</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>filtered</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <description>
- Sets whether to determine if the file is filtered.
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>DependencySet</name>
- <version>1.0.0+</version>
- <description>
- A dependencySet allows inclusion and exclusion of project dependencies
- in the assembly.
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>useStrictFiltering</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- When specified as true, any include/exclude patterns which aren't used to filter an actual
- artifact during assembly creation will cause the build to fail with an error. This is meant
- to highlight obsolete inclusions or exclusions, or else signal that the assembly descriptor
- is incorrectly configured. (Since 2.2)
- </description>
- </field>
- <field>
- <name>outputFileNameMapping</name>
- <version>1.0.0+</version>
- <type>String</type>
- <defaultValue>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</defaultValue>
- <description>
- Sets the mapping pattern for all dependencies included in this
- assembly. Default is ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}.
- (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension}).
- NOTE: If the dependencySet specifies unpack == true, outputFileNameMapping WILL NOT BE USED; in these cases,
- use outputDirectory.
- See the plugin FAQ for more details about entries usable in the outputFileNameMapping parameter.
- </description>
- </field>
- <field>
- <name>unpack</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, this property will unpack all dependencies
- into the specified output directory. When set to false,
- dependencies will be included as archives (jars). Can only unpack
- jar, zip, tar.gz, and tar.bz archives. Default value is false.
- </description>
- </field>
- <field>
- <name>unpackOptions</name>
- <version>1.1.0+</version>
- <description>
- Allows the specification of includes and excludes, along with filtering options, for items
- unpacked from a dependency artifact. (Since 2.2)
- </description>
- <association>
- <type>UnpackOptions</type>
- </association>
- </field>
- <field>
- <name>scope</name>
- <version>1.0.0+</version>
- <type>String</type>
- <defaultValue>runtime</defaultValue>
- <required>true</required>
- <description>
- Sets the dependency scope for this dependencySet.
- Default scope value is "runtime".
- </description>
- </field>
- <field>
- <name>useProjectArtifact</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description><![CDATA[
- Determines whether the artifact produced during the current project's
- build should be included in this dependency set. Default value is true,
- for backward compatibility. (Since 2.2)
- ]]></description>
- </field>
- <field>
- <name>useProjectAttachments</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description><![CDATA[
- Determines whether the attached artifacts produced during the current project's
- build should be included in this dependency set. Default value is false. (Since 2.2)
- ]]></description>
- </field>
- <field>
- <name>useTransitiveDependencies</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Determines whether transitive dependencies will be included in the processing of
- the current dependency set. If true, includes/excludes/useTransitiveFiltering
- will apply to transitive dependency artifacts in addition to the main project
- dependency artifacts. If false, useTransitiveFiltering is meaningless, and
- includes/excludes only affect the immediate dependencies of the project.
- By default, this value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>useTransitiveFiltering</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- Determines whether the include/exclude patterns in this dependency set will be applied to
- the transitive path of a given artifact. If true, and the current artifact is a transitive
- dependency brought in by another artifact which matches an inclusion or exclusion pattern,
- then the current artifact has the same inclusion/exclusion logic applied to it as well. By
- default, this value is false, in order to preserve backward compatibility with version 2.1.
- This means that includes/excludes only apply directly to the current artifact, and not to
- the transitive set of artifacts which brought it in. (Since 2.2)
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ModuleSet</name>
- <description>
- <![CDATA[
- A moduleSet represent one or more project <module> present inside
- a project's pom.xml. This allows you to include sources or binaries
- belonging to a project's <modules>.
-
- <br/><b>NOTE:</b> When using <moduleSets> from the command-line, it
- is required to pass first the package phase by doing: "mvn package
- assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.
- ]]>
- </description>
- <version>1.1.2+</version>
- <fields>
- <field>
- <name>useAllReactorProjects</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, the plugin will include all projects in the current reactor for processing
- in this ModuleSet. These will be subject to include/exclude rules.
- Default value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>includeSubModules</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- If set to false, the plugin will exclude sub-modules from processing in this ModuleSet.
- Otherwise, it will process all sub-modules, each subject to include/exclude rules.
- Default value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.1.2+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- project coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.1.2+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- project artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>sources</name>
- <version>1.1.2+</version>
- <description>
- When this is present, the plugin will include the source files of
- the included modules from this set in the resulting assembly.
- </description>
- <association>
- <type>ModuleSources</type>
- </association>
- </field>
- <field>
- <name>binaries</name>
- <version>1.1.2+</version>
- <description>
- When this is present, the plugin will include the binaries of the
- included modules from this set in the resulting assembly.
- </description>
- <association>
- <type>ModuleBinaries</type>
- </association>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ModuleSources</name>
- <version>1.1.2+</version>
- <description>
- Contains configuration options for including the source files of a
- project module in an assembly.
- </description>
- <fields>
- <field>
- <name>useDefaultExcludes</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Whether standard exclusion patterns, such as those matching CVS and Subversion
- metadata files, should be used when calculating the files affected by this set.
- For backward compatibility, the default value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>outputDirectory</name>
- <version>1.1.2+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.1.2+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- files and directory to include. If none is present, then
- <includes> represents all valid values.
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.1.2+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- files and directory to exclude. If none is present, then
- <excludes> represents no exclusions.
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.1.2+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.1.2+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>fileSets</name>
- <version>1.1.2+</version>
- <association>
- <type>FileSet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which groups of files from each included module to include in the assembly. A
- fileSet is specified by providing one or more of <fileSet> subelements. (Since 2.2)
- ]]>
- </description>
- </field>
- <field>
- <name>includeModuleDirectory</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- <![CDATA[
- Specifies whether the module's finalName should be prepended to the outputDirectory
- values of any fileSets applied to it. Default value is true. (Since 2.2)
- ]]>
- </description>
- </field>
- <field>
- <name>excludeSubModuleDirectories</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- <![CDATA[
- Specifies whether sub-module directories below the current module should be excluded
- from fileSets applied to that module. This might be useful if you only mean to copy
- the sources for the exact module list matched by this ModuleSet, ignoring (or processing
- separately) the modules which exist in directories below the current one.
- Default value is true. (Since 2.2)
- ]]>
- </description>
- </field>
- <field>
- <name>outputDirectoryMapping</name>
- <version>1.1.2+</version>
- <type>String</type>
- <defaultValue>${module.artifactId}</defaultValue>
- <description>
- Sets the mapping pattern for all module base-directories included in this assembly.
- NOTE: This field is only used if includeModuleDirectory == true.
- Default is the module's ${artifactId} in 2.2-beta-1, and ${module.artifactId} in subsequent versions. (Since 2.2)
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ModuleBinaries</name>
- <version>1.1.2+</version>
- <description>
- Contains configuration options for including the binary files of a
- project module in an assembly.
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.1.2+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.1.2+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.1.2+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.1.2+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.1.2+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>attachmentClassifier</name>
- <version>1.1.2+</version>
- <type>String</type>
- <description>
- When specified, the attachmentClassifier will cause the assembler to look at artifacts
- attached to the module instead of the main project artifact. If it can find an attached
- artifact matching the specified classifier, it will use it; otherwise, it will throw an
- exception. (Since 2.2)
- </description>
- </field>
- <field>
- <name>includeDependencies</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- If set to true, the plugin will include the direct and transitive dependencies of
- of the project modules included here. Otherwise, it will only include the module
- packages only. Default value is true.
- </description>
- </field>
- <field>
- <name>dependencySets</name>
- <version>1.1.2+</version>
- <association>
- <type>DependencySet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which dependencies of the module to include in the assembly. A
- dependencySet is specified by providing one or more of
- <dependencySet> subelements. (Since 2.2)
- ]]>
- </description>
- </field>
- <field>
- <name>unpack</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- If set to true, this property will unpack all module packages
- into the specified output directory. When set to false
- module packages will be included as archives (jars).
- Default value is true.
- </description>
- </field>
- <field>
- <name>unpackOptions</name>
- <version>1.1.2+</version>
- <description>
- Allows the specification of includes and excludes, along with filtering options, for items
- unpacked from a module artifact. (Since 2.2)
- </description>
- <association>
- <type>UnpackOptions</type>
- </association>
- </field>
- <field>
- <name>outputFileNameMapping</name>
- <version>1.1.2+</version>
- <type>String</type>
- <defaultValue>${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}</defaultValue>
- <description>
- Sets the mapping pattern for all NON-UNPACKED dependencies included
- in this assembly.
- Default is ${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}.
- (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension}) NOTE: If the
- dependencySet specifies unpack == true, outputFileNameMapping WILL NOT BE USED; in these cases, use outputDirectory.
- See the plugin FAQ for more details about entries usable in the outputFileNameMapping parameter.
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>Repository</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- Defines a Maven repository to be included in the assembly. The artifacts
- available to be included in a repository are your project's dependency
- artifacts. The repository created contains the needed metadata entries
- and also contains both sha1 and md5 checksums. This is useful for creating
- archives which will be deployed to internal repositories.
-
- <br/><b>NOTE:</b> Currently, only artifacts from the central repository
- are allowed.
- ]]>
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>includeMetadata</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, this property will trigger the creation of repository
- metadata which will allow the repository to be used as a functional remote
- repository. Default value is false.
- </description>
- </field>
- <field>
- <name>groupVersionAlignments</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- Specifies that you want to align a group of artifacts to a specified
- version. A groupVersionAlignment is specified by providing one or
- more of <groupVersionAlignment> subelements.
- ]]>
- </description>
- <association>
- <type>GroupVersionAlignment</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>scope</name>
- <version>1.1.0+</version>
- <type>String</type>
- <defaultValue>runtime</defaultValue>
- <required>true</required>
- <description>
- Specifies the scope for artifacts included in this repository.
- Default scope value is "runtime". (Since 2.2)
- </description>
- </field>
- </fields>
- </class>
- <class>
- <name>GroupVersionAlignment</name>
- <version>1.0.0+</version>
- <description>
- Allows a group of artifacts to be aligned to a specified version.
- </description>
- <fields>
- <field>
- <name>id</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The groupId of the artifacts for which you want to align the
- versions.
- </description>
- </field>
- <field>
- <name>version</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The version you want to align this group to.
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define the
- artifactIds of the artifacts to exclude. If none is present, then
- <excludes> represents no exclusions. An exclude is specified
- by providing one or more of <exclude> subelements.
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- </fields>
- </class>
- <class>
- <name>UnpackOptions</name>
- <version>1.1.0+</version>
- <description>
- Specifies options for including/excluding/filtering items extracted from an archive. (Since 2.2)
- </description>
- <fields>
- <field>
- <name>includes</name>
- <version>1.1.0+</version>
- <description>
- <![CDATA[
- Set of file and/or directory patterns for matching items to be included from an archive as it is unpacked.
- Each item is specified as <include>some/path</include> (Since 2.2)
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>excludes</name>
- <version>1.1.0+</version>
- <description>
- <![CDATA[
- Set of file and/or directory patterns for matching items to be excluded from an archive as it is unpacked.
- Each item is specified as <exclude>some/path</exclude> (Since 2.2)
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>filtered</name>
- <version>1.1.0+</version>
- <description>
- Whether to filter symbols in the files as they are unpacked from the archive, using
- properties from the build configuration. (Since 2.2)
- </description>
- <defaultValue>false</defaultValue>
- <type>boolean</type>
- </field>
- <field>
- <name>lineEnding</name>
- <version>1.1.2+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Sets the line-endings of the files. (Since 2.2)
- Valid values:
- <ul>
- <li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings</li>
- <li><b>"lf"</b> - Use a single line-feed line endings</li>
- <li><b>"dos"</b> - Use DOS-style line endings</li>
- <li><b>"crlf"</b> - Use Carraige-return, line-feed line endings</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>useDefaultExcludes</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Whether standard exclusion patterns, such as those matching CVS and Subversion
- metadata files, should be used when calculating the files affected by this set.
- For backward compatibility, the default value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>encoding</name>
- <version>1.1.3+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Allows to specify the encoding to use when unpacking archives, for unarchivers
- that support specifying encoding. If unspecified, archiver default will be used.
- Archiver defaults generally represent sane (modern) values.
- ]]>
- </description>
- </field>
- </fields>
- </class>
- <class>
- <name>ContainerDescriptorHandlerConfig</name>
- <version>1.1.0+</version>
- <description>
- Configures a filter for files headed into the assembly archive, to enable
- aggregation of various types of descriptor fragments, such as components.xml,
- web.xml, etc.
- </description>
- <fields>
- <field>
- <name>handlerName</name>
- <version>1.1.0+</version>
- <description>
- The handler's plexus role-hint, for lookup from the container.
- </description>
- <type>String</type>
- <required>true</required>
- </field>
- <field>
- <name>configuration</name>
- <version>1.1.1+</version>
- <description>
- Configuration options for the handler.
- </description>
- <type>DOM</type>
- </field>
- </fields>
- </class>
- </classes>
-</model>
diff --git a/maven-assembly-plugin-2.x/src/main/mdo/descriptor.mdo b/maven-assembly-plugin-2.x/src/main/mdo/descriptor.mdo
deleted file mode 100644
index bf31f03..0000000
--- a/maven-assembly-plugin-2.x/src/main/mdo/descriptor.mdo
+++ /dev/null
@@ -1,1412 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ Copyright 2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!--
- Since Modello does not have the capability to share descriptor,
- if you make changes to FileSet, FileItem, DependendencySet, or
- adding new collection, make sure to propagate your changes
- to "component.mdo".
--->
-
-<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd"
- xml.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/assembly-${version}.xsd">
-
- <id>assembly</id>
- <name>Assembly</name>
- <description>
- <![CDATA[
- <p>
- Maven Assembly Plugin relies on the provided assembly descriptors to dictate
- its execution. Although there are already prefabricated descriptors available
- for use, they can only suffice some of the common assembly requirements.
- </p>
- <p>
- So in order for you to customize the way the Assembly Plugin creates your
- assemblies, you need to know how to use the Assembly Descriptor.
- </p>
- <p>
- This descriptor specifies the type of assembly archive to create, the contents
- of the assembly, and the ways in which dependencies or its modules are bundled
- with an assembly.
- </p>
- ]]>
- </description>
- <defaults>
- <default>
- <key>package</key>
- <value>org.apache.maven.plugin.assembly.model</value>
- </default>
- </defaults>
- <classes>
- <class rootElement="true" xml.tagName="assembly">
- <name>Assembly</name>
- <description>
- <![CDATA[
- An assembly defines a collection of files usually distributed in an
- archive format such as zip, tar, or tar.gz that is generated from a
- project. For example, a project could produce a ZIP assembly which
- contains a project's JAR artifact in the root directory, the
- runtime dependencies in a lib/ directory, and a shell script to launch
- a stand-alone application.
- ]]>
- </description>
- <version>1.0.0+</version>
- <fields>
- <field>
- <name>id</name>
- <version>1.0.0+</version>
- <required>true</required>
- <type>String</type>
- <description>
- Sets the id of this assembly. This is a symbolic name for a
- particular assembly of files from this project. Also, aside from
- being used to distinctly name the assembled package by attaching
- its value to the generated archive, the id is used as your
- artifact's classifier when deploying.
- </description>
- </field>
- <field>
- <name>formats</name>
- <version>1.0.0+</version>
- <required>false</required>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies the formats of the assembly.
-
- It is often better to specify the formats via the goal parameter rather
- than here. For example, that allows different profiles to generate
- different types of archives.
-
- Multiple formats can be
- supplied and the Assembly Plugin will generate an archive for each
- of the desired formats. When deploying your project, all file formats
- specified will also be deployed. A format is specified by supplying
- one of the following values in a <format> subelement:
- <ul>
- <li><b>"zip"</b> - Creates a ZIP file format</li>
- <li><b>"tar"</b> - Creates a TAR format</li>
- <li><b>"tar.gz"</b> or <b>"tgz"</b> - Creates a gzip'd TAR format</li>
- <li><b>"tar.bz2"</b> or <b>"tbz2"</b> - Creates a bzip'd TAR format</li>
- <li><b>"jar"</b> - Creates a JAR format</li>
- <li><b>"dir"</b> - Creates an exploded directory format</li>
- <li><b>"war"</b> - Creates a WAR format</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>includeBaseDirectory</name>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Includes a base directory in the final archive. For example,
- if you are creating an assembly named "your-app", setting
- includeBaseDirectory to true will create an archive that
- includes this base directory. If this option is set to false
- the archive created will unzip its content to the current
- directory.
- </description>
- </field>
- <field>
- <name>baseDirectory</name>
- <version>1.1.0+</version>
- <type>String</type>
- <description>
- Sets the base directory of the resulting assembly archive. If this is not
- set and includeBaseDirectory == true, ${project.build.finalName} will be used instead.
- (Since 2.2-beta-1)
- </description>
- </field>
- <field>
- <name>includeSiteDirectory</name>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- Includes a site directory in the final archive. The site directory
- location of a project is determined by the siteDirectory parameter
- of the Assembly Plugin.
- </description>
- </field>
- <field>
- <name>containerDescriptorHandlers</name>
- <version>1.1.0+</version>
- <association>
- <type>ContainerDescriptorHandlerConfig</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Set of components which filter various container descriptors out of
- the normal archive stream, so they can be aggregated then added.
- ]]>
- </description>
- </field>
- <field>
- <name>moduleSets</name>
- <version>1.0.0+</version>
- <association>
- <type>ModuleSet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which module files to include in the assembly. A moduleSet
- is specified by providing one or more of <moduleSet>
- subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>fileSets</name>
- <version>1.0.0+</version>
- <association>
- <type>FileSet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which groups of files to include in the assembly. A
- fileSet is specified by providing one or more of <fileSet>
- subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>files</name>
- <version>1.0.0+</version>
- <association>
- <type>FileItem</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which single files to include in the assembly. A file
- is specified by providing one or more of <file>
- subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>dependencySets</name>
- <version>1.0.0+</version>
- <association>
- <type>DependencySet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which dependencies to include in the assembly. A
- dependencySet is specified by providing one or more of
- <dependencySet> subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>repositories</name>
- <version>1.0.0+</version>
- <association>
- <type>Repository</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which repository files to include in the assembly. A
- repository is specified by providing one or more of
- <repository> subelements.
- ]]>
- </description>
- </field>
- <field>
- <name>componentDescriptors</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies the shared components xml file locations to include in the
- assembly. The locations specified must be relative to the base location
- of the descriptor. If the descriptor was found via a <descriptorRef/>
- element in the
- classpath, any components it specifies will also be found on the classpath.
- If it is found by pathname via a <descriptor/> element
- the value here will be interpreted
- as a path relative to the project basedir.
- When multiple componentDescriptors are found, their
- contents are merged. Check out the <a href="component.html">
- descriptor components</a> for more information. A
- componentDescriptor is specified by providing one or more of
- <componentDescriptor> subelements.
- ]]>
- </description>
- </field>
- </fields>
- </class>
-
- <!-- Shared with component descriptor from here on. -->
- <class>
- <name>FileSet</name>
- <version>1.0.0+</version>
- <description>
- A fileSet allows the inclusion of groups of files into the assembly.
- </description>
- <fields>
- <field>
- <name>useDefaultExcludes</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Whether standard exclusion patterns, such as those matching CVS and Subversion
- metadata files, should be used when calculating the files affected by this set.
- For backward compatibility, the default value is true. (Since 2.2-beta-1)
- </description>
- </field>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- files and directory to include. If none is present, then
- <includes> represents all valid values.
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- files and directory to exclude. If none is present, then
- <excludes> represents no exclusions.
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the absolute or relative location from the module's
- directory. For example, "src/main/bin" would select this
- subdirectory of the project in which this dependency is defined.
- </description>
- <required>true</required>
- </field>
- <field>
- <name>lineEnding</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Sets the line-endings of the files in this fileSet.
- Valid values:
- <ul>
- <li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings (i.e. "\n")</li>
- <li><b>"lf"</b> - Use a single line-feed line endings (i.e. "\n")</li>
- <li><b>"dos"</b> - Use DOS-/Windows-style line endings (i.e. "\r\n")</li>
- <li><b>"windows"</b> - Use DOS-/Windows-style line endings (i.e. "\r\n")</li>
- <li><b>"crlf"</b> - Use carriage-return, line-feed line endings (i.e. "\r\n")</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>filtered</name>
- <version>1.1.0+</version>
- <description>
- Whether to filter symbols in the files as they are copied, using
- properties from the build configuration. (Since 2.2-beta-1)
- </description>
- <defaultValue>false</defaultValue>
- <type>boolean</type>
- </field>
- </fields>
- </class>
- <class>
- <name>FileItem</name>
- <version>1.0.0+</version>
- <description>
- A file allows individual file inclusion with the option to change
- the destination filename not supported by fileSets.
- </description>
- <fields>
- <field>
- <name>source</name>
- <version>1.0.0+</version>
- <type>String</type>
- <required>true</required>
- <description>
- Sets the absolute or relative path from the module's directory
- of the file to be included in the assembly.
- </description>
- </field>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <required>false</required>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory.
- </description>
- </field>
- <field>
- <name>destName</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the destination filename in the outputDirectory.
- Default is the same name as the source's file.
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>lineEnding</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Sets the line-endings of the files in this file.
- Valid values are:
- <ul>
- <li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings (i.e. "\n")</li>
- <li><b>"lf"</b> - Use a single line-feed line endings (i.e. "\n")</li>
- <li><b>"dos"</b> - Use DOS-/Windows-style line endings (i.e. "\r\n")</li>
- <li><b>"windows"</b> - Use DOS-/Windows-style line endings (i.e. "\r\n")</li>
- <li><b>"crlf"</b> - Use carriage-return, line-feed line endings (i.e. "\r\n")</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>filtered</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <description>
- Sets whether to determine if the file is filtered.
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>DependencySet</name>
- <version>1.0.0+</version>
- <description>
- A dependencySet allows inclusion and exclusion of project dependencies
- in the assembly.
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>useStrictFiltering</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- When specified as true, any include/exclude patterns which aren't used to filter an actual
- artifact during assembly creation will cause the build to fail with an error. This is meant
- to highlight obsolete inclusions or exclusions, or else signal that the assembly descriptor
- is incorrectly configured. (Since 2.2)
- </description>
- </field>
- <field>
- <name>outputFileNameMapping</name>
- <version>1.0.0+</version>
- <type>String</type>
- <defaultValue>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</defaultValue>
- <description>
- Sets the mapping pattern for all dependencies included in this
- assembly. (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension}
- as default value).
- See the plugin FAQ for more details about entries usable in the outputFileNameMapping parameter.
- </description>
- </field>
- <field>
- <name>unpack</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, this property will unpack all dependencies
- into the specified output directory. When set to false
- dependencies will be includes as archives (jars). Can only unpack
- jar, zip, tar.gz, and tar.bz archives.
- </description>
- </field>
- <field>
- <name>unpackOptions</name>
- <version>1.1.0+</version>
- <description>
- Allows the specification of includes and excludes, along with filtering options, for items
- unpacked from a dependency artifact. (Since 2.2-beta-1)
- </description>
- <association>
- <type>UnpackOptions</type>
- </association>
- </field>
- <field>
- <name>scope</name>
- <version>1.0.0+</version>
- <type>String</type>
- <defaultValue>runtime</defaultValue>
- <required>true</required>
- <description>
- Sets the dependency scope for this dependencySet.
- </description>
- </field>
- <field>
- <name>useProjectArtifact</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description><![CDATA[
- Determines whether the artifact produced during the current project's
- build should be included in this dependency set. (Since 2.2-beta-1)
- ]]></description>
- </field>
- <field>
- <name>useProjectAttachments</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description><![CDATA[
- Determines whether the attached artifacts produced during the current project's
- build should be included in this dependency set. (Since 2.2-beta-1)
- ]]></description>
- </field>
- <field>
- <name>useTransitiveDependencies</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Determines whether transitive dependencies will be included in the processing of
- the current dependency set. If true, includes/excludes/useTransitiveFiltering
- will apply to transitive dependency artifacts in addition to the main project
- dependency artifacts. If false, useTransitiveFiltering is meaningless, and
- includes/excludes only affect the immediate dependencies of the project.
- By default, this value is true. (Since 2.2-beta-1)
- </description>
- </field>
- <field>
- <name>useTransitiveFiltering</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- Determines whether the include/exclude patterns in this dependency set will be applied to
- the transitive path of a given artifact. If true, and the current artifact is a transitive
- dependency brought in by another artifact which matches an inclusion or exclusion pattern,
- then the current artifact has the same inclusion/exclusion logic applied to it as well. By
- default, this value is false, in order to preserve backward compatibility with version 2.1.
- This means that includes/excludes only apply directly to the current artifact, and not to
- the transitive set of artifacts which brought it in. (Since 2.2-beta-1)
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ModuleSet</name>
- <description>
- <![CDATA[
- A moduleSet represent one or more project <module> present inside
- a project's pom.xml. This allows you to include sources or binaries
- belonging to a project's <modules>.
-
- <br/><b>NOTE:</b> When using <moduleSets> from the command-line, it
- is required to pass first the package phase by doing: "mvn package
- assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.
- ]]>
- </description>
- <version>1.0.0+</version>
- <fields>
- <field>
- <name>useAllReactorProjects</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, the plugin will include all projects in the current reactor for processing
- in this ModuleSet. These will be subject to include/exclude rules. (Since 2.2)
- </description>
- </field>
- <field>
- <name>includeSubModules</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- If set to false, the plugin will exclude sub-modules from processing in this ModuleSet.
- Otherwise, it will process all sub-modules, each subject to include/exclude rules. (Since 2.2-beta-1)
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- project coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- project artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>sources</name>
- <version>1.0.0+</version>
- <description>
- When this is present, the plugin will include the source files of
- the included modules from this set in the resulting assembly.
- </description>
- <association>
- <type>ModuleSources</type>
- </association>
- </field>
- <field>
- <name>binaries</name>
- <version>1.0.0+</version>
- <description>
- When this is present, the plugin will include the binaries of the
- included modules from this set in the resulting assembly.
- </description>
- <association>
- <type>ModuleBinaries</type>
- </association>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ModuleSources</name>
- <version>1.0.0+</version>
- <description>
- Contains configuration options for including the source files of a
- project module in an assembly.
- </description>
- <fields>
- <field>
- <name>useDefaultExcludes</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Whether standard exclusion patterns, such as those matching CVS and Subversion
- metadata files, should be used when calculating the files affected by this set.
- For backward compatibility, the default value is true. (Since 2.2-beta-1)
- </description>
- </field>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- files and directory to include. If none is present, then
- <includes> represents all valid values.
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- files and directory to exclude. If none is present, then
- <excludes> represents no exclusions.
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>fileSets</name>
- <version>1.1.0+</version>
- <association>
- <type>FileSet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which groups of files from each included module to include in the assembly. A
- fileSet is specified by providing one or more of <fileSet> subelements. (Since 2.2-beta-1)
- ]]>
- </description>
- </field>
- <field>
- <name>includeModuleDirectory</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- <![CDATA[
- Specifies whether the module's finalName should be prepended to the outputDirectory
- values of any fileSets applied to it. (Since 2.2-beta-1)
- ]]>
- </description>
- </field>
- <field>
- <name>excludeSubModuleDirectories</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- <![CDATA[
- Specifies whether sub-module directories below the current module should be excluded
- from fileSets applied to that module. This might be useful if you only mean to copy
- the sources for the exact module list matched by this ModuleSet, ignoring (or processing
- separately) the modules which exist in directories below the current one. (Since 2.2-beta-1)
- ]]>
- </description>
- </field>
- <field>
- <name>outputDirectoryMapping</name>
- <version>1.1.0+</version>
- <type>String</type>
- <defaultValue>${module.artifactId}</defaultValue>
- <description>
- Sets the mapping pattern for all module base-directories included in this assembly.
- NOTE: This field is only used if includeModuleDirectory == true.
- Default is the module's ${artifactId} in 2.2-beta-1, and ${module.artifactId} in subsequent versions. (Since 2.2-beta-1)
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>ModuleBinaries</name>
- <version>1.0.0+</version>
- <description>
- Contains configuration options for including the binary files of a
- project module in an assembly.
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>attachmentClassifier</name>
- <version>1.1.0+</version>
- <type>String</type>
- <description>
- When specified, the attachmentClassifier will cause the assembler to look at artifacts
- attached to the module instead of the main project artifact. If it can find an attached
- artifact matching the specified classifier, it will use it; otherwise, it will throw an
- exception. (Since 2.2-beta-1)
- </description>
- </field>
- <field>
- <name>includeDependencies</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- If set to true, the plugin will include the direct and transitive dependencies of
- of the project modules included here. Otherwise, it will only include the module
- packages only.
- </description>
- </field>
- <field>
- <name>dependencySets</name>
- <version>1.1.0+</version>
- <association>
- <type>DependencySet</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- Specifies which dependencies of the module to include in the assembly. A
- dependencySet is specified by providing one or more of
- <dependencySet> subelements. (Since 2.2-beta-1)
- ]]>
- </description>
- </field>
- <field>
- <name>unpack</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- If set to true, this property will unpack all module packages
- into the specified output directory. When set to false
- module packages will be included as archives (jars).
- </description>
- </field>
- <field>
- <name>unpackOptions</name>
- <version>1.1.0+</version>
- <description>
- Allows the specification of includes and excludes, along with filtering options, for items
- unpacked from a module artifact. (Since 2.2-beta-1)
- </description>
- <association>
- <type>UnpackOptions</type>
- </association>
- </field>
- <field>
- <name>outputFileNameMapping</name>
- <version>1.0.0+</version>
- <type>String</type>
- <defaultValue>${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}</defaultValue>
- <description>
- Sets the mapping pattern for all NON-UNPACKED dependencies included
- in this assembly.
- (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension} as default value)
- NOTE: If the dependencySet specifies unpack == true, outputFileNameMapping WILL NOT BE USED; in these cases,
- use outputDirectory.
- See the plugin FAQ for more details about entries usable in the outputFileNameMapping parameter.
- </description>
- </field>
- </fields>
- </class>
-
- <class>
- <name>Repository</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- Defines a Maven repository to be included in the assembly. The artifacts
- available to be included in a repository are your project's dependency
- artifacts. The repository created contains the needed metadata entries
- and also contains both sha1 and md5 checksums. This is useful for creating
- archives which will be deployed to internal repositories.
-
- <br/><b>NOTE:</b> Currently, only artifacts from the central repository
- are allowed.
- ]]>
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>includeMetadata</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, this property will trigger the creation of repository
- metadata which will allow the repository to be used as a functional remote
- repository.
- </description>
- </field>
- <field>
- <name>groupVersionAlignments</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- Specifies that you want to align a group of artifacts to a specified
- version. A groupVersionAlignment is specified by providing one or
- more of <groupVersionAlignment> subelements.
- ]]>
- </description>
- <association>
- <type>GroupVersionAlignment</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>scope</name>
- <version>1.1.0+</version>
- <type>String</type>
- <defaultValue>runtime</defaultValue>
- <required>true</required>
- <description>
- Specifies the scope for artifacts included in this repository. (Since 2.2-beta-1)
- </description>
- </field>
- </fields>
- </class>
- <class>
- <name>GroupVersionAlignment</name>
- <version>1.0.0+</version>
- <description>
- Allows a group of artifacts to be aligned to a specified version.
- </description>
- <fields>
- <field>
- <name>id</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The groupId of the artifacts for which you want to align the
- versions.
- </description>
- </field>
- <field>
- <name>version</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The version you want to align this group to.
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define the
- artifactIds of the artifacts to exclude. If none is present, then
- <excludes> represents no exclusions. An exclude is specified
- by providing one or more of <exclude> subelements.
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- </fields>
- </class>
- <class>
- <name>UnpackOptions</name>
- <version>1.1.0+</version>
- <description>
- Specifies options for including/excluding/filtering items extracted from an archive. (Since 2.2-beta-1)
- </description>
- <fields>
- <field>
- <name>includes</name>
- <version>1.1.0+</version>
- <description>
- <![CDATA[
- Set of file and/or directory patterns for matching items to be included from an archive as it is unpacked.
- Each item is specified as <include>some/path</include> (Since 2.2-beta-1)
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>excludes</name>
- <version>1.1.0+</version>
- <description>
- <![CDATA[
- Set of file and/or directory patterns for matching items to be excluded from an archive as it is unpacked.
- Each item is specified as <exclude>some/path</exclude> (Since 2.2-beta-1)
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>filtered</name>
- <version>1.1.0+</version>
- <description>
- Whether to filter symbols in the files as they are unpacked from the archive, using
- properties from the build configuration. (Since 2.2-beta-1)
- </description>
- <defaultValue>false</defaultValue>
- <type>boolean</type>
- </field>
- <field>
- <name>lineEnding</name>
- <version>1.1.2+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Sets the line-endings of the files. (Since 2.2)
- Valid values:
- <ul>
- <li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings</li>
- <li><b>"lf"</b> - Use a single line-feed line endings</li>
- <li><b>"dos"</b> - Use DOS-style line endings</li>
- <li><b>"crlf"</b> - Use Carraige-return, line-feed line endings</li>
- </ul>
- ]]>
- </description>
- </field>
- <field>
- <name>useDefaultExcludes</name>
- <version>1.1.2+</version>
- <type>boolean</type>
- <defaultValue>true</defaultValue>
- <description>
- Whether standard exclusion patterns, such as those matching CVS and Subversion
- metadata files, should be used when calculating the files affected by this set.
- For backward compatibility, the default value is true. (Since 2.2)
- </description>
- </field>
- <field>
- <name>encoding</name>
- <version>1.1.3+</version>
- <type>String</type>
- <description>
- <![CDATA[
- Allows to specify the encoding to use when unpacking archives, for unarchivers
- that support specifying encoding. If unspecified, archiver default will be used.
- Archiver defaults generally represent sane (modern) values.
- ]]>
- </description>
- </field>
- </fields>
- </class>
- <class>
- <name>ContainerDescriptorHandlerConfig</name>
- <version>1.1.0+</version>
- <description>
- Configures a filter for files headed into the assembly archive, to enable
- aggregation of various types of descriptor fragments, such as components.xml,
- web.xml, etc.
- </description>
- <fields>
- <field>
- <name>handlerName</name>
- <version>1.1.0+</version>
- <description>
- The handler's plexus role-hint, for lookup from the container.
- </description>
- <type>String</type>
- <required>true</required>
- </field>
- <field>
- <name>configuration</name>
- <version>1.1.1+</version>
- <description>
- Configuration options for the handler.
- </description>
- <type>DOM</type>
- </field>
- </fields>
- </class>
- </classes>
-</model>
diff --git a/maven-assembly-plugin-2.x/src/main/resources/META-INF/plexus/components.xml b/maven-assembly-plugin-2.x/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 9475059..0000000
--- a/maven-assembly-plugin-2.x/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<component-set>
- <components>
- <!-- UnArchiver -->
- <component>
- <role>org.codehaus.plexus.archiver.UnArchiver</role>
- <role-hint>sar</role-hint>
- <implementation>org.codehaus.plexus.archiver.zip.ZipUnArchiver</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
- <component>
- <role>org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection</role>
- <role-hint>sar</role-hint>
- <implementation>org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
- </components>
-</component-set>
diff --git a/maven-assembly-plugin-2.x/src/main/resources/assemblies/bin.xml b/maven-assembly-plugin-2.x/src/main/resources/assemblies/bin.xml
deleted file mode 100644
index 001c7b9..0000000
--- a/maven-assembly-plugin-2.x/src/main/resources/assemblies/bin.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- START SNIPPET: bin -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>\${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>\${project.build.directory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>\${project.build.directory}/site</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
-<!-- END SNIPPET: bin -->
diff --git a/maven-assembly-plugin-2.x/src/main/resources/assemblies/jar-with-dependencies.xml b/maven-assembly-plugin-2.x/src/main/resources/assemblies/jar-with-dependencies.xml
deleted file mode 100644
index 88bc7c8..0000000
--- a/maven-assembly-plugin-2.x/src/main/resources/assemblies/jar-with-dependencies.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- START SNIPPET: jar-with-dependencies -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <!-- TODO: a jarjar format would be better -->
- <id>jar-with-dependencies</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
- <unpack>true</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
-<!-- END SNIPPET: jar-with-dependencies -->
diff --git a/maven-assembly-plugin-2.x/src/main/resources/assemblies/project.xml b/maven-assembly-plugin-2.x/src/main/resources/assemblies/project.xml
deleted file mode 100644
index a0375ec..0000000
--- a/maven-assembly-plugin-2.x/src/main/resources/assemblies/project.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- START SNIPPET: project -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>project</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>\${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/*.log</exclude>
- <exclude>**/\${project.build.directory}/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
-<!-- END SNIPPET: project -->
diff --git a/maven-assembly-plugin-2.x/src/main/resources/assemblies/src.xml b/maven-assembly-plugin-2.x/src/main/resources/assemblies/src.xml
deleted file mode 100644
index de2bf81..0000000
--- a/maven-assembly-plugin-2.x/src/main/resources/assemblies/src.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: src -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>\${project.basedir}</directory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>pom.xml</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- <fileSet>
- <directory>\${project.basedir}/src</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
-<!-- END SNIPPET: src -->
diff --git a/maven-assembly-plugin-2.x/src/site/apt/advanced-descriptor-topics.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/advanced-descriptor-topics.apt.vm
deleted file mode 100644
index 041b3c4..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/advanced-descriptor-topics.apt.vm
+++ /dev/null
@@ -1,354 +0,0 @@
- ---
- Advanced Assembly-Descriptor Topics
- ---
- John Casey
- ---
- 1 December 2006
- ---
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Advanced Assembly-Descriptor Topics
-
-* Quick Note on All <<<includes>>> and <<<excludes>>> Patterns
-
- <<<excludes>>> take priority over <<<includes>>>.
-
-* Archive file resolution
-
- If two or more elements (e.g., file, fileSet) select different sources for
- the same file for archiving, only one of the source files will be archived.
-
- As per version 2.5.2 of the assembly plugin, the first phase to
- add the file to the archive "wins". The filtering is done solely based
- on name inside the archive, so the same source file can be added under
- different output names. The order of the phases is as follows:
- 1) FileItem 2) FileSets 3) ModuleSet 4) DepenedencySet and 5) Repository elements.
-
- Elements of the same type will be processed in the order they appear in the
- descriptors. If you need to "overwrite" a file included by a previous set,
- the only way to do this is to exclude that file from the earlier set.
-
- Note that this behaviour was slightly different in earlier versions of the
- assembly plugin.
-
-
-* Advanced Artifact-Matching in <<<includes>>> and <<<excludes>>>
-
- When using <<<dependencySet>>> or <<<moduleSet>>>, the <<<\<includes/\>>>> and
- <<<\<excludes/\>>>> sections actually apply to artifacts, not filenames.
- This can be a good thing, since you don't have to know the artifact's
- filename in the local repository. However, explicitly specifying the full
- artifact ID (consisting of groupId, artifactId, version, type, and classifier)
- for each artifact to be included or excluded can lead to very a verbose
- descriptor. Starting with version 2.2, the assembly plugin addresses the
- clumsiness of explicit artifact identification through the use of wildcard
- patterns.
-
- The following easy rules should be applied when specifying artifact-matching
- patterns:
-
- [[1]] Artifacts are matched by a set of identifier strings. In the following
- strings, <<<type>>> is <<<'jar'>>> by default, and <<<classifier>>> is
- omitted if null.
-
- * <<<groupId:artifactId:type:classifier>>>
- ( <<<artifact.getDependencyConflictId()>>> )
-
- * <<<groupId:artifactId>>>
- ( <<<ArtifactUtils.versionlessKey( artifact )>>> )
-
- * <<<groupId:artifactId:type:classifier:version>>>
- ( <<<artifact.getId()>>> )
-
- []
-
- [[2]] Any <<<'*'>>> character in an include/exclude pattern will result in the
- pattern being split, and the sub-patterns being matched within the three
- artifact identifiers mentioned above, using <<<String.indexOf(..)>>>.
-
- [[3]] When no <<<'*'>>> is present in an include/exclude pattern, the pattern
- will only match if the <<entire>> pattern equals one of the three
- artifact identifiers above, using the <<<String.equals(..)>>> method.
-
- [[4]] In case you missed it above, artifact-identification fields are
- separated by colons (<<<':'>>>) in the matching strings. So, a wildcard
- pattern that matches any artifact of type <<<'war'>>> might be specified
- as <<<*:war>>>.
-
- []
-
-** Example: Include all dependencies of type <<<'war'>>>
-
- In this example, we'll configure a <<<dependencySet>>> so it only includes
- those <<<war>>> dependencies.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:war</include>
- </includes>
- </dependencySet>
- </dependencySets>
- [...]
-</assembly>
----
-
-*** GOTCHA!
-
- In the above example, any <<<war>>> artifacts that happen to have a classifier
- (not sure why this particular case would happen, but it <is> possible) will be
- <<skipped>>. If you <really> want to be careful about catching all of the
- <<<war>>> artifacts in your project, you might want to use the following
- pattern:
-
----
-*:war:*
----
-
-** Example: Exclude all source-jar dependencies.
-
- In this example, we're dealing with the fact that project sources are
- often distributed using jar files, in addition to normal binaries. We want to
- filter out any source-jar files (they'll be marked with a <<<sources>>>
- classifier) from the binary jars.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:jar:*</include>
- </includes>
- <excludes>
- <exclude>*:sources</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- [...]
-</assembly>
----
-
-* Including Subversion Metadata Directories in a FileSet
-
- For most use cases, it's important to avoid adding metadata files from your
- source-control system, such as Subversion's <<<.svn>>> directories. Such
- metadata can increase the size of the resulting assembly vastly. By default,
- the assembly plugin will exclude metadata files for most common source-control
- systems from the <<<fileSet>>>s specified in the descriptor.
-
- On the other hand, what if you <wanted> to include Subversion metadata
- directories? Starting with version 2.2, the assembly plugin offers the
- <<<useDefaultExcludes>>> option on all <<<fileSet>>> elements, in order to
- accommodate this use case.
-
-** Example: Bundle project sources for a developer-quickstart pack
-
- In this example, let's examine what happens if you have a large project in
- source control. This project contains a large number of sizable files that
- haven't changed since the day they were added, in the early stages of the
- project's lifetime. You want to enable potential developers to get started
- quickly, without checking out hundreds of 10-megabyte files first.
-
- The compression incorporated with many archiving formats can offer an
- advantage here. If we create a project assembly, including Subversion metadata
- directories, developers should be able to download the assembly artifact and
- expand it, then simply type <<<svn up>>>.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <fileSets>
- <fileSet>
- <useDefaultExcludes>false</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- [...]
-</assembly>
----
-
- <NOTE: You'll notice that we're excluding all target directories; these are a
- form of "calculated" and otherwise transient data, and generally shouldn't be
- included in archives, unless your goal is to create project binaries or
- similar.>
-
-* Using Regular Expressions to Exclude Files
-
- <<Since: 2.2-beta-4>>
-
- Sometimes, you may find you need to specify an extremely fine-grained inclusion or
- exclusion pattern for a <<<fileSet>>>. In these cases, you have the option of specifying
- your pattern in the form of a regular expression by using the <<<%regex[...]>>> syntax.
-
- <Note:> For completeness, the default pattern type - Ant-style patterns - can also be
- specified using the new <<<%ant[...]>>> syntax. This will allow room for future expansion
- of <<<fileSet>>> patterns, including the option to change the default pattern syntax
- someday.
-
-** Example: Including directories named <<<target>>> in the <<<src>>> directory
-
- In this example, we want to produce a buildable source distribution of a
- Maven project hierarchy. Obviously, each project's <<<target>>> directory is
- a temporary workspace for the build process, so we want to exclude these
- directories. However, if one or more of the projects also includes a subdirectory
- named <<<target>>> in the <<<src>>> directory structure - perhaps as part of
- a Java package name - we want to make sure the files in this directory are
- included in the assembly.
-
----
-<assembly>
- [...]
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>%regex[(?!.*src/).*target.*]</exclude>
- </excludes>
- </fileSet>
- [...]
- </fileSets>
- [...]
-</assembly>
----
-
- The above <<<fileSet>>> uses a somewhat obscure feature of regular
- expressions called <negative lookahead>, which means our exclude pattern
- will only match paths that contain the word <<<target>>> but <<don't>>
- contain <<<src>>>. Effectively, any <<<target>>> directory within the
- <<<src>>> directory structure will be preserved in the assembly.
-
-* Using Strict-Filtering to Catch Obsolete Patterns or Incorrect Builds
-
- At times, you want to build in a set of sanity checks when creating your
- assembly, to ensure that what goes into the assembly artifact is what you
- intended. One way you can do this is by enabling <<<useStrictFiltering>>> on
- your <<<dependencySets>>>, <<<moduleSets>>>, and <<<fileSets>>>.
-
- <<<useStrictFiltering>>> is a flag that tells the assembly plugin to track
- each include/exclude pattern to make sure it's used during creation of the
- assembly. This way, if the assembly-descriptor author intended for a particular
- file or artifact to be present, he can add an include/exclude pattern to the
- descriptor to ensure that file/artifact is present, and then set the
- <<<useStrictFiltering>>> flag. If the pattern isn't used to match at least one
- file during assembly creation, the build will fail and the user will receive a
- message notifying him of the unused patterns.
-
-** Example: Ensuring the LICENSE.txt file is included in a jar
-
- In this example, we want to make sure that our project jar contains the
- project's open source license language, in order to be compliant with our
- software foundation's policies.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <fileSets>
- <fileSet>
- <useStrictFiltering>true</useStrictFiltering>
- <outputDirectory>META-INF</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </fileSet>
- [...]
- </fileSets>
- [...]
-</assembly>
----
-
- If a developer inadvertently removes the LICENSE.txt from the project
- directory, the assembly plugin should refuse to build this assembly.
-
-* Using an Alternative Assembly Base Directory
-
- In many cases, assemblies should have all files arranged under one assembly
- base directory. This way, a user who expands the assembly will have all of the
- contents collected in a nice, neat directory structure, rather than spread
- throughout the current working directory. This is achieved using the
- <<<includeBaseDirectory>>> flag, and this flag is set to <<<true>>> by
- default, which will result in the project's <<<artifactId-version>>> being
- used as the assembly base directory.
-
- However, in some special cases you may want to use a different directory name
- for the root of your assembly. Starting in the 2.2 version of the assembly
- plugin, this use case is addressed using the <<<baseDirectory>>> element of
- the assembly descriptor. With this element, you can use POM expressions and
- static strings to specify the name of the assembly root directory.
-
-** Example: Eclipse-style invariable directory name for the Maven assembly
-
- In this example, let's explore what would happen if we wanted Maven to use the
- Eclipse approach for naming the root directory in its distribution assemblies.
- This way, instead of expanding the distribution to find a new
- <<<maven-2.0.4>>> directory, you'd find a <<<maven>>> directory. Additionally,
- consider that the distribution assembly is currently built from the
- <<<maven-core>>> project, which means we shouldn't use the <<<artifactId>>> as
- part of the assembly root directory.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <baseDirectory>maven</baseDirectory>
- [...]
-</assembly>
----
-
- Now, imagine that the distribution assembly were created in the top-level
- <<<maven>>> project. Now, we <can> use the <<<artifactId>>>, and probably
- should, just to minimize the maintenance of these files.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <baseDirectory>${artifactId}</baseDirectory>
- [...]
-</assembly>
----
-
-* Advanced ModuleSet Topics
-
- One of the most complex sections of the assembly descriptor is the
- <<<moduleSets>>> section. In fact, so many improvements have been made to this
- section that we feel it warrants its own <"Advanced Topics"> page.
-
- * Go to {{{./advanced-module-set-topics.html}Advanced Module-Set Topics}}.
-
- []
diff --git a/maven-assembly-plugin-2.x/src/site/apt/advanced-module-set-topics.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/advanced-module-set-topics.apt.vm
deleted file mode 100644
index a6a936c..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/advanced-module-set-topics.apt.vm
+++ /dev/null
@@ -1,500 +0,0 @@
- ---
- Advanced Module-Set Topics
- ---
- John Casey
- ---
- 1 December 2006
- ---
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Advanced Module-Set Topics
-
-* Quick Note
-
- Some of the topics in this document refer to more general topics or
- improvements in the assembly descriptor as a whole. For more information, see
- the {{{./advanced-descriptor-topics.html}Advanced Assembly-Descriptor Topics}}
- page.
-
-* Including and Excluding Modules using a ModuleSet
-
- As you are no doubt aware, Maven 2.0 introduces advanced handling of
- multimodule builds. These are builds which contain multiple, often
- interrelated projects. In these builds, project hierarchy is established
- through use of the <<<modules>>> section of the POM, where parent POMs specify
- their children in a <<<modules>>> section. Other relationships, like
- interdependency, also exist within multimodule builds; however, these are
- beyond the scope of this document.
-
- When constructing an assembly from any parent-level project in a multimodule
- build, it's possible to process this parent-POM's descendent modules, and
- include them in some form within the resulting assembly artifact. By default,
- the entire module hierarchy below the current project is available for
- inclusion or exclusion. Also, include/exclude patterns for modules are matched
- using the artifact-matching rules explained in the <<Advanced
- Assembly-Descriptor Topics>> document.
-
- The following examples describe how to select certain modules in the project
- hierarchy using basic artifact includes/excludes. It does <<not>> describe
- what to do with the selected modules; to learn about the actions available for
- selected modules, see {{{Including_Module_Sources}including module sources}}
- and {{{Including_Module_Binaries}including module binaries}}
- below. For other, more advanced module-handling options, read on!
-
-** Example: Select one from a set of child projects
-
- Given the following project structure, and all appropriate module references
- in the parent POM:
-
----
-+ parent (groupId: org.test, artifactId: parent)
- |
- + child1 (groupId: org.test, artifactId: child1)
- |
- + child2 (groupId: org.test, artifactId: child2)
----
-
- We can select <<just>> the child1 module using the following <<<moduleSet>>>:
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- [...]
- <moduleSet>
- <includes>
- <include>org.test:child1</include>
- </includes>
- </moduleSet>
- </moduleSets>
- [...]
-</assembly>
----
-
- <NOTE: It's important to remember that, if the child1 project itself had
- children, those children would not be included just because the child1 project
- was included. Each module is matched separately.>
-
-~~ [jdcasey] TODO: Amend this once we've handled the case where you want to process
-~~ the entire inheritance/dependency trail. We'll need a flag to say "Include
-~~ my ancestry when matching for includes/excludes", and have that apply
-~~ appropriately to the transitive dependency trail in a dependencySet, or a
-~~ module hierarchy in a moduleSet.
-
-* Quick Note on <<<outputFileNameMapping>>> within ModuleSets
-
- When used from within a <<<moduleSet>>>, all <<<outputFileNameMapping>>>
- configurations with expressions like <<<$\{artifactId\}>>> <extract information
- from the artifact in question.>
-
-** Example: Setting <<<outputFileNameMapping>>> from <<<moduleSet/binaries>>>
-
- Given a module with the following:
-
----
-Group Id: org.test
-Artifact Id: project
-Version: 1.0.1
-Type: jar
----
-
- The following <<<outputFileNameMapping>>>:
-
----
-${module.groupId}-${module.artifactId}-${module.version}.${module.extension}
----
-
- Will result in a file called <<<org.test-project-1.0.jar>>> being created
- within the assembly.
-
- <NOTE: The expression <<<$\{module.extension\}>>> is mapped to the file extension
- supplied by the ArtifactHandler for the type <<<jar>>>. It's important to
- remember that the file extension <<need not be .jar>>.>
-
-* {Including Module Sources}
-
- Once you've selected certain modules to be included in the assembly, you have
- to determine what you want included from each module. This usually depends on
- the purpose of the assembly. For instance, if you're building a binary
- assembly, for use in a runtime context, you probably want to include module
- binaries only (see the {{Including_Module_Binaries}} section below). However,
- if your assembly is meant to include project sources, either as a reference or
- to allow users to build your project (or for some other reason altogether),
- then you're probably interested in the <<<sources>>> section of the
- <<<moduleSet>>>.
-
- Processing module sources is a fileSet-based activity. That is, sources are
- included or excluded based on file-matching patterns, or explicit
- <<<fileSet>>> subsections. <<For backward compatibility only>>, the
- <<<\<sources/\>>>> section itself supports <<<includes>>> and <<<excludes>>>
- that can help determine which files from a module's directory should be
- processed. Starting in version 2.2 of the assembly plugin, the
- <<<\<sources/\>>>> section supports a <<<\<fileSets/\>>>> subsection, which is
- the preferred way of selecting module-source files for processing.
-
-** Example: including the <<<src>>> directory from each selected module
-
- In this example, we'll explore how to include the <<<src>>> directory <<only>>
- for each module selected by the moduleSet. This is useful to provide a source
- reference for your project to users.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- [...]
- <moduleSet>
- [...]
- <sources>
- <fileSets>
- <fileSet>
- <directory>src</directory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
----
-
-** Example: Including a buildable project directory for each selected module
-
- In this example, we'll explore how to include an entire buildable project
- directory, for each selected module, within your assembly. This is useful to
- give your users the chance to tinker with your project, then build it on their
- own.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- [...]
- <moduleSet>
- [...]
- <sources>
- <fileSets>
- <fileSet>
- <excludes>
- <exclude>target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
----
-
- <NOTE: We exclude the target directory, since this is assumed to be temporary
- storage for files produced during the course of a Maven build. Permanent
- project files are not meant to reside here...>
-
-** Consolidating All Module Sources into a Single Directory Structure
-
- Normally, each module processed by the assembly plugin is placed within its
- own directory structure inside the assembly root directory. For module
- sources, the default name of this module-specific directory is the module's
- <<<artifactId>>>.
-
- However, in some cases you may want to consolidate module sources into the
- same directory structure, based in the assembly root directory. To do this,
- simply set the <<<includeModuleDirectory>>> flag to <<<false>>>.
-
-*** Example: Copy all module sources into a single <<<src>>> directory
-
- When providing a source reference to users, you may want to produce a single,
- consolidated source directory containing all of the source files from your
- multimodule hierarchy.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- [...]
- <moduleSet>
- [...]
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <outputDirectory>src</outputDirectory>
- <includes>
- <include>src/**</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
----
-
-** Excluding Modules of Modules from Direct Assembly Processing
-
- When dealing with project sources in a complex multimodule build consisting of
- several layers of module groupings, it's sometimes desirable to process only
- the top layer of modules, and provide <<<fileSet>>> specifications to handle
- sub-modules. This can make it much easier to preserve the project-directory
- structure, since it doesn't force all modules - regardless of their location
- within the project hierarchy - through a flat module-processing mechanism.
- Processing only the first level of modules is the default configuration for
- the <<<sources>>> section of a <<<moduleSet>>>.
-
- To explicitly process modules of modules - sub-modules, that is - simply use
- the <<<excludeSubModuleDirectories>>> flag, set to <<<false>>>.
-
-*** Example: Providing a shallow source-directory structure for reference
-
- Consider the case where you want to preserve the context of all source files
- within your project hierarchy, according to the project in which they belong.
- At the same time, you want to avoid confusing users with a complex nesting of
- projects within projects, and present a simple list of projects to browse.
-
- If your project hierarchy looks like this:
-
----
-+ application
- |
- + src
- |
- + project1
- | |
- | + src
- | |
- | + project1-child1
- | | |
- | | + src
- | |
- | + project1-child2
- | | |
- | | + src
- |
- + project2
- |
- + src
- |
- + project2-child1
- |
- + src
----
-
- You may want it to look like this in the resulting assembly:
-
----
-+ application
-| |
-| + src
-|
-+ project1
-| |
-| + src
-|
-+ project1-child1
-| |
-| + src
-|
-+ project1-child2
-| |
-| + src
-|
-+ project2
-| |
-| + src
-|
-+ project2-child1
- |
- + src
----
-
- To accomplish this restructuring, simply use the
- <<<excludeSubModuleDirectories>>> flag, as follows:
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- [...]
- <moduleSet>
- [...]
- <sources>
- <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
- <fileSets>
- <fileSet>
- <includes>
- <include>src/**</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
----
-
-* {Including Module Binaries}
-
- *WARNING!* Using the <<<binaries>>> section of a <<<moduleSet>>> definition
- involves some tricky considerations that are a result of the way Maven
- sorts and executes project builds within a multimodule context. Please
- read {{{./faq.html#module-binaries}this FAQ entry}} if you decide to use them.
-
- In cases where your assembly artifact is meant to be used in a runtime
- context, you'll most likely want to include the binaries from any modules
- processed by the assembly plugin. This can be as simple as adding the module's
- jar artifact to your assembly archive; or, it can involve selectively
- including the dependencies of that module in addition to the module's own jar.
-
- At any rate, processing module binaries is an artifact-based activity.
- Accordingly, selection of the appropriate artifacts for a given module follows
- the artifact inclusion rules explained in the <<Advanced Assembly-Descriptor
- Topics>> document.
-
- Once you've selected <which> artifacts should be processed for a particular
- module, you have several options for <how> to process them. In its simplest
- form, the <<<binaries>>> section of a <<<moduleSet>>> has many of the same
- characteristics as a <<<dependencySet>>>. That is, you have the option to
- specify an <<<outputDirectory>>>, and you can choose whether to unpack the
- artifact(s) - the default action will unpack them.
-
-** Processing a Module's Attachment Artifacts
-
- Sometimes it's important to have the option to add artifacts from a module
- that are not the main project artifact. Such artifacts might include javadocs,
- project sources, or even other assembly artifacts.
-
-*** Example: Including other assemblies within the current assembly
-
- Suppose we have the following project structure:
-
----
-+ application
- |
- + app-db
- |
- + app-web
- |
- + app-site
----
-
- Further, suppose that the assembly plugin is currently executing at the
- <<<application>>> level, but that another assembly archive has been created
- previously for the <<<app-site>>> project. This other assembly archive is a
- zip file containing the project website. We want to include a copy of this
- website in the application distribution assembly, which we are creating now.
-
- Finally, suppose that the website-attachment has a classifier of <<<site>>>
- taken from the assemblyId.
-
- Since the zipfile containing the website produced by <<<app-site>>> is an
- attached artifact in that module, we'll need to extract that artifact instead
- of the main project artifact.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- <moduleSet>
- <includes>
- <include>*:app-site</include>
- </includes>
- <binaries>
- <attachmentClassifier>site</attachmentClassifier>
- <outputDirectory>doc</outputDirectory>
- <outputFileNameMapping>website.${module.extension}</outputFileNameMapping>
- </binaries>
- </moduleSet>
- [...]
- </moduleSets>
-</assembly>
----
-
-** Excluding Module Dependencies
-
- Just like any binary, modules usually have runtime dependencies, without which
- they will simply fail to execute. By default, module dependencies are included
- when the module itself is included. However, as we saw in the above example,
- there are times when this may not be appropriate.
-
- In the above example, the module binary included was an assembly artifact that
- contained the website for the application. Other assemblies might embody a
- completely self-contained version of the module's binaries, with all
- dependency classes unpacked and inlined within the archive.
-
- In short, sometimes we want to turn off automatic dependency inclusion. We can
- achieve this by setting the <<<includeDependencies>>> flag to <<<false>>>.
-
-*** Example: Including a <<<jar-with-dependencies>>> module assembly
-
- Suppose we have the following project structure:
-
----
-+ application
- |
- + app-db
- |
- + app-web
----
-
- Further, suppose that the assembly plugin is currently executing at the
- <<<app-web>>> level, but that another assembly archive has been created
- previously for the <<<app-db>>> project using the built-in
- <<<jar-with-dependencies>>> assembly descriptor. This assembly archive
- contains all of the module dependencies, so it's not necessary to include this
- module's dependencies in the current assembly.
-
----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- [...]
- <moduleSets>
- <moduleSet>
- <includes>
- <include>*:app-db</include>
- </includes>
- <binaries>
- <attachmentClassifier>jar-with-dependencies</attachmentClassifier>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}-${module.version}-${module.classifier}.${module.extension}</outputFileNameMapping>
- </binaries>
- </moduleSet>
- [...]
- </moduleSets>
-</assembly>
----
-
- <NOTE: The <<<binaries>>> section still accommodates direct <<<\<includes/\>>>>
- and <<<\<excludes/\>>>> subsections, for specifying which module-dependencies
- to include in the assembly. However, these are deprecated, and only provided
- for backward compatibility.>
diff --git a/maven-assembly-plugin-2.x/src/site/apt/descriptor-refs.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/descriptor-refs.apt.vm
deleted file mode 100644
index f2c5ff1..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/descriptor-refs.apt.vm
+++ /dev/null
@@ -1,96 +0,0 @@
- ------
- Predefined Assembly Descriptors
- ------
- Johnny R. Ruiz III <jruiz@exist.com>
- Edwin Punzalan
- John Casey
- ------
- 2011-02-07
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Pre-defined Descriptor Files
-
- As of version 2.2, there are four predefined descriptor formats available
- for reuse, packaged within the Assembly Plugin, instead of the original three.
- Their descriptorIds are:
-
-%{toc|fromDepth=2|toDepth=2}
-
-* bin
-
- Use <<<bin>>> as the <<<descriptorRef>>> of your assembly-plugin configuration
- in order to create a binary distribution archive of your project.
- This built-in descriptor produces an assembly with the classifier <<<bin>>>
- in three archive formats: tar.gz, tar.bz2, and zip.
-
- The assembled archive contains the binary JAR produced by running
- <<<mvn package>>> plus any README, LICENSE, and NOTICE files available in the
- project root directory.
-
- Below is the <<<bin>>> descriptor format:
-
-%{snippet|id=bin|file=target/classes/assemblies/bin.xml}
-
-* jar-with-dependencies
-
- Use <<<jar-with-dependencies>>> as the <<<descriptorRef>>> of your
- assembly-plugin configuration in order to create a JAR which contains
- the binary output of your project, along its the unpacked dependencies.
- This built-in descriptor produces an assembly with the classifier
- <<<jar-with-dependencies>>> using the JAR archive format.
-
- Note that <<<jar-with-dependencies>>> provides only basic support for uber-jars.
- For more control, use the
- {{{http://maven.apache.org/plugins/maven-shade-plugin/} Maven Shade Plugin}}.
-
- Below is the <<<jar-with-dependencies>>> descriptor format:
-
-%{snippet|id=jar-with-dependencies|file=target/classes/assemblies/jar-with-dependencies.xml}
-
-* src
-
- Use <<<src>>> as the <<<descriptorRef>>> in your assembly-plugin configuration
- to create source archives for your project. The archive will contain the
- contents of your project's <<</src>>> directory structure, for reference by
- your users. The <<<src>>> descriptorId produces an assembly archive with the
- classifier <<<src>>> in three formats: tar.gz, tar.bz2, and zip.
-
- Below is the <<<src>>> descriptor format:
-
-%{snippet|id=src|file=target/classes/assemblies/src.xml}
-
-* project
-
- (Since 2.2)
-
- Using the <<<project>>> <<<\<descriptorRef\>>>> in your Assembly Plugin
- configuration will produce an assembly containing your entire project, minus
- any build output that lands in the <<</target>>> directory. The resulting
- assembly should allow your users to build your project using Maven, Ant, or
- whatever build system you have configured in your project's normal SCM working
- directory. It produces assemblies with the classifier <<<project>>> in
- three archive formats: tar.gz, tar.bz2, and zip.
-
- The following is the assembly descriptor for the <<<project>>> descriptorRef:
-
-%{snippet|id=project|file=target/classes/assemblies/project.xml}
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/index.apt b/maven-assembly-plugin-2.x/src/site/apt/examples/index.apt
deleted file mode 100644
index 9789e3d..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/index.apt
+++ /dev/null
@@ -1,58 +0,0 @@
- ---
- Examples
- ---
- John Casey
- ---
- 2008-11-03
- ---
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Examples
-
-* Table of Contents
-
- Below, you will see a series of examples showing how to use the Assembly
- Plugin in various contexts.
-
- * {{{./single/index.html}Working with Single Projects}}
-
- * {{{./single/filtering-some-distribution-files.html}Filtering Some Distribution Files}}
-
- * {{{./single/including-and-excluding-artifacts.html}Including/Excluding Artifacts}}
-
- * {{{./single/using-components.html}Using Component Descriptors}}
-
- * {{{./single/using-repositories.html}Using Repositories}}
-
- []
-
- * {{{./multimodule/index.html}Working with Multi-Module Projects}}
-
- * {{{./multimodule/module-source-inclusion-simple.html}Adding Module Sources to the Assembly}}
-
- * {{{./multimodule/module-binary-inclusion-simple.html}Adding Module Binaries to the Assembly}}
-
- []
-
- * {{{./sharing-descriptors.html}Sharing Assembly Descriptors}}
-
- []
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/index.apt b/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/index.apt
deleted file mode 100644
index 119d028..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/index.apt
+++ /dev/null
@@ -1,41 +0,0 @@
- ---
- Multi-Module Examples
- ---
- Edwin Punzalan
- ---
- 24-July-2006
- ---
-
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Multi-Module Examples
-
- Multimodule Projects use \<moduleSets\> in their assemblies.
-
- The examples below may be able to help you when creating assemblies for your
- multimodule project.
-
- * {{{./module-source-inclusion-simple.html}Adding Module Sources to the Assembly}}
-
- * {{{./module-binary-inclusion-simple.html}Adding Module Binaries to the Assembly}}
-
- []
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
deleted file mode 100644
index 2537589..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
+++ /dev/null
@@ -1,244 +0,0 @@
- ------
- Including Module Binaries
- ------
- John Casey
- ------
- 05-May-2006
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Including Module Binaries
-
-* Warning
-
- <<Warning:>> Using the <<<binaries>>> section of a <<<moduleSet>>> definition
- involves some tricky considerations that are a result of the way Maven
- sorts and executes project builds within a multimodule context. Please
- read {{{../../faq.html#module-binaries}this FAQ entry}} if you decide to use them.
-
- <<NOTE:>> The new (since 2.2) <<<useAllReactorProjects>>> flag in the <<<moduleSet>>> section
- allows you to consume module binaries from child modules in a multimodule build. This
- is an important to resolve the conflict between Maven's build ordering and the old
- approach to module binaries, where the assembly was build from the parent POM.
- Please read the FAQ entry above for more information, and read the documentation
- below (carefully!) to see the new approach in action.
-
-* Introduction
-
- It is common practice to create an assembly using the parent POM of a
- multimodule build. At times, you may want to ensure that this assembly also
- includes one or more of the module binaries.
-
- This example demonstrates how to include the artifact and dependencies of a
- module, under the directory <<<modules/\<module-name\>>>>.
-
-* The Assembly Descriptor
-
- First, let's write an assembly descriptor to create this assembly. For the
- sake of clarity, this descriptor will be as simple as possible, only
- demonstrating the features described by this example.
-
-+---+
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>bin</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
-
- <!-- Enable access to all projects in the current multimodule build! -->
- <useAllReactorProjects>true</useAllReactorProjects>
-
- <!-- Now, select which projects to include in this module-set. -->
- <includes>
- <include>org.test:child1</include>
- </includes>
- <binaries>
- <outputDirectory>modules/${project.artifactId}</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
-+---+
-
- This descriptor states that the assembly id should be <<<bin>>>, that the
- output format is a directory, and that the contents of the assembly should
- <<not>> be contained within a directory named after the finalName of the
- top-level project.
-
- Furthermore, it states that we wish to include the artifact files for the module
- with a groupId of <<<org.test>>> and an artifactId of <<<child1>>>, along with
- its dependency artifacts. These artifacts should be contained within the
- directory structure <<<modules/child1>>> for this module, since the
- outputDirectory expression will be interpolated on a module-by-module basis.
-
- <<Finally>>, notice the <<new>> <<<useAllReactorProjects>>> flag. This enables
- access to all projects in the current reactor (multimodule build), even from
- a child module. Using this flag, it's now possible to use a child module - sorted
- to the end of the multimodule build process using appropriate dependency
- declarations - to generate an assembly containing module binaries.
-
-* The POM
-
- Now, let's review the POM configuration necessary to enable the building of
- this assembly via the <<<assembly:single>>> goal. First, let's look at the parent POM:
-
-+---+
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
-
- <packaging>pom</packaging>
-
- <name>Parent</name>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- <module>distribution</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
-+---+
-
- <<NOTE:>> The last module - <<<distribution>>> - is the child in which the assembly will be created.
-
- That POM looks like this:
-
-+---+
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>distribution</artifactId>
-
- <packaging>pom</packaging>
-
- <name>Distribution</name>
-
- <!-- NOTE: These dependency declarations are only required to sort this project to the
- end of the line in the multimodule build.
-
- Since we only include the child1 module in our assembly, we only need to ensure this
- distribution project builds AFTER that one...
- -->
- <dependencies>
- <dependency>
- <groupId>org.test</groupId>
- <artifactId>child1</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distro-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-+---+
-
- This POM directs the Assembly Plugin to execute the <<<single>>> goal when the build reaches the
- <<<package>>> phase, and tells it to use the <<<bin.xml>>> assembly descriptor when executing.
-
-* Execute!
-
- To build the assembly, we issue the following command:
-
-+---+
-mvn clean package
-+---+
-
- This will ensure that the output directory (normally, <<<target>>>), is
- removed before building the assembly directory.
-
- <<Note:>> Because of a quirk in Maven 2.0's execution model relating to
- aggregator goals and the inheritance hierarchy, we need to explicitly execute
- the package phase ahead of the assembly invocation, to ensure all modules have
- been built.
-
-* Examining the Output
-
- When the Maven execution completes, the following directory structure should
- be left. Remember, our assembly format was <<<dir>>>, which is why the output
- is a directory and not an archive of some sort.
-
- Here are the directory contents:
-
-+---+
-target/distribution/distribution-1.0-bin
-`-- modules
- `-- child1
- |-- child1-1.0.jar
- `-- junit-3.8.1.jar
-+---+
-
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
deleted file mode 100644
index 0f78341..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
+++ /dev/null
@@ -1,156 +0,0 @@
- ------
- Including Module Sources
- ------
- John Casey
- ------
- 05-May-2006
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Including Module Sources
-
-* Introduction
-
- It is common practice to create an assembly using the parent POM of a
- multimodule build. At times, you may want to ensure that this assembly also
- includes the source code from one or more of the modules in this build.
-
- This example demonstrates how to include the project sources from a module in
- the project assembly, under the directory <<<sources/\<module-name\>>>>.
-
-* The Assembly Descriptor
-
- First, let's write an assembly descriptor to create this assembly. For the
- sake of clarity, this descriptor will be as simple as possible, only
- demonstrating the features described by this example.
-
-+---+
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>src</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.test:child1</include>
- </includes>
- <sources>
- <outputDirectory>sources/${artifactId}</outputDirectory>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
-+---+
-
- This descriptor states that the assembly id should be <<<src>>>, that the
- output format is a directory, and that the contents of the assembly should
- <<not>> be contained within a directory named after the finalName of the
- top-level project.
-
- Furthermore, it states that we wish to include the source files for the module
- with a groupId of <<<org.test>>> and an artifactId of <<<child1>>>. These
- sources should be contained within the directory structure
- <<<sources/child1>>> for this module, since the outputDirectory expression
- will be interpolated on a module-by-module basis.
-
-* The POM
-
- Now, let's review the POM configuration necessary to enable the building of
- this assembly via the <assembly:directory> goal:
-
-+---+
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.test</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
-
- <packaging>pom</packaging>
-
- <name>Parent</name>
-
- <modules>
- <module>child1</module>
- <module>child2</module>
- <module>child3</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-+---+
-
- This POM simply directs the Assembly Plugin to use the <<<src.xml>>>
- assembly descriptor when executing.
-
-* Execute!
-
- To build the assembly, we issue the following command:
-
-+---+
-mvn clean assembly:directory
-+---+
-
- This will ensure that the output directory (normally, <<<target>>>), is
- removed before building the assembly directory.
-
-* Examining the Output
-
- When the Maven execution completes, the following directory structure should
- be left:
-
-+---+
-target/parent-1.0-src/
-`-- sources
- `-- child1
- |-- pom.xml
- `-- src
- |-- main
- | `-- java
- | `-- org
- | `-- test
- | `-- App.java
- `-- test
- `-- java
- `-- org
- `-- test
- `-- AppTest.java
-+---+
-
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/sharing-descriptors.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/examples/sharing-descriptors.apt.vm
deleted file mode 100644
index 3fa5ffa..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/sharing-descriptors.apt.vm
+++ /dev/null
@@ -1,156 +0,0 @@
- ------
- Sharing Assembly Descriptors
- ------
- Dennis Lundberg
- ------
- 2010-11-08
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Sharing Assembly Descriptors
-
- So you have created an assembly descriptor that you feel is so good that you
- want to share it between several of your projects. The simplest way to solve
- this problem is to create a separate project for your assembly descriptor.
- Let's call the project <my-assembly-descriptor>.
-
- <<Note:>> This example has been updated for version 2.2. The previous versions
- of this example were wrong. You must follow the steps below to make your
- shared assembly descriptors work with version 2.2 or later.
-
-* The Shared Assembly Descriptor Project
-
- Here's what the directory structure for that project looks like:
-
-+---+
-my-assembly-descriptor
- +-- src
- | `-- main
- | `-- resources
- | `-- assemblies
- | `-- myassembly.xml
- `-- pom.xml
-+---+
-
- There are just two files in this project: your assembly descriptor
- <<<myassembly.xml>>> and a <<<pom.xml>>>.
-
- <<Note:>> Your assembly descriptors must be in the directory
- <<</src/main/resources/assemblies>>> to be available to the Assembly Plugin.
-
- First let's check out the POM for the Shared Assembly Descriptor Project. It
- is quite simple:
-
-+---+
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>your.group.id</groupId>
- <artifactId>my-assembly-descriptor</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Shared Assembly Descriptor</name>
-</project>
-+---+
-
- Next let's look at our shared assembly descriptor. This is just an example.
- Replace it with the assembly descriptor you want to share.
-
-+---+
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>my-assembly-descriptor-id</id>
- <formats>
- <format>jar</format>
- </formats>
- <fileSets>
- <fileSet>
- <includes>
- <include>pom.xml</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
-+---+
-
- Run '<<<mvn install>>>' on this project to install the Shared Assembly
- Descriptor project into your local repository.
-
-
-* The Project Using the Shared Assembly Descriptor
-
- In the project that wants to use our Shared Assembly Descriptor, you need to
- add <<<my-assembly-descriptor>>> as a dependency on the Assembly Plugin. This
- makes our assembly descriptor available for the Assembly Plugin to use.
-
- <<Note:>> You need to use the file name of your assembly descriptor, without
- the xml file extension, in <<<\<descriptorRef\>>>>. You can not use the id of
- your assembly descriptor. The assembly descriptor used in this example have
- the file name <<<myassembly.xml>>>, but its id is
- <<<my-assembly-descriptor-id>>>. Therefor we use <<<myassembly>>> to reference
- that assembly descriptor.
-
-+---+
-<project>
- <groupId>your.group.id</groupId>
- <artifactId>my-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <modelVersion>4.0.0</modelVersion>
- ...
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <dependencies>
- <dependency>
- <groupId>your.group.id</groupId>
- <artifactId>my-assembly-descriptor</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <!-- This is where we use our shared assembly descriptor -->
- <descriptorRefs>
- <descriptorRef>myassembly</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- ...
- </plugins>
- </build>
- ...
-</project>
-+---+
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
deleted file mode 100644
index f18cab6..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
+++ /dev/null
@@ -1,186 +0,0 @@
- ------
- Filtering Some Distribution Files
- ------
- Edwin Punzalan
- ------
- 26-July-2006
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-
-Filtering Some Distribution Files
-
-* Introduction
-
- File filtering is used to substitute variable fields from inside a file to
- their represented values. For the Assembly Plugin, and most Maven filtering
- procedures, these variables are enclosed between $\{ and \}. For
- example, before a file is filtered, it contains <<<$\{project.artifactId\}>>>.
- But after filtering is complete, a new file is created with the project's
- <<<artifactId>>> substituting <<<$\{project.artifactId\}>>> and that this new
- file is used instead of the original one.
-
- Although filtering can be done during the process-resources phase, not all
- files going into your distribution will be coming from a project resource.
- Thus, the Assembly Plugin allows filtering of files before copying them into
- the created assembly.
-
- This example demonstrates how to filter files before adding them into the
- assembly. In this example, we need to filter distribution files into the
- archive. The files included in the distribution are:
-
- * README.txt
-
- * LICENSE.txt
-
- * NOTICE.txt
-
- []
-
- All the above files are in the root directory of the project but only the
- README and the NOTICE files should be filtered. The property file used to
- filter these are files is found in <<<src/assembly/filter.properties>>>.
-
- A property file is a file which contains the names of the variables and their
- corresponding string value. The format of its contents is identical to how Java
- Property files are saved. Below is an example of a property file:
-
-+---
-# lines beginning with the # sign are comments
-
-variable1=value1
-variable2=value2
-+---
-
-
-* The Assembly Descriptor
-
- Filtering is only enabled inside \<files\> so that's what we will use. Thus,
- our assembly descriptor will be:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>distribution</id>
- <formats>
- <format>jar</format>
- </formats>
- <files>
- <file>
- <source>README.txt</source>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>LICENSE.txt</source>
- <outputDirectory>/</outputDirectory>
- </file>
- <file>
- <source>NOTICE.txt</source>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
-+-----
-
- The above descriptor tells the Assembly Plugin to filter both the README.txt
- and the NOTICE.txt files and to just copy the LICENSE.txt file.
-
- Alternatively, if there are many .txt files to include inside \<files\>, we can
- setup both \<fileSets\> and \<files\> like so:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>distribution</id>
- <formats>
- <format>jar</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- <excludes>
- <exclude>README.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>README.txt</source>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>NOTICE.txt</source>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
-+-----
-
- The above descriptor adds all .txt files to the assembly but filters README.txt
- and NOTICE.txt files.
-
-
-* The POM
-
- The configuration of the Assembly Plugin inside pom.xml should not be
- different from the others, except for the configuration of the filter file, so:
-
-+-----
-<project>
- [...]
- <build>
- [...]
- <plugins>
- [...]
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <filters>
- <filter>src/assembly/filter.properties</filter>
- </filters>
- <descriptors>
- <descriptor>src/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- [...]
-</project>
-+-----
-
-* Generating The Assembly
-
- To generate the distribution assembly, we then use:
-
-+-----
-mvn assembly:assembly
-+-----
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/single/including-and-excluding-artifacts.apt b/maven-assembly-plugin-2.x/src/site/apt/examples/single/including-and-excluding-artifacts.apt
deleted file mode 100644
index 6b17ae4..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/single/including-and-excluding-artifacts.apt
+++ /dev/null
@@ -1,81 +0,0 @@
- ---
- Including and Excluding Artifacts
- ---
- Barrie Treloar
- ---
- 31-July-2006
- ---
-
-~~ Copyright 2006 The Apache Software Foundation.
-~~
-~~ Licensed under the Apache License, Version 2.0 (the "License");
-~~ you may not use this file except in compliance with the License.
-~~ You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-
-Including and Excluding Artifacts
-
- Currently the include/exclude format is based upon the dependency conflict id
- which has a form of: <<<groupId:artifactId:type:classifier>>>. A shortened
- form of the dependency conflict id may also be used <<<groupId:artifactId>>>.
-
- The check for inclusion/exclusion is done based on either the dependency
- conflict id or the shortened form as a <<<String.equals()>>> so it must
- be an identical match for it to be included or excluded. At present there is
- no support for regular expressions.
-
- This example excludes the log4j and commons-lang jar files from the assembly.
- This would be useful when you are building a super distribution assembly which
- contained sub distributions (i.e. other already assembled zips or tars) where
- in your pom you are depenedent upon those distributions. But because the
- distributions transitively depend upon the project's dependencies the assembly
- also includes the jar files (which are already in the assemblies and don't
- need to be duplicated)
-
- Your pom might include something like:
-
------
- <dependencies>
- <dependency>
- <groupId>YOUR GROUP</groupId>
- <artifactId>YOUR ARTIFACT</artifactId>
- <version>YOUR VERSION</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </dependency>
------
-
- And then in your assembly you exclude all the jar dependencies pulled in
- from the binary assembly. In this example the commons-lang and log4j jars
- are included unnecessarily (as they are in the bin.zip file already)
-
------
- <dependencySets>
- <dependencySet>
- ....
- <excludes>
- <exclude>commons-lang:commons-lang</exclude>
- <exclude>log4j:log4j</exclude>
- </excludes>
- </dependencySet>
- ....
- </dependencySets>
------
-
-* 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
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/single/index.apt b/maven-assembly-plugin-2.x/src/site/apt/examples/single/index.apt
deleted file mode 100644
index 691337a..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/single/index.apt
+++ /dev/null
@@ -1,42 +0,0 @@
- ---
- Single Project Examples
- ---
- Edwin Punzalan
- ---
- 24-July-2006
- ---
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Single Project Examples
-
- A Single Project is a project whose assemblies does not use \<moduleSets\>.
-
- The examples below may help you in creating assemblies for your single
- projects.
-
- * {{{./filtering-some-distribution-files.html}Filtering Some Distribution Files}}
-
- * {{{./including-and-excluding-artifacts.html}Including/Excluding Artifacts}}
-
- * {{{./using-components.html}Using Component Descriptors}}
-
- * {{{./using-repositories.html}Using Repositories}}
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/single/using-components.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/examples/single/using-components.apt.vm
deleted file mode 100644
index 40d256e..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/single/using-components.apt.vm
+++ /dev/null
@@ -1,199 +0,0 @@
- ------
- Using Component Descriptors
- ------
- Edwin Punzalan
- ------
- 24-July-2006
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Using Component Descriptors
-
-* Introduction
-
- Suppose you have a project which will be distributed in two forms: one for
- use with appserver A and another for appserver B. And as customization for
- these two servers, you need to exclude some dependencies which are not used
- by the appserver you will be distributing.
-
- <<NOTE:>> <Although putting \<excludes\> inside \<dependencySets\> may provide
- the result we want, it is not recommended because if a new appserver becomes
- available, you will have to maintain the excludes of the other distributions
- to exclude dependencies meant for the new appserver.>
-
- This example demonstrate the use of \<componentDescriptors\>, more information
- can be found {{{../../assembly.html}here}}.
-
-* The Assembly Descriptors
-
- First, let's write the assembly descriptor for appserver A distribution. It
- should like this:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>appserverA</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>application:logging</include>
- <include>application:core</include>
- <include>application:utils</include>
- <include>application:appserverA</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
-+-----
-
- The assembly descriptor for appserver B distribution would then be similar:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>appserverB</id>
- <formats>
- <format>zip</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>application:logging</include>
- <include>application:core</include>
- <include>application:utils</include>
- <include>application:appserverB</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
-+-----
-
- From the two descriptors shown, we can say that there are three artifacts
- common for both, thus we separate them into a common component descriptor
- and save it as <<<src/assembly/component.xml>>>. Its contents would
- be:
-
-+-----
-<component>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>application:logging</include>
- <include>application:core</include>
- <include>application:utils</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</component>
-+-----
-
- Then the final assembly descriptor for the appserver A would be:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>appserverA</id>
- <formats>
- <format>zip</format>
- </formats>
- <componentDescriptors>
- <componentDescriptor>src/assembly/component.xml</componentDescriptor>
- </componentDescriptors>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>application:appserverA</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
-+-----
-
- And the corresponding assembly descriptor for the appserver B then would be:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>appserverB</id>
- <formats>
- <format>zip</format>
- </formats>
- <componentDescriptors>
- <componentDescriptor>src/assembly/component.xml</componentDescriptor>
- </componentDescriptors>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>application:appserverB</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
-+-----
-
-* The POM
-
- Now we should update the POM configuration of the project for the Assembly
- Plugin, which should look like:
-
-+-----
-<project>
- [...]
- <build>
- [...]
- <plugins>
- [...]
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/appserverA-assembly.xml</descriptor>
- <descriptor>src/assembly/appserverB-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- [...]
-</project>
-+-----
-
-* Creating The Distributions
-
- Since we didn't configure the assembly plugin to always generate the
- configured assemblies during the project's normal build lifecycle, we create
- the distributions by:
-
-+-----
- mvn assembly:single
-+-----
diff --git a/maven-assembly-plugin-2.x/src/site/apt/examples/single/using-repositories.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/examples/single/using-repositories.apt.vm
deleted file mode 100644
index d44e170..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/examples/single/using-repositories.apt.vm
+++ /dev/null
@@ -1,131 +0,0 @@
- ------
- Using Repositories
- ------
- Edwin Punzalan
- ------
- 26-July-2006
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Using Repositories
-
-* Introduction
-
- The Assembly Plugin allows the inclusion of needed artifacts from your local
- repository to the generated archive. They are copied into the assembly in a
- directory similar to what's in your remote repository, complete with metadata
- and the checksums.
-
- This example demonstrates the creation of repository artifacts in an assembly
- so that the archive can easily be used to update an internal repository with
- the artifacts used by your project.
-
-* The Assembly Descriptor
-
- A functional repository archive for your project can be created with:
-
-+-----
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
- <id>repository</id>
- <formats>
- <format>jar</format>
- </formats>
- <repositories>
- <repository>
- <includeMetadata>true</includeMetadata>
- <outputDirectory>maven2</outputDirectory>
- </repository>
- </repositories>
-</assembly>
-+-----
-
- The above descriptor tells the Assembly Plugin to create a repository-like
- directory structure inside the <<<maven2>>> directory from within the
- generated archive. Setting <<<includeMetadata>>> to <<<true>>> will make the
- plugin to also copy metadata information into the generated archive.
-
-* The POM
-
- The pom.xml for your project is very similar to how you configure the Assembly
- Plugin for other distribution types.
-
-+-----
-<project>
- [...]
- <build>
- [...]
- <plugins>
- [...]
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/repository.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- [...]
-</project>
-+-----
-
-* Generating The Assembly Archive
-
- The assembly archive is then created using:
-
-+-----
-mvn assembly:assembly
-+-----
-
- The generated archive can be extracted to an internal repository so users of
- your project can download the dependencies from it.
-
-* Examining the Output
-
- When the Maven execution completes, the archive contents should be similar to:
-
-+-----
-target/artifactId-version-repository.jar
-`-- maven2
- |-- groupId
- | |-- maven-metadata.xml
- | |-- maven-metadata.xml.md5
- | |-- maven-metadata.xml.sha1
- | `-- artifactId
- | |-- maven-metadata.xml
- | |-- maven-metadata.xml.md5
- | |-- maven-metadata.xml.sha1
- | `-- version
- | |-- artifactId-version.jar
- | |-- artifactId-version.jar.md5
- | |-- artifactId-version.jar.sha1
- | |-- artifactId-version.pom
- | |-- artifactId-version.pom.md5
- | |-- artifactId-version.pom.sha1
- | |-- maven-metadata.xml
- | |-- maven-metadata.xml.md5
- | `-- maven-metadata.xml.sha1
- `-- groupId2
- `-- [...]
-+-----
diff --git a/maven-assembly-plugin-2.x/src/site/apt/features.apt b/maven-assembly-plugin-2.x/src/site/apt/features.apt
deleted file mode 100644
index ee25b5d..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/features.apt
+++ /dev/null
@@ -1,68 +0,0 @@
- ---
- Features
- ---
- John Casey
- ---
- 12-May-2006
- ---
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Features
-
- The current version of this plugin can be found {{{./project-summary.html}here}}.
-
- <NOTE: Features with no version information have been present since the first final release of the plugin.>
-
- * Inclusion of dependencies, modules <[2.1]>, file-sets, and individual files
-
- * Inclusion of project website documentation <[2.1]>
-
- * Flexible directory structures for assembly elements
-
- * All assembly inclusions controlled by include/exclude pattern sets
-
- * Option to unpack artifact files into the assembly <[deprecated in 2.2]>
-
- * Project modules can be included as source files or in binary form <[2.1]>
-
- * Reusable assembly-descriptor components <[2.1]>
-
- * Supported archive formats include: zip, tar, tar.gz (or tgz), tar.bz2 (or tbz2), jar, dir, war
- (and any other format that the ArchiveManager has been configured for).
-
-
- * Directory-only assemblies
-
- * Filtering and line-ending conversion for file-sets and individual files
-
- * Directory and file attributes (<modes>) <[2.1]>
-
- * Artifact filename mapping with expression support <[2.1]>
-
- * Descriptor interpolation using current project and other assembly descriptor information <[2.1]>
-
- * Embedded Maven repository creation with artifact version alignment <[2.1]>
-
- * Security / signature information stripped from embedded artifacts prior to inclusion <[2.1]>
-
- []
-
diff --git a/maven-assembly-plugin-2.x/src/site/apt/index.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/index.apt.vm
deleted file mode 100644
index d3d8f97..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,166 +0,0 @@
- ---
- Introduction
- ---
- John Casey
- Edwin Punzalan
- ---
- 2013-07-22
- ---
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-${project.name}
-
-* Introduction
-
- The Assembly Plugin for Maven is primarily intended to allow users to
- aggregate the project output along with its dependencies, modules, site
- documentation, and other files into a single distributable archive.
-
- Your project can build distribution "assemblies" easily, using one of the
- convenient, {{{./descriptor-refs.html}prefabricated assembly descriptors}}.
- These descriptors handle many common operations, such as packaging a project's
- artifact along with generated documentation into a
- {{{./descriptor-refs.html#bin}single zip archive}}.
- Alternatively, your project can provide its own {{{./assembly.html}descriptor}}
- and assume a much higher level of control over how dependencies, modules,
- file-sets, and individual files are packaged in the assembly.
-
- Currently it can create distributions in the following formats:
-
- * zip
-
- * tar
-
- * tar.gz (or tgz)
-
- * tar.bz2 (or tbz2)
-
- * jar
-
- * dir
-
- * war
-
- * and any other format that the ArchiveManager has been configured for
-
- If your project wants to package your artifact in an uber-jar, the assembly
- plugin provides only basic support. For more control, use the
- {{{http://maven.apache.org/plugins/maven-shade-plugin/} Maven Shade Plugin}}.
-
- To use the Assembly Plugin in Maven, you simply need to:
-
- * choose or write the assembly descriptor to use,
-
- * configure the Assembly Plugin in your project's <<<pom.xml>>>, and
-
- * run "mvn assembly:single" on your project.
-
- To write your own custom assembly, you will need to refer to the
- {{{./assembly.html}Assembly Descriptor Format}} reference.
-
-* What is an Assembly?
-
- An "assembly" is a group of files, directories, and dependencies that are
- assembled into an archive format and distributed. For example, assume that
- a Maven project defines a single JAR artifact that contains both a console
- application and a Swing application. Such a project could define two
- "assemblies" that bundle the application with a different set of supporting
- scripts and dependency sets. One assembly would be the assembly for the
- console application, and the other assembly could be a Swing application
- bundled with a slightly different set of dependencies.
-
- The Assembly Plugin provides a descriptor format which allows you to define
- an arbitrary assembly of files and directories from a project. For example,
- if your Maven project contains the directory "src/main/bin", you can
- instruct the Assembly Plugin to copy the contents of this directory to the
- "bin" directory of an assembly and to change the permissions of the files in
- the "bin" directory to UNIX mode 755. The parameters for configuring this
- behavior are supplied to the Assembly Plugin by way of the
- {{{./assembly.html}assembly descriptor}}.
-
-
-* Goals
-
- The main goal in the assembly plugin is the {{{./single-mojo.html}single}} goal. It is used to create all assemblies.
- <<All other goals are deprecated and will be removed in a future release.>>
-
- For more information about the goals that are available in the Assembly Plugin,
- see {{{./plugin-info.html}the plugin documentation page}}.
-
- Usage of the <<<assembly:assembly>>>, <<<assembly:attached>>>,
- <<<assembly:directory>>>, and <<<assembly:directory-inline>>> are <<deprecated>>,
- since they wreak havoc with normal build processes and promote non-standard
- build practices.
-
- The <<<assembly:single-directory>>> goal is redundant, and has been <<deprecated>>
- in favor of the <<<dir>>> assembly format.
-
- Finally, the <<<assembly:unpack>>> goal has been <<deprecated>> in favor of the far
- more comprehensive {{{http://maven.apache.org/plugins/maven-dependency-plugin/}Maven
- Dependency Plugin}}.
-
-
-* Assembly and Component Descriptor Schemas (XSD)
-
- * {{{http://maven.apache.org/xsd/assembly-1.1.3.xsd}http://maven.apache.org/xsd/assembly-1.1.3.xsd}},
- {{{http://maven.apache.org/xsd/component-1.1.3.xsd}http://maven.apache.org/xsd/component-1.1.3.xsd}} (for version 2.5.4 and higher)
- * {{{http://maven.apache.org/xsd/assembly-1.1.2.xsd}http://maven.apache.org/xsd/assembly-1.1.2.xsd}},
- {{{http://maven.apache.org/xsd/component-1.1.2.xsd}http://maven.apache.org/xsd/component-1.1.2.xsd}} (for version 2.2 and higher)
-
- * {{{http://maven.apache.org/xsd/assembly-1.1.1.xsd}http://maven.apache.org/xsd/assembly-1.1.1.xsd}},
- {{{http://maven.apache.org/xsd/component-1.1.1.xsd}http://maven.apache.org/xsd/component-1.1.1.xsd}} (for version 2.2-beta-4 - 2.2-beta-5)
-
- * {{{http://maven.apache.org/xsd/assembly-1.1.0.xsd}http://maven.apache.org/xsd/assembly-1.1.0.xsd}},
- {{{http://maven.apache.org/xsd/component-1.1.0.xsd}http://maven.apache.org/xsd/component-1.1.0.xsd}} (for version 2.2-beta-1 - 2.2-beta-3)
-
- * {{{http://maven.apache.org/xsd/assembly-1.0.0.xsd}http://maven.apache.org/xsd/assembly-1.0.0.xsd}},
- {{{http://maven.apache.org/xsd/component-1.0.0.xsd}http://maven.apache.org/xsd/component-1.0.0.xsd}} (for version 2.1 and lower)
-
- []
-
-
-* Usage
-
- General instructions on how to use the Assembly Plugin can be found on the {{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Assembly+Plugin}plugin's wiki page}}.
-
- In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
- free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
- already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
- the {{{./mail-lists.html}mail archive}}.
-
- If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our
- {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your
- concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason,
- entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated.
- Of course, patches are welcome, too. Contributors can check out the project from our
- {{{./source-repository.html}source repository}} and will find supplementary information in the
- {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
-
-
-* Examples
-
- To provide you with better understanding on some usages of the Assembly
- Plugin, you can take a look into the examples which can be found
- {{{./examples/index.html}here}}.
diff --git a/maven-assembly-plugin-2.x/src/site/apt/usage.apt.vm b/maven-assembly-plugin-2.x/src/site/apt/usage.apt.vm
deleted file mode 100644
index ca413df..0000000
--- a/maven-assembly-plugin-2.x/src/site/apt/usage.apt.vm
+++ /dev/null
@@ -1,265 +0,0 @@
- ------
- Usage
- ------
- John Casey
- ------
- 2011-02-07
- ------
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Usage
-
- To handle filtering this version of Maven Assembly Plugin uses
- {{{http://maven.apache.org/shared/maven-filtering/index.html}Maven Filtering}} ${mavenFilteringVersion}.
-
- To handle archiving this version of Maven Assembly Plugin uses
- {{{http://maven.apache.org/shared/maven-archiver/index.html}Maven Archiver}} ${mavenArchiverVersion}.
-
- This document is intended to provide instructions for using the
- maven-assembly-plugin. In order for this discussion to be useful, it's
- critical to cover two topics: configuration of the plugin - both inside the
- POM and, where possible, from the command line - and the different execution
- styles. For the sake of clarity, we'll cover configuration before execution.
-
-
-* Deprecation notice
-
- All goals except <<<assembly:single>>> have been <<deprecated>>. See the
- {{{./index.html}introduction page}} for more details.
-
-
-* Configuration
-
- Getting started with the Assembly Plugin is pretty simple. If you want to use
- one of the prefabricated assembly descriptors, you configure which descriptor
- to use with the \<<<<descriptorRefs\>>>>/\<<<<descriptorRef\>>>> parameter.
- If you want to use a custom assembly descriptor, you configure the path to your
- descriptor using the \<<<<descriptors\>>>>/\<<<<descriptor\>>>> parameter.
-
- Note that a single invocation of the Assembly Plugin can actually
- produce assemblies from multiple descriptors, allowing you maximum flexibility
- to customize the suite of binaries your project produces. When the assembly is
- created it will use the assemblyId as the artifact's classifier and will attach
- the created assembly to the project so that it will be uploaded into the repository
- on the install and deploy goals.
-
- For example, imagine that our project produces a JAR. If we want to create an
- assembly binary that includes our project's dependencies, we can take
- advantage of one of the Assembly Plugin's prefabricated descriptors. You
- configure it as follows in your project's <<<pom.xml>>>:
-
-+---+
-<project>
- [...]
- <build>
- [...]
- <plugins>
- <plugin>
- <!-- NOTE: We don't need a groupId specification because the group is
- org.apache.maven.plugins ...which is assumed by default.
- -->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- [...]
-</project>
-+---+
-
- Note that the Assembly Plugin allows you to specify multiple
- <<<descriptorRefs>>> at once, to produce multiple types of assemblies in a
- single invocation.
-
- Alternatively, we've created a custom assembly descriptor called
- <<<src.xml>>> in the <<<src/assembly>>> directory (see the
- {{{Resources}Resources}} section for more information). We can tell the
- Assembly Plugin to use that instead:
-
-+---+
-<project>
- [...]
- <build>
- [...]
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- [...]
-</project>
-+---+
-
- Again, note that we could specify multiple custom assembly descriptors here.
- Additionally, it's possible to specify a mixture of <<<descriptors>>> and
- <<<descriptorRefs>>> within the same configuration.
-
- <<Note:>> Many other configuration options are available for the various goals
- in the Assembly Plugin. For more information, see the
- {{{./examples/index.html}examples section}} or the {{{./plugin-info.html}plugin
- parameter documentation}}.
-
-
-* Execution: Building an Assembly
-
- Once you've configured the various <<<descriptors>>> and <<<descriptorRefs>>>
- for the assemblies you want the project to produce, it's time to build them.
-
- In most cases, you'll want to make sure your assemblies are created as part
- of your normal build process. This ensures the assembly archives are made
- available for installation and deployment, and that they are created during
- the release of your project. This is handled by the <<<assembly:single>>> goal.
-
- To bind the <<<single>>> goal to a project's build lifecycle, you can add
- this configuration (assuming you're using the <<<jar-with-dependencies>>>
- prefabricated descriptor):
-
-+---+
-<project>
- [...]
- <build>
- [...]
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- [...]
-</project>
-+---+
-
- Then, to create a project assembly, simple execute the normal <<<package>>>
- phase from the default lifecycle:
-
-+---+
-mvn package
-+---+
-
- When this build completes, you should see a file in the <<<target>>> directory with
- a name similar to the following:
-
-+---+
-target/sample-1.0-SNAPSHOT-jar-with-dependencies.jar
-+---+
-
- Notice the artifact classifier, between the end of the version and the
- beginning of the file extension, <<<jar-with-dependencies>>>. This is the
- <<<id>>> of the assembly descriptor used to create this artifact.
-
-** GOTCHA!
-
- In most cases, the <<<single>>> goal should be bound to the <<<package>>> phase
- of the build. However, if your assembly doesn't require binaries, or if you need
- to use one assembly as input for another, you may need to change this. While it's
- possible to assign the <<<single>>> goal to any phase of the build lifecycle, you should
- be careful to make sure the resources included in your assembly exist before that
- assembly is created.
-
-
-* Advanced Configuration
-
-** Creating an Executable JAR
-
- As you've no doubt noticed, the Assembly Plugin can be a very useful way to
- create a self-contained binary artifact for your project, among many other
- things. However, once you've created this self-contained JAR, you will
- probably want the ability to execute it using the <<<-jar>>> JVM switch.
-
- To accommodate this, the Assembly Plugin supports configuration of an
- <<<\<archive\>>>> element which is handled by <<<maven-archiver>>>
- (see {{{Resources}Resources}}). Using this
- configuration, it's easy to configure the <<<Main-Class>>> attribute of the
- JAR manifest:
-
-+---+
-<project>
- [...]
- <build>
- [...]
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- [...]
- <archive>
- <manifest>
- <mainClass>org.sample.App</mainClass>
- </manifest>
- </archive>
- </configuration>
- [...]
- </plugin>
- [...]
-</project>
-+---+
-
- If we add this configuration to the <<<single>>> goal example above and
- rebuild, we will see an entry like this in the <<<META-INF/MANIFEST.MF>>> file of
- the resulting JAR:
-
-+---+
-[...]
-Main-Class: org.sample.App
-+---+
-
- For more information on advanced configuration for the Assembly Plugin, see
- the {{{Resources}Resources}} section.
-
-** GOTCHA!
-
- At this point, only the <<<jar>>> and <<<war>>> assembly formats support the <<<\<archive\>>>>
- configuration element.
-
-
-* {Resources}
-
- [[1]] For more information on writing your own assembly descriptor, read the
- {{{./assembly.html}Assembly Descriptor}}
-
- [[2]] For more information about <<<maven-archiver>>>, look
- {{{http://maven.apache.org/shared/maven-archiver/index.html}here}}.
-
- [[3]] For more information on advanced <<<maven-assembly-plugin>>>
- configuration, see the {{{./examples/index.html}examples}}.
-
- []
diff --git a/maven-assembly-plugin-2.x/src/site/fml/faq.fml b/maven-assembly-plugin-2.x/src/site/fml/faq.fml
deleted file mode 100644
index 0423d1c..0000000
--- a/maven-assembly-plugin-2.x/src/site/fml/faq.fml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<faqs xmlns="http://maven.apache.org/FML/1.0.1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- id="FAQ" title="Frequently Asked Questions">
- <part id="General">
- <faq id="getting-started">
- <question>There seem to be a large number of mojos available in the assembly plugin. Which goal should I use to build my assembly?</question>
- <answer>
- <p>You should use the <code>single</code> mojo. All mojos except for <code>single</code> have been deprecated.</p>
- </answer>
- </faq>
- <faq id="deploy">
- <question>If the Assembly Plugin is run during the package phase, do my assemblies get deployed during the deploy phase?</question>
- <answer>
- <p>Yes. The assemblies created by the Assembly Plugin is attached to your project so it gets deployed too.</p>
- </answer>
- </faq>
- <faq id="classifier">
- <question>Can I use an artifact created by the assembly plugin as a dependency?</question>
- <answer>
- <p>Yes. You can refer to it using the id of the assembly as the dependency classifier.</p>
- </answer>
- </faq>
- <faq id="javadoc">
- <question>How do I use the Assembly Plugin to package my project's javadoc files?</question>
- <answer>
- <p>The Javadoc Plugin can generate the javadoc files of your projects. Also, the Javadoc Plugin can package them!</p>
- <p>Please see the <a href="http://maven.apache.org/plugins/maven-javadoc-plugin/">Javadoc Plugin Documentation</a>.</p>
- </answer>
- </faq>
- <faq id="inherit">
- <question>Starting with version 2.2 configuration/executions defined in a parent POM are no longer inherited, why?</question>
- <answer>
- <p>As part of the deprecation of all goals except for the <code>single</code> goal, the goals of the Assembly Plugin and their configuration/executions are no longer inherited by default.</p>
- <p>If you need the configuration/executions to be inherited you need to explicitly say so by adding a line to the plugin declaration in the parent POM:</p>
- <pre>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
- ...
- </pre>
- </answer>
- </faq>
- <faq id="shared-descriptor-bug">
- <question>
- In previous versions (before 2.2 final), I followed the example in the documentation for <a href="/examples/sharing-descriptors.html">sharing assembly descriptors</a>,
- which recommended using the <code><descriptors/></code> configuration section to refer to the shared assembly descriptor. As of version 2.2,
- <em>this no longer works</em>. Why not?
- </question>
- <answer>
- <p>The use of <code><descriptors/></code> was always incorrect, and counter to the design of this configuration parameter. Unfortunately,
- some code was introduced in version 2.2-beta-2 that allowed this parameter to reference descriptors on the classpath, instead of being forced to
- use <code><descriptorRefs/></code> as is the intention of the design. In version 2.2, this bug was fixed.
- </p>
- <p>It is important to note that the correct form, <code><descriptorRefs/<</code> has always worked, and continues to work. The documentation
- has now been fixed to reflect the correct configuration.
- </p>
- </answer>
- </faq>
- <faq id="binding">
- <question>What goal should I use to create an assembly as part of my normal build process?</question>
- <answer>
- <p>Use the <a href="single-mojo.html">single</a> goal.</p>
- <p><b>NOTE:</b> All other mojos have been deprecated, either because they can cause strange and unpredictable behavior in a variety of situations, or
- because they are redundant given the availability of the <code>dir</code> assembly format and the <code>maven-dependency-plugin</code>.
- </p>
- <p>Since the <a href="assembly-mojo.html">assembly</a>, <a href="attached-mojo.html">attached</a>, <a href="directory-mojo.html">directory</a>, and <a href="directory-inline-mojo.html">directory-inline</a> goals are all aggregators, they will execute at most once
- per execution of Maven. See <a href="http://docs.codehaus.org/display/MAVEN/Atypical+Plugin+Use+Cases">Atypical+Plugin+Use+Cases</a> (wiki) for more
- information on the problems associated with aggregator mojos.
- </p>
- </answer>
- </faq>
- <faq id="module-binaries">
- <question>The Assembly Plugin is saying it cannot find files for the module binaries included by my assembly descriptor. What gives?</question>
- <answer>
- <p><b>If your assembly includes module binaries, those binaries won't be available to the assembly plugin except in special cases.</b> This is normally seen
- when the Assembly Plugin is bound to a phase of the standard build lifecycle in the <b>parent POM</b> of a multimodule build.
- It is a result of the way Maven sorts and executes the build process for a multimodule project layout.
- </p>
- <p>In a multimodule hierarchy, when a child module declares the parent POM in its <parent/> section, Maven interprets this to mean that the parent
- project's build must be completed before the child build can start. This ensures that the parent project is in its final form by the time the child
- needs access to its POM information. In cases where the Assembly Plugin is included as part of that parent project's build process, it will execute
- along with everything else as part of the parent build - <b>before the child build can start</b>. If the assembly descriptor used in that parent build
- references module binaries, it effectively expects the child build to be completed <b>before the assembly is processed</b>. This leads to a recursive
- dependency situation, where the child build depends on the parent build to complete before it can start, while the parent build depends on the presence
- of child-module artifacts to complete successfully. Since these artifacts are missing, the Assembly Plugin will complain about missing artifacts, and
- the build will fail.
- </p>
- <p>In many cases, you can avoid this problem by adding a new child module whose sole purpose is to produce your assembly. In the POM for this new project,
- add dependency definitions for any of the module binaries you had previously referenced. This will ensure the new assembly child is built last.
- Then, move your assembly descriptor into this new child module. At this point, you have the option of either changing all moduleSet/binaries references
- to dependencySet references, <b>or you can keep the moduleSets and instead set the useAllReactorProjects flag to <i>true</i> for each moduleSet.</b>
- </p>
- <p>
- Obviously, any fileSet or file references you may have in this descriptor may need
- to be adjusted or have the files they reference moved into the new child module alongside the descriptor itself.
- </p>
- <p>In cases where you absolutely must use module-binaries references, you should create an assembly-child POM mentioned above, then insert
- <code><useAllReactorProjects>true<useAllReactorProjects></code> to each of your <code>moduleSet</code> sections. Then, bind the assembly
- in your assembly-child POM (normally to the <code>package</code> phase) using the <code>single</code> goal. When you execute the build from the top-level POM,
- Maven should generated your assembly in the new child project.
- </p>
- <p><b>NOTE:</b> The useAllReactorProjects flag is only available in version 2.2 and higher.</p>
- </answer>
- </faq>
- <faq id="required-classifiers">
- <question>
- In previous versions (before 2.2 final), leaving off the assembly id and leaving the classifier unconfigured resulted in the
- assembly being used as the project's main artifact. With the 2.2 release, this configuration results in a validation error.
- My project depended on the previous behavior! Why has this changed, and how can I make this work in my project?
- </question>
- <answer>
- <p>The assembly id is used for reporting and calculating descriptor/component merges. They're also required to avoid collisions with the
- main output of the project's build process. It's critical that this id be in place, to overriding the project's main artifact inadvertently,
- and to help error-reporting make sense to the user. <em>Leaving off the assembly id has always been an error</em>, but unfortunately previous
- releases contained a bug in the model that allowed empty or missing assembly id's. This bug has been fixed in version 2.2.
- </p>
- <p>However, in certain cases it makes sense to use the assembly output as the main project artifact. So, what's the correct approach in these
- situations? This use case is meant to require deliberate configuration, so your intention to depart from the normal behavior will be clear.
- To configure the use of the assembly output as the main project artifact, follow these steps:
- </p>
- <p>
- <ol>
- <li>Make sure your assembly only uses <b>one format</b>. More than one format could mean the assembly artifact used for the project's
- main artifact is non-deterministic.
- </li>
- <li>Add the configuration: <code><appendAssemblyId>false</appendAssemblyId></code> to your assembly-plugin execution.
- This will prevent the assembly artifact from simply being attached to the project.
- </li>
- </ol>
- </p>
- </answer>
- </faq>
- <faq id="dashClassifier">
- <question>
- I have a dependencySet that includes some artifacts with classifiers, and others without classifiers.
- How can I setup the file mappings to handle both cases appropriately?
- </question>
- <answer>
- <p>
- The best way to handle a mixed bag of dependencies with and without classifiers is to use the
- <b>${dashClassifier?}</b> expression, added in version 2.2-beta-2 of the assembly plugin especially
- for this purpose. This expression will determine whether each artifact has a classifier, and if it
- does, it will substitute the artifact's classifier - prepended by a dash - in place of the expression.
- </p>
- <p>
- For example, suppose you want to include two artifacts, commons-logging-1.0.4.jar, and
- yourserver-1.0-client.jar (where 'client' is the classifier of the second artifact). To do this,
- simply add the following to your dependencySet:
- </p>
- <pre>
-<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </pre>
- </answer>
- </faq>
- <faq id="outputFileNameMapping">
- <question>
- Which properties can be used in the outputFileNameMapping parameter.
- </question>
- <answer>
- <p>
- You can use :
- </p>
- <ul>
- <li>all system or maven properties available in your build with the syntax <code>${myProperty}</code>.</li>
- <li>all environment variables with <code>${env.XXX}</code> where <code>XXX</code> is the environment variable.</li>
- <li>the special <code>${dashClassifier?}</code> property (see above).</li>
- <li>all artifacts attributes (<a href="http://maven.apache.org/ref/3.0.4/maven-artifact/apidocs/org/apache/maven/artifact/Artifact.html"> from the Artifact class</a>) like :
- <ul>
- <li><code>${artifact.groupId}</code> : The artifact groupId.</li>
- <li><code>${artifact.artifactId}</code> : The artifact artifactId.</li>
- <li><code>${artifact.version}</code> : The artifact classifier.</li>
- <li><code>${artifact.baseVersion}</code> : The artifact base version (For a SNAPSHOT it will be always -SNAPSHOT and not its timestamp even if you didn't built it yourself).</li>
- <li><code>${artifact.classifier}</code> : The artifact classifier.</li>
- <li><code>${artifact.scope}</code> : The artifact scope.</li>
- <li>...</li>
- </ul>
- You can use <code>${module.XXXXX}</code> when using it for your project modules artifacts.
- </li>
- </ul>
- </answer>
- </faq>
- <faq id="tarFileModes">
- <question>
- Tar complains about groupid value being too big
- </question>
- <answer>
- <p>
- GNU tar has restrictions on max value of UID/GUID in tar files.
- Consider using the more well defined POSIX tar format, which should support
- larger values. Use tarLongFileMode=posix in the assembly:single goal.
- </p>
- </answer>
- </faq>
-
- </part>
-</faqs>
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-highLevel.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-highLevel.png
deleted file mode 100644
index a5c2bb8..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-highLevel.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-majorClasses.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-majorClasses.png
deleted file mode 100644
index ad7fe30..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-majorClasses.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Checked.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Checked.png
deleted file mode 100644
index 54e9f25..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Checked.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Collapsed.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Collapsed.png
deleted file mode 100644
index c339776..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Collapsed.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Expanded.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Expanded.png
deleted file mode 100644
index 1000f4b..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Expanded.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/LeafRowHandle.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/LeafRowHandle.png
deleted file mode 100644
index 6363375..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/LeafRowHandle.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Mixed.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Mixed.png
deleted file mode 100644
index e330499..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Mixed.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Unchecked.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Unchecked.png
deleted file mode 100644
index aba32d7..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/Unchecked.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/blank.png b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/blank.png
deleted file mode 100644
index 77b838e..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/blank.png
+++ /dev/null
Binary files differ
diff --git a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/index.html b/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/index.html
deleted file mode 100644
index 3356649..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/architecture/assembly-plugin-architecture-notes.html/index.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title></title>
-<style type="text/css">
-
- th {
- vertical-align: bottom;
-
- }
-
- td,th {
- /* Cheating here so we can get a default font and size. If it's set in the outline then it'll get redeclared below
- and overwritten (hopefully).
- */
- font-family: Helvetica, sans-serif;
- font-size: 12px;
-
-
- empty-cells: show;
- }
-
- /* Level Styles */
-
- .wholeDocument {
-
- }
-
- .columntitle {
- text-decoration: underline;font-weight: 900;
- }
-
- .level1 {
- color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;
- }
-
- .level2 {
- font-weight: 900;
- }
-
-
- td.subcell {
- border: none;
- }
-
- .indicator {
- white-space: nowrap;
- text-align:right;
- margin-right: 2px;
- vertical-align: top;
- padding-top: 3px;
- }
-
- table.subtable {
- }
-
- div.row {
- }
-
- .expanded {
- display: inline;
- }
- .collapsed {
- display: none;
- }
-
-
- .note {
-border: none;
-color:rgb(84,84,84) ; font-style: italic;font-size: 11px;
- }
-
-
- /* Total table width is 900
- Adjusted table width is 1035 */
-
- table.row {
- width: 1035px;
-
- }
-
-
- .col_width1 {
- width: 1035px; /* Actual width is 900 */
- }
-
- .col1 {
-
- }
-
- .ns-Highlight {
- background-color:rgb(253,255,89) ; }
-
- .ns-Citation {
- text-decoration: underline;}
-
- .ns-Emphasis {
- font-style: italic;}
-</style>
-</head>
-<body><table cellspacing="0">
-<tr><td class="col1 col_width1" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Mojos (org.apache.maven.plugin.assembly.mojo)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Uses:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyArchiver</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Provides:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> implementation of <span class=" ns-Citation">AssemblyConfigurationSource</span>, for use in assembly components<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyConfigurationSource</span> transports build state given by mojo parameters to deeper assembly components<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyArchiver</span> abstracts the business of creating the assembly artifact from the mojos<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> AssemblyArchiver (org.apache.maven.plugin.assembly.archive)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Uses:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArchiverManager</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> the set of <span class=" ns-Citation">ArchiveAssemblyPhase</span> implementations<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyDescriptorReader</span> and <span class=" ns-Citation">AssemblyInterpolator</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Provides:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> logic to discover and read assembly descriptors<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 77px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyDescriptorReader</span> and <span class=" ns-Citation">AssemblyInterpolator</span> help with this task<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> logic to discover and add filters that merge container descriptor files<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 77px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> these are implementations of <span class=" ns-Citation">ContainerDescriptorHandler</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">Archiver</span> instances are retrieved from the <span class=" ns-Citation">ArchiverManager</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">Archiver</span> instances are wrapped with <span class=" ns-Citation">AssemblyProxyArchiver</span>, which adds global prefixing, dry-run, and duplicate detection features<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArchiveAssemblyPhases</span> execute the actual interaction with the (proxied) <span class=" ns-Citation">Archiver</span> instance to produce the assembly<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyProxyArchiver</span> is the only one initialized as a POJO with the real <span class=" ns-Citation">Archiver</span> component instance passed into the constructor; all other classes used by the <span class=" ns-Citation">AssemblyArchiver</span> are components injected by Plexus<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArchiveAssemblyPhase</span> instances are injected via a Map which is keyed by their respective role-hints; I don't believe the ordering of keys in this map is deterministic.<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ContainerDescriptorHandler</span> instances are components that are injected via a Map which is keyed by their respective role-hints. Custom implementations can be added via the plugin-level dependency configuration in the pom.xml<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> ArchiverAssemblyPhase (org.apache.maven.plugin.assembly.archive.phase)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Default Implementations:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ModuleSetAssemblyPhase</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">DependencySetAssemblyPhase</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">FileSetAssemblyPhase</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">FileItemAssemblyPhase</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">RepositoryAssemblyPhase</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Uses:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArchiverTask</span> implementations, as POJOs<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">FileFormatter</span> (<span class=" ns-Citation">FileItemAssemblyPhase</span>)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">RepositoryAssembler</span> (from maven-repository-builder; used by <span class=" ns-Citation">RepositoryAssemblyPhase</span>)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Initialized as Plexus components<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> generally, each implementation handles one top-level section of the assembly descriptor<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> phases share common logic in terms of how they interact with the <span class=" ns-Citation">Archiver</span> instance; this is captured in different <span class=" ns-Citation">ArchiverTask</span> implementations<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> ArchiverTask (org.apache.maven.plugin.assembly.archive.task)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Default Implementations:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AddArtifactTask</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AddDependencySetsTask</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AddDirectoryTask</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AddFileSetsTask</span><br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Uses:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">DependencyResolver</span> (<span class=" ns-Citation">AddDependencySetsTask</span>)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">FileSetFormatter</span> (<span class=" ns-Citation">AddFileSetsTask</span>)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Used as POJOs that are initialized then executed by different <span class=" ns-Citation">ArchiverAssemblyPhase</span> instances.<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> ContainerDescriptorHandler (org.apache.maven.plugin.assembly.filter)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Added to the <span class=" ns-Citation">AssemblyProxyArchiver</span> as a filter and finalizer<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Ability to cherry-pick files before they're added to the assembly archive, and process them (processing usually means aggregation/merging, but could be anything)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Ability to add a set of "virtual" files to the assembly archive just before it is closed.<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ComponentsXmlArchiveFileFilter</span> (for plexus components.xml files) is always present during the assembly process.<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> DependencyResolver (org.apache.maven.plugin.assembly.artifact)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Uses:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArtifactFactory</span> from maven-artifact<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArtifactRepository</span> from maven-artifact<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">MavenProjectBuilder</span> from maven-project<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">ArtifactResolver</span> from maven-artifact<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">MavenMetadataSource</span>/<span class=" ns-Citation">ArtifactMetadataSource</span> from maven-project/maven-artifact<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Selects the best implementation of <span class=" ns-Citation">ArtifactResolver</span> it can find, based on a String-array of preferential role-hints. If none of the preferred resolvers can be found, it defaults to a lookup without any role-hint. This is necessary for compatibility with maven 2.0.x.<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> This component can take a List of remote repositories from the current build, append to this the List of remote repositories from the project passed in (avoiding duplicate entries, based on repository id), and use that as a basis for resolving dependency artifacts<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyConfigurationSource.isUseTransitiveDependencies()</span> is used in calling components to control whether this component (the resolver) does a full transitive resolution of the project's dependencies, or just resolves the direct dependency artifacts<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="color:rgb(161,100,45) ; background-color:rgb(191,191,191) ; font-weight: 800; font-size: 14px;"><div>
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> FileFormatter (org.apache.maven.plugin.assembly.format)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Uses:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> <span class=" ns-Citation">AssemblyFileUtils</span> for line-ending normalization and temp-dir/temp-file management<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Provides:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Interpolation of a given file's contents, based on project values and an optional Properties file or set of filter files (supplied by <span class=" ns-Citation">AssemblyConfigurationSource</span>)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Normalization of line endings, using values: keep (don't change), dos (\r\n), crlf (\r\n), unix (\n), lf (\n)<br>
-</div></td></tr>
-<tr><td class="col1 col_width1" style="font-weight: 900; "><div style="margin-left: 47px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="wedge" src="Expanded.png" title="collapse"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> Notes:<br>
-</div></td></tr>
-<tr><td class="col1 col_width1 altRow" style=""><div style="margin-left: 62px; text-indent: -32px;">
-<img border="0" hspace="3" vspace="0" alt="*" src="LeafRowHandle.png"><img border="0" hspace="2" vspace="0" alt=" " src="Unchecked.png"> If line ending is not 'keep', the final line in the file will <span style="font-weight: 900; ">always</span> end with a newline string, regardless of whether this is the case in the original file. See MASSEMBLY-96.<br>
-</div></td></tr>
-</table></body>
-</html>
diff --git a/maven-assembly-plugin-2.x/src/site/resources/download.cgi b/maven-assembly-plugin-2.x/src/site/resources/download.cgi
deleted file mode 100644
index 1b178d2..0000000
--- a/maven-assembly-plugin-2.x/src/site/resources/download.cgi
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Just call the standard mirrors.cgi script. It will use download.html
-# as the input template.
-exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/site/site.xml b/maven-assembly-plugin-2.x/src/site/site.xml
deleted file mode 100644
index d60e069..0000000
--- a/maven-assembly-plugin-2.x/src/site/site.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
- <body>
- <menu name="Reference">
- <item name="Features" href="./features.html"/>
- <item name="Descriptor Format" href="./assembly.html"/>
- <item name="Component Format" href="./component.html"/>
- <item name="Predefined Descriptors" href="./descriptor-refs.html"/>
- </menu>
-
- <menu name="Overview">
- <item name="Introduction" href="./index.html"/>
- <item name="Goals" href="./plugin-info.html"/>
- <item name="Usage" href="./usage.html"/>
- <item name="FAQ" href="./faq.html"/>
- <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
- <item name="License" href="http://www.apache.org/licenses/"/>
- <item name="Download" href="download.html"/>
- </menu>
-
- <menu name="Advanced Topics">
- <item name="Assembly Descriptors" href="./advanced-descriptor-topics.html"/>
- <item name="ModuleSets" href="./advanced-module-set-topics.html"/>
- </menu>
-
- <menu name="Examples">
- <item name="Examples Index" href="./examples/index.html"/>
- <item name="Single Project" collapse="false" href="./examples/single/index.html">
- <item name="Filtering Some Distribution Files" href="./examples/single/filtering-some-distribution-files.html"/>
- <item name="Including/Excluding Artifacts" href="./examples/single/including-and-excluding-artifacts.html"/>
- <item name="Using Component Descriptors" href="./examples/single/using-components.html"/>
- <item name="Using Repositories" href="./examples/single/using-repositories.html"/>
- </item>
- <item name="Multimodule Projects" collapse="false" href="./examples/multimodule/index.html">
- <item name="Include Module Artifacts" href="./examples/multimodule/module-binary-inclusion-simple.html"/>
- <item name="Include Module Sources" href="./examples/multimodule/module-source-inclusion-simple.html"/>
- </item>
- <item name="Sharing Assembly Descriptors" href="./examples/sharing-descriptors.html"/>
- </menu>
- </body>
-</project>
diff --git a/maven-assembly-plugin-2.x/src/site/xdoc/download.xml.vm b/maven-assembly-plugin-2.x/src/site/xdoc/download.xml.vm
deleted file mode 100644
index 7186d93..0000000
--- a/maven-assembly-plugin-2.x/src/site/xdoc/download.xml.vm
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<document>
- <properties>
- <title>Download ${project.name} Source</title>
- </properties>
- <body>
- <section name="Download ${project.name} ${project.version} Source">
-
- <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
- ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
-
- <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
- hours to reach all mirrors.<p/>
-
- <p>In order to guard against corrupted downloads/installations, it is highly recommended to
- <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
- of the release bundles against the public <a href="http://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
- developers.</p>
-
- <p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
-
- <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
-
- <a name="mirror"/>
- <subsection name="Mirror">
-
- <p>
- [if-any logo]
- <a href="[link]">
- <img align="right" src="[logo]" border="0"
- alt="logo"/>
- </a>
- [end]
- The currently selected mirror is
- <b>[preferred]</b>.
- If you encounter a problem with this mirror,
- please select another mirror.
- If all mirrors are failing, there are
- <i>backup</i>
- mirrors
- (at the end of the mirrors list) that should be available.
- </p>
-
- <form action="[location]" method="get" id="SelectMirror">
- Other mirrors:
- <select name="Preferred">
- [if-any http]
- [for http]
- <option value="[http]">[http]</option>
- [end]
- [end]
- [if-any ftp]
- [for ftp]
- <option value="[ftp]">[ftp]</option>
- [end]
- [end]
- [if-any backup]
- [for backup]
- <option value="[backup]">[backup] (backup)</option>
- [end]
- [end]
- </select>
- <input type="submit" value="Change"/>
- </form>
-
- <p>
- You may also consult the
- <a href="http://www.apache.org/mirrors/">complete list of
- mirrors.</a>
- </p>
-
- </subsection>
-
- <subsection name="${project.name} ${project.version}">
-
- <p>This is the current stable version of ${project.name}.</p>
-
- <table>
- <thead>
- <tr>
- <th></th>
- <th>Link</th>
- <th>Checksum</th>
- <th>Signature</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>${project.name} ${project.version} (Source zip)</td>
- <td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
- </tr>
- </tbody>
- </table>
- </subsection>
-
- <subsection name="Previous Versions">
-
- <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
-
- </subsection>
- </section>
- </body>
-</document>
-
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
deleted file mode 100644
index 764aba8..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
+++ /dev/null
@@ -1,641 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.Assert;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.mojos.AbstractAssemblyMojo;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.diags.NoOpArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.archiver.tar.TarArchiver;
-import org.codehaus.plexus.archiver.tar.TarLongFileMode;
-import org.codehaus.plexus.archiver.war.WarArchiver;
-import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.FileUtils;
-import org.easymock.classextension.EasyMockSupport;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-public class DefaultAssemblyArchiverTest
-{
-
- private static final TestFileManager fileManager = new TestFileManager( "def-assy-archiver.test.", "" );
-
- private PlexusContainer container;
-
- @Before
- public void setup()
- throws PlexusContainerException
- {
- container = new DefaultPlexusContainer();
- container.initialize();
- container.start();
- }
-
- @AfterClass
- public static void tearDown()
- throws Exception
- {
- fileManager.cleanUp();
- }
-
- @Test( expected = InvalidAssemblerConfigurationException.class )
- public void failWhenAssemblyIdIsNull()
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAssemblyArchiver macMgr = new MockAndControlForAssemblyArchiver( mm );
-
- final AssemblerConfigurationSource configSource = mm.createControl().createMock(
- AssemblerConfigurationSource.class );
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver archiver = createSubject( macMgr, null, null );
- archiver.createArchive( new Assembly(), "full-name", "zip", configSource, false );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateArchive()
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- IOException, DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAssemblyArchiver macMgr = new MockAndControlForAssemblyArchiver( mm );
-
- macMgr.expectGetArchiver( "zip", Archiver.class );
- macMgr.expectGetDestFile( new File( "test" ) );
-
- final AssemblyArchiverPhase phase = mm.createControl().createMock(AssemblyArchiverPhase.class );
-
- phase.execute( (Assembly)anyObject(), (Archiver)anyObject(), (AssemblerConfigurationSource)anyObject() );
-
- final AssemblerConfigurationSource configSource =
- mm.createControl().createMock( AssemblerConfigurationSource.class );
-
- final File tempDir = fileManager.createTempDir();
- FileUtils.deleteDirectory( tempDir );
-
- expect(configSource.getTemporaryRootDirectory()).andReturn( tempDir ).anyTimes();
- expect( configSource.isDryRun()).andReturn( false ).anyTimes();
- expect( configSource.isIgnoreDirFormatExtensions()).andReturn( false ).anyTimes();
-
- final File outDir = fileManager.createTempDir();
-
- macMgr.archiver.setDestFile( new File( outDir, "full-name.zip" ) );
-
- try
- {
- macMgr.archiver.createArchive();
- }
- catch ( final ArchiverException e )
- {
- fail( "Should never happen" );
- }
- catch ( final IOException e )
- {
- fail( "Should never happen" );
- }
-
- expect(configSource.getOutputDirectory()).andReturn( outDir );
- expect( configSource.getFinalName() ).andReturn( "finalName" );
- expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
- expect( configSource.getWorkingDirectory()).andReturn( new File( "." )).anyTimes();
- expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
- expect( configSource.isIgnorePermissions()).andReturn( false ).anyTimes();
-
- final Assembly assembly = new Assembly();
- assembly.setId( "id" );
-
- // try
- // {
- // expect( macMgr.dependencyResolver.resolve( (Assembly) anyObject(), (AssemblerConfigurationSource) anyObject() )).andReturn( new HashSet<Artifact>( ) );
-// macMgr.dependencyResolverControl.setMatcher( MockControl.ALWAYS_MATCHER );
- // }
- // catch ( final DependencyResolutionException e )
- // {
- // fail( "Should never happen" );
- // }
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject = createSubject( macMgr, Collections.singletonList( phase ), null );
-
- subject.createArchive( assembly, "full-name", "zip", configSource, false );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateArchiver_ShouldConfigureArchiver()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
-
- final TestArchiverWithConfig archiver = new TestArchiverWithConfig();
-
- macArchiverManager.expectGetArchiver( "dummy", archiver );
-
- final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class);
-
- final String simpleConfig = "value";
-
- expect( configSource.getArchiverConfig()).andReturn(
- "<configuration><simpleConfig>" + simpleConfig + "</simpleConfig></configuration>").anyTimes();
-
- final MavenProject project = new MavenProject( new Model() );
-
- expect(configSource.getProject()).andReturn( project ).anyTimes();
-
- expect(configSource.getMavenSession()).andReturn( null ).anyTimes();
-
- expect(configSource.isDryRun()).andReturn( false ).anyTimes();
-
- expect(configSource.getWorkingDirectory()).andReturn( new File( "." )).anyTimes();
-
- expect(configSource.isUpdateOnly()).andReturn( false ).anyTimes();
-
- final ArtifactRepository lr = mm.createMock( ArtifactRepository.class );
-
- expect(lr.getBasedir()).andReturn( "/path/to/local/repo" ).anyTimes();
-
- expect(configSource.getLocalRepository()).andReturn( lr ).anyTimes();
- expect( configSource.isIgnorePermissions() ).andReturn( true );
- setupInterpolators( configSource, project );
-
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
-
- subject.createArchiver( "dummy", false, "finalName", configSource, null, false );
-
- assertEquals( simpleConfig, archiver.getSimpleConfig() );
-
- mm.verifyAll();
- }
-
- public static void setupInterpolators( AssemblerConfigurationSource configSource )
- {
- expect( configSource.getRepositoryInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getCommandLinePropsInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getEnvInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getMainProjectInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
-
- }
-
- public static void setupInterpolators( AssemblerConfigurationSource configSource, MavenProject mavenProject )
- {
- expect( configSource.getRepositoryInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getCommandLinePropsInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getEnvInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getMainProjectInterpolator() ).andReturn( AbstractAssemblyMojo.mainProjectInterpolator( mavenProject) ).anyTimes();
-
- }
-
-
- @Test
- public void testCreateArchiver_ShouldCreateTarArchiverWithNoCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
-
- macArchiverManager.expectGetArchiver( "tar", ttArchiver );
-
- final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
-
- expect( configSource.getTarLongFileMode()).andReturn( TarLongFileMode.fail.toString()).anyTimes();
- expect( configSource.isDryRun()).andReturn( false ).anyTimes();
-
- expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
-
- expect( configSource.getProject()).andReturn( new MavenProject( new Model() ) ).anyTimes();
-
- expect( configSource.getJarArchiveConfiguration()).andReturn( null ).anyTimes();
-
- expect( configSource.getWorkingDirectory()).andReturn( new File( "." ) ).anyTimes();
-
- expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
-
- expect( configSource.isIgnorePermissions()).andReturn( true ).anyTimes();
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
-
- subject.createArchiver( "tar", false, "finalName", configSource, null, false );
-
- assertNull( ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateArchiver_ShouldCreateWarArchiverWithIgnoreWebxmlSetToFalse()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestWarArchiver twArchiver = new TestWarArchiver();
-
- final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
-
- macArchiverManager.expectGetArchiver( "war", twArchiver );
-
- final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
-
- expect( configSource.isDryRun()).andReturn( false ).anyTimes();
- expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
- expect( configSource.getMavenSession()).andReturn( null ).anyTimes();
- expect( configSource.getProject()).andReturn( new MavenProject( new Model() ) ).anyTimes();
- expect( configSource.getJarArchiveConfiguration()).andReturn( null ).anyTimes();
- expect( configSource.getWorkingDirectory()).andReturn( new File( "." ) ).anyTimes();
- expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
- expect( configSource.isIgnorePermissions()).andReturn( true ).anyTimes();
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
-
- subject.createArchiver( "war", false, null, configSource, null, false );
-
- assertFalse( twArchiver.ignoreWebxml );
- }
-
- @Test
- public void testCreateArchiver_ShouldCreateZipArchiver()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final ZipArchiver archiver = new ZipArchiver();
-
- final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
-
- macArchiverManager.expectGetArchiver( "zip", archiver );
-
- final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
-
- expect( configSource.isDryRun()).andReturn( false ).anyTimes();
- expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
- expect( configSource.getWorkingDirectory()).andReturn( new File( "." ) ).anyTimes();
- expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
- expect( configSource.getJarArchiveConfiguration()).andReturn( null ).anyTimes();
- expect( configSource.isIgnorePermissions()).andReturn( true ).anyTimes();
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
-
- subject.createArchiver( "zip", false, null, configSource, null, false );
- }
-
- @Test
- public void testCreateWarArchiver_ShouldDisableIgnoreWebxmlOption()
- throws NoSuchArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestWarArchiver twArchiver = new TestWarArchiver();
-
- final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
-
- macArchiverManager.expectGetArchiver( "war", twArchiver );
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
-
- subject.createWarArchiver();
-
- assertFalse( twArchiver.ignoreWebxml );
- }
-
- @Test
- public void testCreateTarArchiver_ShouldNotInitializeCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver);
-
- subject.createTarArchiver( "tar", TarLongFileMode.fail );
-
- assertNull( ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
- }
-
- private DefaultAssemblyArchiver createSubject(EasyMockSupport mm,
- TestTarArchiver ttArchiver) throws NoSuchArchiverException {
- final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
-
- macArchiverManager.expectGetArchiver( "tar", ttArchiver );
-
- mm.replayAll();
-
- return createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
- }
-
- @Test
- public void testCreateTarArchiver_TarGzFormat_ShouldInitializeGZipCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver);
-
- subject.createTarArchiver( "tar.gz", TarLongFileMode.fail );
-
- assertEquals( TarArchiver.TarCompressionMethod.gzip, ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateTarArchiver_TgzFormat_ShouldInitializeGZipCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver);
-
- subject.createTarArchiver( "tgz", TarLongFileMode.fail );
-
- assertEquals( TarArchiver.TarCompressionMethod.gzip, ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateTarArchiver_TarBz2Format_ShouldInitializeBZipCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver);
-
- subject.createTarArchiver( "tar.bz2", TarLongFileMode.fail );
-
- assertEquals( TarArchiver.TarCompressionMethod.bzip2, ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateTarArchiver_Tbz2Format_ShouldInitializeBZipCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver);
-
- subject.createTarArchiver( "tbz2", TarLongFileMode.fail );
-
- assertEquals( TarArchiver.TarCompressionMethod.bzip2, ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
- }
-
- @Test
- public void testCreateTarArchiver_InvalidFormat_ShouldFailWithInvalidCompression()
- throws NoSuchArchiverException, ArchiverException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final TestTarArchiver ttArchiver = new TestTarArchiver();
-
- final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver);
-
- try
- {
- subject.createTarArchiver( "tar.Z", null );
-
- fail( "Invalid compression formats should throw an error." );
- }
- catch ( final IllegalArgumentException e )
- {
- // expected.
- }
-
- mm.verifyAll();
- }
-
- private DefaultAssemblyArchiver createSubject( final MockAndControlForAssemblyArchiver macMgr,
- final List<AssemblyArchiverPhase> phases, Logger logger )
- {
- final DefaultAssemblyArchiver subject =
- new DefaultAssemblyArchiver( macMgr.archiverManager, phases );
-
- subject.setContainer( container );
-
- if ( logger == null )
- {
- logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- }
-
- subject.enableLogging( logger );
-
- return subject;
- }
-
- private final class MockAndControlForAssemblyArchiver
- {
- final ArchiverManager archiverManager;
-
-
- Archiver archiver;
-
- final DependencyResolver dependencyResolver;
-
- private final EasyMockSupport mm;
-
- public MockAndControlForAssemblyArchiver( final EasyMockSupport mm )
- {
- this.mm = mm;
- archiverManager = mm.createControl().createMock( ArchiverManager.class );
-
- dependencyResolver = mm.createControl().createMock( DependencyResolver.class );
-
- }
-
- void expectGetDestFile( final File file )
- {
- expect(archiver.getDestFile()).andReturn( file ).anyTimes();
- }
-
- void createArchiver( final Class<? extends Archiver> archiverClass )
- {
- archiver = mm.createControl().createMock(archiverClass);
-
- archiver.setForced( anyBoolean() );
- expectLastCall().anyTimes();
-
- archiver.setIgnorePermissions( false );
- expectLastCall().anyTimes();
- }
-
- void expectGetArchiver( final String format, final Class<? extends Archiver> archiverClass )
- {
- createArchiver( archiverClass );
-
- try
- {
- expect(archiverManager.getArchiver( format )).andReturn( archiver );
- }
- catch ( final NoSuchArchiverException e )
- {
- Assert.fail( "should never happen" );
- }
-
- }
-
- void expectGetArchiver( final String format, final Archiver archiver )
- throws NoSuchArchiverException
- {
- expect(archiverManager.getArchiver( format )).andReturn( archiver );
- }
- }
-
- private static final class TestTarArchiver
- extends TarArchiver
- {
-
- TarCompressionMethod compressionMethod;
-
- TarLongFileMode longFileMode;
-
- @Override
- protected void execute()
- throws ArchiverException, IOException
- {
- super.createArchive();
- }
-
- @Override
- public void setCompression( final TarCompressionMethod mode )
- {
- compressionMethod = mode;
- super.setCompression( mode );
- }
-
- @Override
- public void setLongfile( final TarLongFileMode mode )
- {
- longFileMode = mode;
- super.setLongfile( mode );
- }
-
- }
-
- private static final class TestWarArchiver
- extends WarArchiver
- {
-
- boolean ignoreWebxml;
-
- @Override
- public void setIgnoreWebxml( final boolean ignore )
- {
- ignoreWebxml = ignore;
- super.setIgnoreWebxml( ignore );
- }
-
- }
-
- public static final class TestArchiverWithConfig
- extends NoOpArchiver
- {
-
- private String simpleConfig;
-
- public String getSimpleConfig()
- {
- return simpleConfig;
- }
-
-
- public String getDuplicateBehavior()
- {
- return Archiver.DUPLICATES_ADD;
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
deleted file mode 100644
index 073a7e9..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.apache.maven.plugin.assembly.archive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.ArchiveFinalizer;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.util.IOUtil;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.util.Collections;
-
-public class ManifestCreationFinalizerTest
- extends TestCase
-{
-
- private final TestFileManager fileManager = new TestFileManager( "manifest-finalizer.test.", ".jar" );
-
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testShouldDoNothingWhenArchiveConfigIsNull()
- throws ArchiverException
- {
- new ManifestCreationFinalizer( null, null, null ).finalizeArchiveCreation( null );
- }
-
- public void testShouldDoNothingWhenArchiverIsNotJarArchiver()
- throws ArchiverException
- {
- EasyMockSupport mm = new EasyMockSupport();
-
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
-
- MavenProject project = new MavenProject( new Model() );
- MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-
- mm.replayAll();
-
- new ManifestCreationFinalizer( null, project, config ).finalizeArchiveCreation( macArchiver.archiver );
-
- mm.verifyAll();
- }
-
- public void testShouldAddManifestWhenArchiverIsJarArchiver()
- throws ArchiverException, IOException
- {
- MavenProject project = new MavenProject( new Model() );
- MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-
- File tempDir = fileManager.createTempDir();
-
- File manifestFile = fileManager.createFile( tempDir, "MANIFEST.MF", "Main-Class: Stuff\n" );
-
- config.setManifestFile( manifestFile );
-
- JarArchiver archiver = new JarArchiver();
-
- archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
- null,
- project,
- config ) ) );
-
- File file = fileManager.createTempFile();
-
- archiver.setDestFile( file );
-
- archiver.createArchive();
-
- URL resource = new URL( "jar:file:" + file.getAbsolutePath() + "!/META-INF/MANIFEST.MF" );
-
- BufferedReader reader = new BufferedReader( new InputStreamReader( resource.openStream() ) );
-
- StringWriter writer = new StringWriter();
-
- IOUtil.copy( reader, writer );
-
- assertTrue(writer.toString().contains("Main-Class: Stuff"));
-
- // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678
- ( (JarURLConnection) resource.openConnection() ).getJarFile().close();
- }
-
- public void testShouldAddManifestEntriesWhenArchiverIsJarArchiver()
- throws ArchiverException, IOException
- {
- MavenProject project = new MavenProject( new Model() );
- MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-
- String testKey = "Test-Key";
- String testValue = "test-value";
-
- config.addManifestEntry( testKey, testValue );
-
- JarArchiver archiver = new JarArchiver();
-
- archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
- null,
- project,
- config ) ) );
-
- File file = fileManager.createTempFile();
-
- archiver.setDestFile( file );
-
- archiver.createArchive();
-
- URL resource = new URL( "jar:file:" + file.getAbsolutePath() + "!/META-INF/MANIFEST.MF" );
-
- BufferedReader reader = new BufferedReader( new InputStreamReader( resource.openStream() ) );
-
- StringWriter writer = new StringWriter();
-
- IOUtil.copy( reader, writer );
-
- System.out.println( "Test Manifest:\n\n" + writer );
-
- assertTrue(writer.toString().contains(testKey + ": " + testValue));
-
- // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678
- ( (JarURLConnection) resource.openConnection() ).getJarFile().close();
- }
-
- private final class MockAndControlForArchiver
- {
- final Archiver archiver;
-
-
- MockAndControlForArchiver( EasyMockSupport mm )
- {
-
- archiver = mm.createMock(Archiver.class);
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
deleted file mode 100644
index 2fd1bb4..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.archiver;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import static org.easymock.EasyMock.anyObject;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.diags.TrackingArchiver;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.archiver.util.DefaultFileSet;
-import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.FileUtils;
-import org.easymock.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import javax.annotation.Nonnull;
-
-@SuppressWarnings("ResultOfMethodCallIgnored")
-public class AssemblyProxyArchiverTest
-{
-
- private static final TestFileManager fileManager = new TestFileManager( "massembly-proxyArchiver", "" );
-
- private static final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- @AfterClass
- public static void cleanupFiles()
- {
- fileManager.cleanUp();
- }
-
- @Test( timeout = 5000 )
- public void addFileSet_SkipWhenSourceIsAssemblyWorkDir()
- throws IOException, ArchiverException
- {
- final File sources = fileManager.createTempDir();
-
- final File workdir = new File( sources, "workdir" );
-
- final TrackingArchiver tracker = new TrackingArchiver();
- final AssemblyProxyArchiver archiver =
- new AssemblyProxyArchiver( "", tracker, null, null, null, workdir, logger );
-
- archiver.setForced( true );
-
- final DefaultFileSet fs = new DefaultFileSet();
- fs.setDirectory( workdir );
-
- archiver.addFileSet( fs );
-
- assertTrue( tracker.added.isEmpty() );
- }
-
- @Test( timeout = 5000 )
- public void addFileSet_addExcludeWhenSourceContainsAssemblyWorkDir()
- throws IOException, ArchiverException
- {
- final File sources = fileManager.createTempDir();
-
- final File workdir = new File( sources, "workdir" );
- workdir.mkdir();
-
- fileManager.createFile( sources, "test-included.txt", "This is included" );
- fileManager.createFile( workdir, "test-excluded.txt", "This is excluded" );
-
- final TrackingArchiver tracker = new TrackingArchiver();
- final AssemblyProxyArchiver archiver =
- new AssemblyProxyArchiver( "", tracker, null, null, null, workdir, logger );
-
- archiver.setForced( true );
-
- final DefaultFileSet fs = new DefaultFileSet();
- fs.setDirectory( sources );
-
- archiver.addFileSet( fs );
-
- assertEquals( 1, tracker.added.size() );
-
- final TrackingArchiver.Addition addition = tracker.added.get( 0 );
- assertNotNull( addition.excludes );
- assertEquals( 1, addition.excludes.length );
- assertEquals( workdir.getName(), addition.excludes[0] );
- }
-
- @Test
- public void addFile_NoPerms_CallAcceptFilesOnlyOnce()
- throws IOException, ArchiverException
- {
- EasyMockSupport mm = new EasyMockSupport();
- final Archiver delegate = mm.createMock(Archiver.class);
-
- delegate.addFile( (File)anyObject(), (String)anyObject() );
- EasyMock.expectLastCall().anyTimes();
-
- delegate.setForced(true);
- EasyMock.expectLastCall().anyTimes();
-
- final CounterSelector counter = new CounterSelector( true );
- final List<FileSelector> selectors = new ArrayList<FileSelector>();
- selectors.add( counter );
-
- mm.replayAll();
-
- final AssemblyProxyArchiver archiver =
- new AssemblyProxyArchiver( "", delegate, null, selectors, null, new File( "." ),
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- archiver.setForced( true );
-
- final File inputFile = fileManager.createTempFile();
-
- archiver.addFile( inputFile, "file.txt" );
-
- assertEquals( 1, counter.getCount() );
-
- mm.verifyAll();
- }
-
- @Test
- public void addDirectory_NoPerms_CallAcceptFilesOnlyOnce()
- throws IOException, ArchiverException
- {
- final Archiver delegate = new JarArchiver();
-
- final File output = fileManager.createTempFile();
-
- delegate.setDestFile( output );
-
- final CounterSelector counter = new CounterSelector( true );
- final List<FileSelector> selectors = new ArrayList<FileSelector>();
- selectors.add( counter );
-
- final AssemblyProxyArchiver archiver =
- new AssemblyProxyArchiver( "", delegate, null, selectors, null, new File( "." ),
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- archiver.setForced( true );
-
- final File dir = fileManager.createTempDir();
- FileUtils.cleanDirectory( dir );
- fileManager.createFile( dir, "file.txt", "This is a test." );
-
- archiver.addDirectory( dir );
-
- archiver.createArchive();
-
- assertEquals( 1, counter.getCount() );
- }
-
- private static final class CounterSelector
- implements FileSelector
- {
-
- private int count = 0;
-
- private boolean answer = false;
-
- public CounterSelector( final boolean answer )
- {
- this.answer = answer;
- }
-
- public int getCount()
- {
- return count;
- }
-
- public boolean isSelected( final @Nonnull FileInfo fileInfo )
- throws IOException
- {
- if ( fileInfo.isFile() )
- {
- count++;
- System.out.println( "Counting file: " + fileInfo.getName() + ". Current count: " + count );
- }
-
- return answer;
- }
-
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java
deleted file mode 100644
index a03a49a..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.codehaus.plexus.archiver.Archiver;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-public class AssemblyArchiverPhaseComparatorTest
-{
-
- class Basic implements AssemblyArchiverPhase {
- public void execute( Assembly assembly, Archiver archiver, AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
-
- }
- }
-
- class Ordered1 extends Basic implements PhaseOrder
- {
- public int order()
- {
- return 20;
- }
- }
-
- class Ordered2 extends Basic implements PhaseOrder
- {
- public int order()
- {
- return 30;
- }
- }
- class Unordered1 extends Basic
- {
- }
-
- class Unordered2 extends Basic
- {
- }
-
- @Test
- public void comparatorSortsCorrectly()
- throws Exception
- {
- List<AssemblyArchiverPhase> items = new ArrayList<AssemblyArchiverPhase>( );
- Unordered2 u2 = new Unordered2();
- items.add( u2 );
- Ordered2 o2 = new Ordered2();
- items.add( o2 );
- Ordered1 o1 = new Ordered1();
- items.add( o1 );
- Unordered1 u1 = new Unordered1();
- items.add( u1 );
- Collections.sort( items, new AssemblyArchiverPhaseComparator() );
- assertSame( u1, items.get( 0 ) );
- assertSame( u2, items.get(1) );
- assertSame( o1, items.get(2) );
- assertSame( o2, items.get(3) );
- }
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
deleted file mode 100644
index 430ea55..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-import org.easymock.classextension.EasyMockSupport;
-
-public class DependencySetAssemblyPhaseTest
- extends TestCase
-{
-
- final EasyMockSupport mm = new EasyMockSupport();
-
- public void testExecute_ShouldAddOneDependencyFromProject()
- throws AssemblyFormattingException, ArchiveCreationException, IOException,
- InvalidAssemblerConfigurationException, DependencyResolutionException
- {
- final String outputLocation = "/out";
-
- final MavenProject project = newMavenProject( "group", "project", "0" );
-
- final ArtifactMock projectArtifactMock = new ArtifactMock( mm, "group", "project", "0", "jar", false );
-
- project.setArtifact( projectArtifactMock.getArtifact() );
-
- final DependencySet ds = new DependencySet();
- ds.setUseProjectArtifact( false );
- ds.setOutputDirectory( outputLocation );
- ds.setOutputFileNameMapping( "${artifact.artifactId}" );
- ds.setUnpack( false );
- ds.setScope( Artifact.SCOPE_COMPILE );
- ds.setFileMode( Integer.toString( 10, 8 ) );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "test" );
- assembly.setIncludeBaseDirectory( false );
- assembly.addDependencySet( ds );
-
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, project );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false );
-
- System.out.println( "On test setup, hashcode for dependency artifact: " + artifactMock.getArtifact()
- .hashCode() );
-
- macTask.expectCSGetRepositories( null, null );
-
- macTask.expectGetDestFile( new File( "junk" ) );
-// macTask.expectAddFile( artifactFile, "out/dep", 10 );
-
- macTask.expectGetSession( null );
-
- project.setArtifacts( Collections.singleton( artifactMock.getArtifact() ) );
-
- macTask.expectCSGetFinalName( "final-name" );
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- final MavenProject depProject = newMavenProject( "group", "dep", "1" );
-
- macTask.expectBuildFromRepository( depProject );
-
- macTask.expectResolveDependencySets();
-
- mm.replayAll();
-
- createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
- private MavenProject newMavenProject( final String groupId, final String artifactId, final String version )
- {
- final Model model = new Model();
- model.setGroupId( groupId );
- model.setArtifactId( artifactId );
- model.setVersion( version );
-
- return new MavenProject( model );
- }
-
- public void testExecute_ShouldNotAddDependenciesWhenProjectHasNone()
- throws AssemblyFormattingException, ArchiveCreationException, IOException,
- InvalidAssemblerConfigurationException, DependencyResolutionException
- {
- final Assembly assembly = new Assembly();
-
- assembly.setId( "test" );
- assembly.setIncludeBaseDirectory( false );
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, null );
-
- macTask.expectResolveDependencySets();
-
- mm.replayAll();
-
- createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, null, macTask.configSource );
-
- mm.verifyAll();
- }
-
- private DependencySetAssemblyPhase createPhase( final MockAndControlForAddDependencySetsTask macTask,
- final Logger logger, DependencyResolver dr )
- {
- MavenProjectBuilder projectBuilder = null;
-
- if ( macTask != null )
- {
- projectBuilder = macTask.projectBuilder;
- }
-
- final DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( projectBuilder, dr, logger );
-
- phase.enableLogging( logger );
-
- return phase;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
deleted file mode 100644
index 33ef6ff..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
+++ /dev/null
@@ -1,500 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.FileItem;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.Os;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.easymock.EasyMock.anyInt;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class FileItemAssemblyPhaseTest
- extends TestCase
-{
-
- private final TestFileManager fileManager = new TestFileManager( "file-item-phase.test.", "" );
-
- @Override
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testExecute_ShouldAddNothingWhenNoFileItemsArePresent()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File basedir = fileManager.createTempDir();
-
- macCS.expectGetBasedir( basedir );
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- mm.replayAll();
-
- createPhase( macLogger.logger ).execute( assembly, null, macCS.configSource );
-
- mm.verifyAll();
- }
-
- public void testExecute_ShouldAddAbsoluteFileNoFilterNoLineEndingConversion()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File basedir = fileManager.createTempDir();
-
- final File file = fileManager.createFile( basedir, "file.txt", "This is a test file." );
-
- macCS.expectGetBasedir( basedir );
-
- macCS.expectGetProject( new MavenProject( new Model() ) );
-
- macCS.expectGetFinalName( "final-name" );
- macCS.expectInterpolators();
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
-
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final FileItem fi = new FileItem();
- fi.setSource( file.getAbsolutePath() );
- fi.setFiltered( false );
- fi.setLineEnding( "keep" );
- fi.setFileMode( "777" );
-
- macArchiver.expectAddFile( file,
- "file.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- assembly.addFile( fi );
-
- mm.replayAll();
-
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
-
- mm.verifyAll();
- }
-
- public void testExecute_ShouldAddRelativeFileNoFilterNoLineEndingConversion()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File basedir = fileManager.createTempDir();
-
- final File file = fileManager.createFile( basedir, "file.txt", "This is a test file." );
-
- macCS.expectGetBasedir( basedir );
-
- macCS.expectGetProject( new MavenProject( new Model() ) );
-
- macCS.expectGetFinalName( "final-name" );
- macCS.expectInterpolators();
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
-
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final FileItem fi = new FileItem();
- fi.setSource( "file.txt" );
- fi.setFiltered( false );
- fi.setLineEnding( "keep" );
- fi.setFileMode( "777" );
-
- macArchiver.expectAddFile( file,
- "file.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- assembly.addFile( fi );
-
- mm.replayAll();
-
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
-
- mm.verifyAll();
- }
-
- public void testExecute_WithOutputDirectory()
- throws Exception
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File basedir = fileManager.createTempDir();
-
- final File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
- final File licenseFile =
- fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
- final File configFile =
- fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
-
- macCS.expectGetBasedir( basedir );
-
- macCS.expectGetProject( new MavenProject( new Model() ) );
-
- macCS.expectGetFinalName( "final-name" );
- macCS.expectInterpolators();
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
- + "root-relative-reference (starting with slash) /" );
- }
- else
- {
- macLogger.logger.warn( (String)anyObject() );
- }
-
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
- assembly.setIncludeBaseDirectory( true );
-
- final FileItem readmeFileItem = new FileItem();
- readmeFileItem.setSource( "README.txt" );
- readmeFileItem.setOutputDirectory( "" );
- readmeFileItem.setFiltered( false );
- readmeFileItem.setLineEnding( "keep" );
- readmeFileItem.setFileMode( "777" );
-
- final FileItem licenseFileItem = new FileItem();
- licenseFileItem.setSource( "LICENSE.txt" );
- licenseFileItem.setOutputDirectory( "/" );
- licenseFileItem.setFiltered( false );
- licenseFileItem.setLineEnding( "keep" );
- licenseFileItem.setFileMode( "777" );
-
- final FileItem configFileItem = new FileItem();
- configFileItem.setSource( "config/config.txt" );
- configFileItem.setOutputDirectory( "config" );
- configFileItem.setFiltered( false );
- configFileItem.setLineEnding( "keep" );
- configFileItem.setFileMode( "777" );
-
- macArchiver.expectAddFile( readmeFile,
- "README.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( licenseFile,
- "LICENSE.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( configFile,
- "config/config.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- assembly.addFile( readmeFileItem );
- assembly.addFile( licenseFileItem );
- assembly.addFile( configFileItem );
-
- mm.replayAll();
-
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
-
- mm.verifyAll();
- }
-
- public void testExecute_WithOutputDirectoryAndDestName()
- throws Exception
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File basedir = fileManager.createTempDir();
-
- final File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
- final File licenseFile =
- fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
- final File configFile =
- fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
-
- macCS.expectGetBasedir( basedir );
-
- macCS.expectGetProject( new MavenProject( new Model() ) );
-
- macCS.expectGetFinalName( "final-name" );
- macCS.expectInterpolators();
-
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
- + "root-relative-reference (starting with slash) /" );
- }
- else
- {
- macLogger.logger.warn( (String)anyObject() );
- }
-
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
- assembly.setIncludeBaseDirectory( true );
-
- final FileItem readmeFileItem = new FileItem();
- readmeFileItem.setSource( "README.txt" );
- readmeFileItem.setOutputDirectory( "" );
- readmeFileItem.setDestName( "README_renamed.txt" );
- readmeFileItem.setFiltered( false );
- readmeFileItem.setLineEnding( "keep" );
- readmeFileItem.setFileMode( "777" );
-
- final FileItem licenseFileItem = new FileItem();
- licenseFileItem.setSource( "LICENSE.txt" );
- licenseFileItem.setOutputDirectory( "/" );
- licenseFileItem.setDestName( "LICENSE_renamed.txt" );
- licenseFileItem.setFiltered( false );
- licenseFileItem.setLineEnding( "keep" );
- licenseFileItem.setFileMode( "777" );
-
- final FileItem configFileItem = new FileItem();
- configFileItem.setSource( "config/config.txt" );
- configFileItem.setDestName( "config_renamed.txt" );
- configFileItem.setOutputDirectory( "config" );
- configFileItem.setFiltered( false );
- configFileItem.setLineEnding( "keep" );
- configFileItem.setFileMode( "777" );
-
- macArchiver.expectAddFile( readmeFile,
- "README_renamed.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( licenseFile,
- "LICENSE_renamed.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( configFile,
- "config/config_renamed.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- assembly.addFile( readmeFileItem );
- assembly.addFile( licenseFileItem );
- assembly.addFile( configFileItem );
-
- mm.replayAll();
-
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
-
- mm.verifyAll();
- }
-
- public void testExecute_WithOutputDirectoryAndDestNameAndIncludeBaseDirectoryFalse()
- throws Exception
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File basedir = fileManager.createTempDir();
-
- final File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
- final File licenseFile =
- fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
- final File configFile =
- fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
-
- macCS.expectGetBasedir( basedir );
-
- macCS.expectGetProject( new MavenProject( new Model() ) );
-
- macCS.expectGetFinalName( "final-name" );
- macCS.expectInterpolators();
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
-
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
- assembly.setIncludeBaseDirectory( false );
-
- final FileItem readmeFileItem = new FileItem();
- readmeFileItem.setSource( "README.txt" );
- readmeFileItem.setDestName( "README_renamed.txt" );
- readmeFileItem.setFiltered( false );
- readmeFileItem.setLineEnding( "keep" );
- readmeFileItem.setFileMode( "777" );
-
- final FileItem licenseFileItem = new FileItem();
- licenseFileItem.setSource( "LICENSE.txt" );
- licenseFileItem.setDestName( "LICENSE_renamed.txt" );
- licenseFileItem.setFiltered( false );
- licenseFileItem.setLineEnding( "keep" );
- licenseFileItem.setFileMode( "777" );
-
- final FileItem configFileItem = new FileItem();
- configFileItem.setSource( "config/config.txt" );
- configFileItem.setDestName( "config_renamed.txt" );
- configFileItem.setOutputDirectory( "config" );
- configFileItem.setFiltered( false );
- configFileItem.setLineEnding( "keep" );
- configFileItem.setFileMode( "777" );
-
- macArchiver.expectAddFile( readmeFile,
- "README_renamed.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( licenseFile,
- "LICENSE_renamed.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( configFile,
- "config/config_renamed.txt",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- assembly.addFile( readmeFileItem );
- assembly.addFile( licenseFileItem );
- assembly.addFile( configFileItem );
-
- mm.replayAll();
-
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
-
- mm.verifyAll();
- }
-
- private FileItemAssemblyPhase createPhase( final Logger logger )
- {
- final FileItemAssemblyPhase phase = new FileItemAssemblyPhase();
- phase.enableLogging( logger );
-
- return phase;
- }
-
- private final class MockAndControlForArchiver
- {
- final Archiver archiver;
-
- public MockAndControlForArchiver( final EasyMockSupport mockManager )
- {
- archiver = mockManager.createMock(Archiver.class);
- }
-
- public void expectAddFile( final File file, final String outputLocation, final int fileMode )
- {
- try
- {
- archiver.addResource( ( PlexusIoResource) anyObject(), (String) anyObject(), anyInt() );
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
- }
-
- private final class MockAndControlForConfigSource
- {
- final AssemblerConfigurationSource configSource;
-
- public MockAndControlForConfigSource( final EasyMockSupport mockManager )
- {
-
- configSource = mockManager.createMock(AssemblerConfigurationSource.class);
-
- expect(configSource.getMavenSession()).andReturn( null ).anyTimes();
- }
-
- public void expectGetProject( final MavenProject project )
- {
- expect(configSource.getProject()).andReturn( project ).atLeastOnce();
- }
-
- public void expectGetFinalName( final String finalName )
- {
- expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
- }
-
- public void expectInterpolators( )
- {
- expect(configSource.getCommandLinePropsInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes();
- expect(configSource.getEnvInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes();
- expect(configSource.getMainProjectInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes();
- }
-
-
- public void expectGetTemporaryRootDirectory( final File tempRoot )
- {
- expect( configSource.getTemporaryRootDirectory()).andReturn( tempRoot ).atLeastOnce();
- }
-
- public void expectGetBasedir( final File basedir )
- {
- expect( configSource.getBasedir()).andReturn( basedir ).atLeastOnce();
- }
-
- public void expectGetEncoding( )
- {
- expect( configSource.getEncoding()).andReturn( "UTF-8").atLeastOnce();
- }
-}
-
- private final class MockAndControlForLogger
- {
- final Logger logger;
-
- public MockAndControlForLogger( final EasyMockSupport mockManager )
- {
-
- logger = mockManager.createMock (Logger.class);
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
deleted file mode 100644
index d43ee79..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-import org.easymock.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class FileSetAssemblyPhaseTest
- extends TestCase
-{
-
- final EasyMockSupport mm = new EasyMockSupport();
-
- private final TestFileManager fileManager = new TestFileManager( "file-set-assembly.test.", "" );
-
- @Override
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testShouldNotFailWhenNoFileSetsSpecified()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final Assembly assembly = new Assembly();
-
- assembly.setId( "test" );
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger();
- final MockAndControlForAddFileSetsTask macTask =
- new MockAndControlForAddFileSetsTask( mm, fileManager );
-
- mm.replayAll();
-
- createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
- public void testShouldAddOneFileSet()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final Assembly assembly = new Assembly();
-
- assembly.setId( "test" );
- assembly.setIncludeBaseDirectory( false );
-
- final FileSet fs = new FileSet();
- fs.setOutputDirectory( "/out" );
- fs.setDirectory( "/input" );
- fs.setFileMode( "777" );
- fs.setDirectoryMode( "777" );
-
- assembly.addFileSet( fs );
-
- final MockAndControlForLogger macLogger = new MockAndControlForLogger();
- final MockAndControlForAddFileSetsTask macTask =
- new MockAndControlForAddFileSetsTask( mm, fileManager );
-
- macTask.expectGetArchiveBaseDirectory();
-
- final MavenProject project = new MavenProject( new Model() );
-
- macLogger.expectError( true, true );
-
- final int dirMode = Integer.parseInt( "777", 8 );
- final int fileMode = Integer.parseInt( "777", 8 );
-
- final int[] modes = { -1, -1, dirMode, fileMode };
-
- macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true );
-
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
- private FileSetAssemblyPhase createPhase( final MockAndControlForLogger macLogger )
- {
- final FileSetAssemblyPhase phase = new FileSetAssemblyPhase();
-
- phase.enableLogging( macLogger.logger );
-
- return phase;
- }
-
- private final class MockAndControlForLogger
- {
- final Logger logger;
-
- MockAndControlForLogger()
- {
- logger = mm.createMock(Logger.class);
- }
-
- public void expectDebug( final boolean debugCheck, final boolean debugEnabled )
- {
- if ( debugCheck )
- {
- expect( logger.isDebugEnabled()).andReturn( debugEnabled ).anyTimes();
- }
-
- logger.debug( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- }
- public void expectWarn( final boolean debugCheck, final boolean debugEnabled )
- {
- if ( debugCheck )
- {
- expect( logger.isDebugEnabled()).andReturn( debugEnabled ).anyTimes();
- }
-
- logger.debug( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- logger.warn( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- }
- public void expectError( final boolean debugCheck, final boolean debugEnabled )
- {
- if ( debugCheck )
- {
- expect( logger.isDebugEnabled()).andReturn( debugEnabled ).anyTimes();
- }
-
- logger.debug( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- logger.warn( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- logger.error( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- }
-
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
deleted file mode 100644
index ce33498..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
+++ /dev/null
@@ -1,896 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.model.ModuleBinaries;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-import org.apache.maven.plugin.assembly.model.ModuleSources;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import static java.util.Collections.singleton;
-
-
-@SuppressWarnings( "OctalInteger" )
-public class ModuleSetAssemblyPhaseTest
- extends TestCase
-{
-
- private final TestFileManager fileManager = new TestFileManager( "module-set-phase.test.", "" );
-
- private final Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
-
- @Override
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchOutputDir()
- {
- final ModuleSources sources = new ModuleSources();
- sources.setOutputDirectory( "outdir" );
-
- final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
-
- assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
- }
-
- public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchInclude()
- {
- final ModuleSources sources = new ModuleSources();
- sources.addInclude( "**/included.txt" );
-
- final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
-
- assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
- }
-
- public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchExclude()
- {
- final ModuleSources sources = new ModuleSources();
- sources.addExclude( "**/excluded.txt" );
-
- final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
-
- assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
- }
-
- public void testIsDeprecatedModuleSourcesConfigPresent_ShouldNotCatchFileMode()
- {
- final ModuleSources sources = new ModuleSources();
- sources.setFileMode( "777" );
-
- final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
-
- assertFalse( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
- }
-
- public void testIsDeprecatedModuleSourcesConfigPresent_ShouldNotCatchDirMode()
- {
- final ModuleSources sources = new ModuleSources();
- sources.setDirectoryMode( "777" );
-
- final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
-
- assertFalse( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
- }
-
- public void testCreateFileSet_ShouldUseModuleDirOnlyWhenOutDirIsNull()
- throws AssemblyFormattingException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final Model model = new Model();
- model.setArtifactId( "artifact" );
-
- final MavenProject project = new MavenProject( model );
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
-
- macTask.expectGetFinalName( null );
-
- final FileSet fs = new FileSet();
-
- final ModuleSources sources = new ModuleSources();
- sources.setIncludeModuleDirectory( true );
-
- final File basedir = fileManager.createTempDir();
-
- final MavenProject artifactProject = new MavenProject( new Model() );
-
- artifactProject.setFile( new File( basedir, "pom.xml" ) );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
-
- artifactProject.setArtifact( artifactMock.getArtifact() );
-
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final FileSet result =
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
- artifactProject,
- macTask.configSource );
-
- assertEquals( "artifact/", result.getOutputDirectory() );
-
- mm.verifyAll();
- }
-
- public void testCreateFileSet_ShouldPrependModuleDirWhenOutDirIsProvided()
- throws AssemblyFormattingException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final Model model = new Model();
- model.setArtifactId( "artifact" );
-
- final MavenProject project = new MavenProject( model );
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
-
- macTask.expectGetFinalName( null );
-
- final FileSet fs = new FileSet();
- fs.setOutputDirectory( "out" );
-
- final ModuleSources sources = new ModuleSources();
- sources.setIncludeModuleDirectory( true );
-
- final MavenProject artifactProject = new MavenProject( new Model() );
-
- final File basedir = fileManager.createTempDir();
-
- artifactProject.setFile( new File( basedir, "pom.xml" ) );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
-
- artifactProject.setArtifact( artifactMock.getArtifact() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final FileSet result =
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
- artifactProject,
- macTask.configSource );
-
- assertEquals( "artifact/out/", result.getOutputDirectory() );
-
- mm.verifyAll();
- }
-
- public void testCreateFileSet_ShouldAddExcludesForSubModulesWhenExcludeSubModDirsIsTrue()
- throws AssemblyFormattingException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
-
- macTask.expectGetFinalName( null );
-
- final FileSet fs = new FileSet();
-
- final ModuleSources sources = new ModuleSources();
- sources.setExcludeSubModuleDirectories( true );
-
- final Model model = new Model();
- model.setArtifactId( "artifact" );
-
- model.addModule( "submodule" );
-
- final MavenProject project = new MavenProject( model );
-
- final File basedir = fileManager.createTempDir();
-
- project.setFile( new File( basedir, "pom.xml" ) );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
-
- project.setArtifact( artifactMock.getArtifact() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final FileSet result =
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources, project,
- macTask.configSource );
-
- assertEquals( 1, result.getExcludes()
- .size() );
- assertEquals( "submodule/**", result.getExcludes()
- .get( 0 ) );
-
- mm.verifyAll();
- }
-
- public void testExecute_ShouldSkipIfNoModuleSetsFound()
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
- final Assembly assembly = new Assembly();
- assembly.setIncludeBaseDirectory( false );
-
- createPhase( null, null ).execute( assembly, null, null );
- }
-
- public void testExecute_ShouldAddOneModuleSetWithOneModuleInIt()
- throws ArchiveCreationException, AssemblyFormattingException, IOException,
- InvalidAssemblerConfigurationException, DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
-
- final MavenProject module = createProject( "group", "module", "version", project );
-
- final ArtifactMock moduleArtifactMock = new ArtifactMock( mm, "group", "module", "version", "jar", false );
- final File moduleArtifactFile = moduleArtifactMock.setNewFile();
- module.setArtifact( moduleArtifactMock.getArtifact() );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>();
-
- projects.add( module );
-
- macTask.expectGetReactorProjects( projects );
- macTask.expectGetFinalName( "final-name" );
- macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectGetMode( 0777, 0777 );
-
-
- final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- macTask.expectAddFile( moduleArtifactFile, "out/artifact", mode );
-
- final Assembly assembly = new Assembly();
- assembly.setIncludeBaseDirectory( false );
-
- final ModuleSet ms = new ModuleSet();
-
- final ModuleBinaries bin = new ModuleBinaries();
-
- bin.setOutputFileNameMapping( "artifact" );
- bin.setOutputDirectory( "out" );
- bin.setFileMode( "777" );
- bin.setUnpack( false );
- bin.setIncludeDependencies( false );
-
- ms.setBinaries( bin );
-
- assembly.addModuleSet( ms );
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- macTask.expectResolveDependencySets();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final ModuleSetAssemblyPhase phase = createPhase( logger, macTask.dependencyResolver, null);
- phase.execute( assembly, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
- public void testAddModuleBinaries_ShouldReturnImmediatelyWhenBinariesIsNull()
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
- DependencyResolutionException
- {
- createPhase( null, null ).addModuleBinaries( null, null, null, null, null, null );
- }
-
- public void testAddModuleBinaries_ShouldFilterPomModule()
- throws ArchiveCreationException, AssemblyFormattingException, IOException,
- InvalidAssemblerConfigurationException, DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
-
- final ModuleBinaries binaries = new ModuleBinaries();
-
- binaries.setUnpack( false );
- binaries.setFileMode( "777" );
- binaries.setOutputDirectory( "out" );
- binaries.setOutputFileNameMapping( "artifact" );
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
- project.setPackaging( "pom" );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "pom", false );
- project.setArtifact( artifactMock.getArtifact() );
-
- final Set<MavenProject> projects = singleton( project );
-
- mm.replayAll();
-
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( null, null, binaries,
- projects,
- macTask.archiver,
- macTask.configSource );
-
- mm.verifyAll();
- }
-
- public void testAddModuleBinaries_ShouldAddOneModuleAttachmentArtifactAndNoDeps()
- throws ArchiveCreationException, AssemblyFormattingException, IOException,
- InvalidAssemblerConfigurationException, DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", "test", false );
- final File artifactFile = artifactMock.setNewFile();
-
- macTask.expectGetFinalName( "final-name" );
- macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectGetMode( 0222, 0222 );
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- final ModuleBinaries binaries = new ModuleBinaries();
-
- binaries.setIncludeDependencies( false );
- binaries.setUnpack( false );
- binaries.setFileMode( "777" );
- binaries.setOutputDirectory( "out" );
- binaries.setOutputFileNameMapping( "artifact" );
- binaries.setAttachmentClassifier( "test" );
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
- project.addAttachedArtifact( artifactMock.getArtifact() );
-
- final Set<MavenProject> projects = singleton( project );
-
- macTask.expectResolveDependencySets();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
- public void testAddModuleBinaries_ShouldFailWhenOneModuleDoesntHaveAttachmentWithMatchingClassifier()
- throws ArchiveCreationException, AssemblyFormattingException, IOException, DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", "test", false );
- artifactMock.setNewFile();
-
- final ModuleBinaries binaries = new ModuleBinaries();
-
- binaries.setUnpack( false );
- binaries.setFileMode( "777" );
- binaries.setOutputDirectory( "out" );
- binaries.setOutputFileNameMapping( "artifact" );
- binaries.setAttachmentClassifier( "test" );
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
- project.setArtifact( artifactMock.getArtifact() );
-
- final Set<MavenProject> projects = singleton( project );
-
- mm.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- try
- {
- createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource );
-
- fail( "Should throw an invalid configuration exception because of module with missing attachment." );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- // should throw this because of missing attachment.
- }
-
- mm.verifyAll();
- }
-
- public void testAddModuleBinaries_ShouldAddOneModuleArtifactAndNoDeps()
- throws ArchiveCreationException, AssemblyFormattingException, IOException,
- InvalidAssemblerConfigurationException, DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
- final File artifactFile = artifactMock.setNewFile();
-
- macTask.expectGetFinalName( "final-name" );
- macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macTask.expectGetMode( 0222, 0222 );
-
- final ModuleBinaries binaries = new ModuleBinaries();
-
- binaries.setIncludeDependencies( false );
- binaries.setUnpack( false );
- binaries.setFileMode( "777" );
- binaries.setOutputDirectory( "out" );
- binaries.setOutputFileNameMapping( "artifact" );
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
- project.setArtifact( artifactMock.getArtifact() );
-
- final Set<MavenProject> projects = singleton( project );
-
- macTask.expectResolveDependencySets();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
-
- public void testAddModuleArtifact_ShouldThrowExceptionWhenArtifactFileIsNull()
- throws AssemblyFormattingException, IOException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "type", false );
- artifactMock.setNullFile();
-
- mm.replayAll();
-
- try
- {
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(),
- null, null, null,
- null );
-
- fail( "Expected ArchiveCreationException since artifact file is null." );
- }
- catch ( final ArchiveCreationException e )
- {
- // expected
- }
-
- mm.verifyAll();
- }
-
- public void testAddModuleArtifact_ShouldAddOneArtifact()
- throws AssemblyFormattingException, IOException, ArchiveCreationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "type", false );
- final File artifactFile = artifactMock.setNewFile();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
- project.setArtifact( artifactMock.getArtifact() );
-
- macTask.expectGetFinalName( "final-name" );
- macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectGetMode( 0222, 0222 );
-
-
- macTask.expectAddFile( artifactFile, "out/artifact",
- TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- final ModuleBinaries binaries = new ModuleBinaries();
- binaries.setOutputDirectory( "out" );
- binaries.setOutputFileNameMapping( "artifact" );
- binaries.setUnpack( false );
- binaries.setFileMode( "777" );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(),
- project,
- macTask.archiver,
- macTask.configSource,
- binaries );
-
- mm.verifyAll();
- }
-
- public void testAddModuleSourceFileSets_ShouldReturnImmediatelyIfSourcesIsNull()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- mm.replayAll();
-
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleSourceFileSets( null, null, null,
- null );
-
- mm.verifyAll();
- }
-
- public void testAddModuleSourceFileSets_ShouldAddOneSourceDirectory()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm, fileManager );
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- macTask.expectGetProject( project );
-
- final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
-
- project.setArtifact( artifactMock.getArtifact() );
-
- final Set<MavenProject> projects = singleton( project );
-
- final ModuleSources sources = new ModuleSources();
-
- final FileSet fs = new FileSet();
- fs.setDirectory( "/src" );
- fs.setDirectoryMode( "777" );
- fs.setFileMode( "777" );
-
- sources.addFileSet( fs );
-
- macTask.expectGetArchiveBaseDirectory();
-
- final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- final int[] modes = { -1, -1, mode, mode };
-
- macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true,
- false );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mm.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
- }
-
- public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsOnlyCurrentProject()
- throws ArchiveCreationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
-
- final List<MavenProject> projects = Collections.singletonList( project );
-
- macTask.expectGetReactorProjects( projects );
-
- final ModuleSet moduleSet = new ModuleSet();
- moduleSet.setIncludeSubModules( true );
-
- mm.replayAll();
-
- final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
-
- assertTrue( moduleProjects.isEmpty() );
-
- mm.verifyAll();
- }
-
- public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsTwoSiblingProjects()
- throws ArchiveCreationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
-
- final MavenProject project2 = createProject( "group", "artifact2", "version", null );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>();
- projects.add( project );
- projects.add( project2 );
-
- macTask.expectGetReactorProjects( projects );
-
- final ModuleSet moduleSet = new ModuleSet();
- moduleSet.setIncludeSubModules( true );
-
- mm.replayAll();
-
- final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
-
- assertTrue( moduleProjects.isEmpty() );
-
- mm.verifyAll();
- }
-
- public void testGetModuleProjects_ShouldReturnModuleOfCurrentProject()
- throws ArchiveCreationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
-
- final MavenProject project2 = createProject( "group", "artifact2", "version", project );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>();
- projects.add( project );
- projects.add( project2 );
-
- macTask.expectGetReactorProjects( projects );
-
- final ModuleSet moduleSet = new ModuleSet();
- moduleSet.setIncludeSubModules( true );
-
- mm.replayAll();
-
- final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
-
- assertFalse( moduleProjects.isEmpty() );
-
- final MavenProject result = moduleProjects.iterator()
- .next();
-
- assertEquals( "artifact2", result.getArtifactId() );
-
- mm.verifyAll();
- }
-
- public void testGetModuleProjects_ShouldReturnDescendentModulesOfCurrentProject()
- throws ArchiveCreationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
-
- final MavenProject project2 = createProject( "group", "artifact2", "version", project );
- final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>();
- projects.add( project );
- projects.add( project2 );
- projects.add( project3 );
-
- macTask.expectGetReactorProjects( projects );
-
- final ModuleSet moduleSet = new ModuleSet();
- moduleSet.setIncludeSubModules( true );
-
- mm.replayAll();
-
- final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
-
- assertEquals( 2, moduleProjects.size() );
-
- final List<MavenProject> check = new ArrayList<MavenProject>();
- check.add( project2 );
- check.add( project3 );
-
- verifyResultIs( check, moduleProjects );
-
- mm.verifyAll();
- }
-
- public void testGetModuleProjects_ShouldExcludeModuleAndDescendentsTransitively()
- throws ArchiveCreationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenProject project = createProject( "group", "artifact", "version", null );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
-
- addArtifact( project, mm, false );
-
- final MavenProject project2 = createProject( "group", "artifact2", "version", project );
- addArtifact( project2, mm, false );
- final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
- addArtifact( project3, mm, true );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>();
- projects.add( project );
- projects.add( project2 );
- projects.add( project3 );
-
- macTask.expectGetReactorProjects( projects );
-
- final ModuleSet moduleSet = new ModuleSet();
- moduleSet.setIncludeSubModules( true );
-
- moduleSet.addExclude( "group:artifact2" );
-
- mm.replayAll();
-
- final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
-
- assertTrue( moduleProjects.isEmpty() );
-
- mm.verifyAll();
- }
-
- private ArtifactMock addArtifact( final MavenProject project, final EasyMockSupport mm, final boolean expectDepTrailCheck )
- {
- final ArtifactMock macArtifact =
- new ArtifactMock( mm, project.getGroupId(), project.getArtifactId(), project.getVersion(),
- project.getPackaging(), false );
-
- if ( expectDepTrailCheck )
- {
- final LinkedList<String> depTrail = new LinkedList<String>();
-
- MavenProject parent = project.getParent();
- while ( parent != null )
- {
- depTrail.addLast( parent.getId() );
-
- parent = parent.getParent();
- }
-
- macArtifact.setDependencyTrail( depTrail );
- }
-
- project.setArtifact( macArtifact.getArtifact() );
-
- return macArtifact;
- }
-
- private void verifyResultIs( final List<MavenProject> check, final Set<MavenProject> moduleProjects )
- {
- boolean failed = false;
-
- final Set<MavenProject> checkTooMany = new HashSet<MavenProject>( moduleProjects );
- checkTooMany.removeAll( check );
-
- if ( !checkTooMany.isEmpty() )
- {
- failed = true;
-
- System.out.println( "Unexpected projects in output: " );
-
- for (final MavenProject project : checkTooMany) {
- System.out.println(project.getId());
- }
- }
-
- final Set<MavenProject> checkTooFew = new HashSet<MavenProject>( check );
- checkTooFew.removeAll( moduleProjects );
-
- if ( !checkTooFew.isEmpty() )
- {
- failed = true;
-
- System.out.println( "Expected projects missing from output: " );
-
- for (final MavenProject project : checkTooMany) {
- System.out.println(project.getId());
- }
- }
-
- if ( failed )
- {
- Assert.fail( "See system output for more information." );
- }
- }
-
- private MavenProject createProject( final String groupId, final String artifactId, final String version,
- final MavenProject parentProject )
- {
- final Model model = new Model();
- model.setArtifactId( artifactId );
- model.setGroupId( groupId );
- model.setVersion( version );
-
- final MavenProject project = new MavenProject( model );
-
- File pomFile;
- if ( parentProject == null )
- {
- final File basedir = fileManager.createTempDir();
- pomFile = new File( basedir, "pom.xml" );
- }
- else
- {
- final File parentBase = parentProject.getBasedir();
- pomFile = new File( parentBase, artifactId + "/pom.xml" );
-
- parentProject.getModel()
- .addModule( artifactId );
- project.setParent( parentProject );
- }
-
- project.setFile( pomFile );
-
- return project;
- }
-
- private ModuleSetAssemblyPhase createPhase( final Logger logger,
- final MockAndControlForAddDependencySetsTask macTask )
- {
- MavenProjectBuilder projectBuilder = null;
-
- if ( macTask != null )
- {
- projectBuilder = macTask.projectBuilder;
- }
-
- DependencyResolver dr = EasyMock.createMock( DependencyResolver.class );
- return new ModuleSetAssemblyPhase( projectBuilder, dr, logger );
- }
-
- private ModuleSetAssemblyPhase createPhase( final Logger logger, DependencyResolver dr, MavenProjectBuilder projectBuilder1 )
- {
- return new ModuleSetAssemblyPhase( projectBuilder1, dr, logger );
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
deleted file mode 100644
index 6c9b245..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.phase;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.repository.RepositoryAssembler;
-import org.apache.maven.shared.repository.RepositoryAssemblyException;
-import org.apache.maven.shared.repository.RepositoryBuilderConfigSource;
-import org.apache.maven.shared.repository.model.RepositoryInfo;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
-import org.codehaus.plexus.archiver.util.DefaultFileSet;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class RepositoryAssemblyPhaseTest
- extends TestCase
-{
-
- private final TestFileManager fileManager = new TestFileManager( "repository-phase.test.", "" );
-
- @Override
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testExecute_ShouldNotIncludeRepositoryIfNonSpecifiedInAssembly()
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForRepositoryAssembler macRepo = new MockAndControlForRepositoryAssembler( mm );
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File tempRoot = fileManager.createTempDir();
-
- macCS.expectGetTemporaryRootDirectory( tempRoot );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "test" );
-
- mm.replayAll();
-
- createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly,
- macArchiver.archiver,
- macCS.configSource );
-
- mm.verifyAll();
- }
-
- public void testExecute_ShouldIncludeOneRepository()
- throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MockAndControlForRepositoryAssembler macRepo = new MockAndControlForRepositoryAssembler( mm );
- final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
-
- final File tempRoot = fileManager.createTempDir();
-
- macCS.expectGetTemporaryRootDirectory( tempRoot );
- macCS.expectGetProject( new MavenProject( new Model() ) );
- macCS.expectGetFinalName( "final-name" );
- macCS.expectInterpolators();
-
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "test" );
-
- final Repository repo = new Repository();
-
- repo.setOutputDirectory( "out" );
- repo.setDirectoryMode( "777" );
- repo.setFileMode( "777" );
-
- final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- final File outDir = new File( tempRoot, "out" );
-
- macArchiver.expectModeChange( -1, -1, mode, mode, true );
- macArchiver.expectAddDirectory( outDir, "out/", null, null );
-
- macRepo.expectAssemble();
-
- assembly.addRepository( repo );
-
- mm.replayAll();
-
- createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly,
- macArchiver.archiver,
- macCS.configSource );
-
- mm.verifyAll();
- }
-
- private RepositoryAssemblyPhase createPhase( final RepositoryAssembler repositoryAssembler, final Logger logger )
- {
- final RepositoryAssemblyPhase phase = new RepositoryAssemblyPhase( repositoryAssembler );
- phase.enableLogging( logger );
-
- return phase;
- }
-
- private final class MockAndControlForArchiver
- {
- final Archiver archiver;
-
- public MockAndControlForArchiver( final EasyMockSupport mockManager )
- {
-
- archiver = mockManager.createMock (Archiver.class);
- }
-
- public void expectAddDirectory( final File outDir, final String location, final String[] includes,
- final String[] excludes )
- {
- try
- {
- final DefaultFileSet fs = new DefaultFileSet();
- fs.setDirectory( outDir );
- fs.setPrefix( location );
- fs.setIncludes( includes );
- fs.setExcludes( excludes );
-
- archiver.addFileSet( (FileSet)anyObject() );
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
-
- EasyMock.expectLastCall().atLeastOnce();
- }
-
- void expectModeChange( final int defaultDirMode, final int defaultFileMode, final int dirMode,
- final int fileMode, final boolean expectTwoSets )
- {
- expect( archiver.getOverrideDirectoryMode()).andReturn( defaultDirMode );
-
- expect( archiver.getOverrideFileMode()).andReturn( defaultFileMode );
-
- if ( expectTwoSets )
- {
- archiver.setDirectoryMode( dirMode );
- archiver.setFileMode( fileMode );
- }
-
- archiver.setDirectoryMode( defaultDirMode );
- archiver.setFileMode( defaultFileMode );
- }
-
- // public void expectAddFile( File file, String outputLocation, int fileMode )
- // {
- // try
- // {
- // archiver.addFile( file, outputLocation, fileMode );
- // }
- // catch ( ArchiverException e )
- // {
- // Assert.fail( "Should never happen." );
- // }
- // }
- }
-
- private final class MockAndControlForConfigSource
- {
- final AssemblerConfigurationSource configSource;
-
- public MockAndControlForConfigSource( final EasyMockSupport mockManager )
- {
- configSource = mockManager.createMock(AssemblerConfigurationSource.class);
-
- expect( configSource.getMavenSession()).andReturn( null ).anyTimes();
- }
-
- public void expectGetProject( final MavenProject project )
- {
- expect(configSource.getProject()).andReturn( project ).atLeastOnce();
- }
-
- public void expectGetFinalName( final String finalName )
- {
- expect(configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
- }
-
- public void expectInterpolators( )
- {
- expect(configSource.getCommandLinePropsInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes();
- expect(configSource.getEnvInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes();
- expect(configSource.getMainProjectInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes();
- }
-
- public void expectGetTemporaryRootDirectory( final File tempRoot )
- {
- expect(configSource.getTemporaryRootDirectory()).andReturn( tempRoot ).atLeastOnce();
- }
-
- //
- // public void expectGetBasedir( File basedir )
- // {
- // configSource.getBasedir();
- // control.setReturnValue( basedir, MockControl.ONE_OR_MORE );
- // }
- }
-
- private final class MockAndControlForRepositoryAssembler
- {
- final RepositoryAssembler repositoryAssembler;
-
- MockAndControlForRepositoryAssembler( final EasyMockSupport mockManager )
- {
- repositoryAssembler = mockManager.createMock(RepositoryAssembler.class);
- }
-
- public void expectAssemble()
- {
- try
- {
- repositoryAssembler.buildRemoteRepository( (File)anyObject(),
- (RepositoryInfo) anyObject(),
- ( RepositoryBuilderConfigSource)anyObject() );
- EasyMock.expectLastCall().atLeastOnce();
- }
- catch ( final RepositoryAssemblyException e )
- {
- Assert.fail( "Should never happen" );
- }
-
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
deleted file mode 100644
index 8c5d53e..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-import static org.easymock.EasyMock.anyObject;
-
-@SuppressWarnings( "OctalInteger" )
-public class AddArtifactTaskTest
- extends TestCase
-{
-
- private EasyMockSupport mockManager;
-
- private MockAndControlForAddArtifactTask mac;
-
- public void setUp()
- throws IOException
- {
- mockManager = new EasyMockSupport();
-
- Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "main" );
- model.setVersion( "1000" );
-
- MavenProject mainProject = new MavenProject( model );
-
- mac = new MockAndControlForAddArtifactTask( mockManager, mainProject );
- mac.expectGetFinalName( "final-name" );
- }
-
- public void testShouldAddArchiveFileWithoutUnpacking()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- String outputLocation = "artifact";
-
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
-
- mac.expectGetMode( 0222, 0222 );
- mac.expectGetDestFile( new File( "junk" ) );
- mac.expectAddFile( artifactFile, outputLocation );
- mac.expectInterpolators();
-
- mockManager.replayAll();
-
- AddArtifactTask task = createTask( artifactMock.getArtifact() );
-
- task.execute( mac.archiver, mac.configSource );
-
- mockManager.verifyAll();
- }
-
- public void testShouldAddArchiveFileWithDefaultOutputLocation()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- String artifactId = "myArtifact";
- String version = "1";
- String ext = "jar";
- String outputDir = "tmp/";
-
- ArtifactMock mock = new ArtifactMock( mockManager, "group", artifactId, version, ext, false );
-
- File file = mock.setNewFile();
- mock.setExtension( ext );
-
- mac.expectGetMode( 0222, 0222 );
-
- mac.expectGetDestFile( new File( "junk" ) );
- mac.expectAddFile( file, outputDir + artifactId + "-" + version + "." + ext );
- mac.expectInterpolators();
- mockManager.replayAll();
-
- AddArtifactTask task =
- new AddArtifactTask( mock.getArtifact(), new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
- task.setOutputDirectory( outputDir );
- task.setFileNameMapping( new DependencySet().getOutputFileNameMapping() );
-
- Model model = new Model();
- model.setArtifactId( artifactId );
- model.setVersion( version );
-
- MavenProject project = new MavenProject( model );
- task.setProject( project );
-
- task.execute( mac.archiver, mac.configSource );
-
- mockManager.verifyAll();
- }
-
- private AddArtifactTask createTask( Artifact artifact )
- {
- AddArtifactTask task = new AddArtifactTask( artifact, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
-
- task.setFileNameMapping( "artifact" );
-
- return task;
- }
-
- public void testShouldAddArchiveFileWithUnpack()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- mac.expectModeChange( -1, -1, -1, -1, 1 );
- mac.expectInterpolators();
-
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
-
- String outputLocation = "";
-
- mac.expectGetDestFile( new File( "junk" ) );
- try
- {
-// mac.archiver.addArchivedFileSet( artifactFile, outputLocation, AddArtifactTask.DEFAULT_INCLUDES_ARRAY,
-// null );
- mac.archiver.addArchivedFileSet( (ArchivedFileSet) anyObject(), (Charset) anyObject() );
- }
- catch ( ArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- mockManager.replayAll();
-
- AddArtifactTask task = createTask( artifactMock.getArtifact() );
-
- task.setUnpack( true );
-
- task.execute( mac.archiver, mac.configSource );
-
- mockManager.verifyAll();
- }
-
- public void testShouldAddArchiveFileWithUnpackAndModes()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- int directoryMode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- int fileMode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- mac.expectModeChange( -1, -1, directoryMode, fileMode, 2 );
- mac.expectInterpolators();
-
-// mac.expectIsSnapshot( false );
-
- String outputLocation = "";
-
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
-
- mac.expectGetDestFile( new File( "junk" ) );
- try
- {
- mac.archiver.addArchivedFileSet( (ArchivedFileSet) anyObject(), (Charset) anyObject() );
- }
- catch ( ArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- mockManager.replayAll();
-
- AddArtifactTask task = createTask( artifactMock.getArtifact() );
-
- task.setUnpack( true );
-
- task.setDirectoryMode( directoryMode );
- task.setFileMode( fileMode );
-
- task.execute( mac.archiver, mac.configSource );
-
- mockManager.verifyAll();
- }
-
- public void testShouldAddArchiveFileWithUnpackIncludesAndExcludes()
- throws ArchiveCreationException, AssemblyFormattingException, IOException
- {
- mac.expectModeChange( -1, -1, -1, -1, 1 );
-
- String[] includes = { "**/*.txt" };
- String[] excludes = { "**/README.txt" };
-
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- artifactMock.setNewFile();
-
- mac.expectGetDestFile( new File( "junk" ) );
- mac.expectAddArchivedFileSet();
- mac.expectInterpolators();
-
- mockManager.replayAll();
-
- AddArtifactTask task = createTask( artifactMock.getArtifact() );
-
- task.setUnpack( true );
- task.setIncludes( Arrays.asList( includes ) );
- task.setExcludes( Arrays.asList( excludes ) );
-
- task.execute( mac.archiver, mac.configSource );
-
- mockManager.verifyAll();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
deleted file mode 100644
index f7a2126..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import org.easymock.classextension.EasyMockSupport;
-
-@SuppressWarnings( "OctalInteger" )
-public class AddDependencySetsTaskTest
- extends TestCase
-{
-
- private final EasyMockSupport mockManager = new EasyMockSupport();
-
- public void testAddDependencySet_ShouldInterpolateDefaultOutputFileNameMapping()
- throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException,
- IOException
- {
- final String outDir = "tmp/";
- final String mainAid = "main";
- final String mainGid = "org.maingrp";
- final String mainVer = "9";
- final String depAid = "dep";
- final String depGid = "org.depgrp";
- final String depVer = "1";
- final String depExt = "war";
-
- final DependencySet ds = new DependencySet();
- ds.setOutputDirectory( outDir );
- ds.setDirectoryMode( Integer.toString( 10, 8 ) );
- ds.setFileMode( Integer.toString( 10, 8 ) );
-
- final Model mainModel = new Model();
- mainModel.setArtifactId( mainAid );
- mainModel.setGroupId( mainGid );
- mainModel.setVersion( mainVer );
-
- final MavenProject mainProject = new MavenProject( mainModel );
-
- final ArtifactMock mainArtifactMock = new ArtifactMock( mockManager, mainGid, mainAid, mainVer, "jar", false );
-
- mainProject.setArtifact( mainArtifactMock.getArtifact() );
-
- final Model depModel = new Model();
- depModel.setArtifactId( depAid );
- depModel.setGroupId( depGid );
- depModel.setVersion( depVer );
- depModel.setPackaging( depExt );
-
- final MavenProject depProject = new MavenProject( depModel );
-
- final ArtifactMock depArtifactMock = new ArtifactMock( mockManager, depGid, depAid, depVer, depExt, false );
-
- final File newFile = depArtifactMock.setNewFile();
-
- depProject.setArtifact( depArtifactMock.getArtifact() );
-
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mockManager, mainProject );
-
- macTask.expectBuildFromRepository( depProject );
- macTask.expectCSGetFinalName( mainAid + "-" + mainVer );
-
- macTask.expectCSGetRepositories( null, null );
-
- macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( newFile, outDir + depAid + "-" + depVer + "." + depExt, 10 );
-
- macTask.expectGetSession( null );
- macTask.expectGetMode( 0222, 0222 );
-
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
-
- mockManager.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( ds ),
- Collections.singleton( depArtifactMock.getArtifact() ), depProject,
- macTask.projectBuilder, logger );
-
- task.addDependencySet( ds, macTask.archiver, macTask.configSource );
-
- mockManager.verifyAll();
- }
-
- public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectHasNone()
- throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException
- {
- final MavenProject project = new MavenProject( new Model() );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager );
-
- final DependencySet ds = new DependencySet();
- ds.setOutputDirectory( "/out" );
-
- mockManager.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( ds ), null, project, macTask.projectBuilder, logger );
-
- task.addDependencySet( ds, null, macTask.configSource );
-
- mockManager.verifyAll();
- }
-
- // TODO: Find a better way of testing the project-stubbing behavior when a ProjectBuildingException takes place.
- public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectIsStubbed()
- throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException,
- IOException
- {
- final MavenProject project = new MavenProject( new Model() );
-
- final ProjectBuildingException pbe = new ProjectBuildingException( "test", "Test error." );
-
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
-
- final String gid = "org.test";
- final String aid = "test-dep";
- final String version = "2.0-SNAPSHOT";
- final String type = "jar";
-
- final File file = new File( "dep-artifact.jar" );
-
- final ArtifactMock depMock = new ArtifactMock( mockManager, gid, aid, version, type, true );
- depMock.setBaseVersion( version );
- depMock.setFile( file );
-
- final File destFile = new File( "assembly-dep-set.zip" );
-
- macTask.expectGetDestFile( destFile );
- macTask.expectBuildFromRepository( pbe );
- macTask.expectCSGetRepositories( null, null );
- macTask.expectCSGetFinalName( "final-name" );
- macTask.expectAddFile( file, "out/" + aid + "-" + version + "." + type );
-
- macTask.expectGetMode( 0222, 0222 );
- macTask.expectGetSession( null );
-
- final DependencySet ds = new DependencySet();
- ds.setOutputDirectory( "/out" );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mockManager.replayAll();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( ds ), Collections.singleton( depMock.getArtifact() ),
- project, macTask.projectBuilder, logger );
-
- task.addDependencySet( ds, macTask.archiver, macTask.configSource );
-
- mockManager.verifyAll();
- }
-
- public void testAddDependencySet_ShouldAddOneDependencyFromProjectWithoutUnpacking()
- throws AssemblyFormattingException, ArchiveCreationException, IOException,
- InvalidAssemblerConfigurationException
- {
- verifyOneDependencyAdded( "out", false );
- }
-
- public void testAddDependencySet_ShouldAddOneDependencyFromProjectUnpacked()
- throws AssemblyFormattingException, ArchiveCreationException, IOException,
- InvalidAssemblerConfigurationException
- {
- verifyOneDependencyAdded( "out", true );
- }
-
- private void verifyOneDependencyAdded( final String outputLocation, final boolean unpack )
- throws AssemblyFormattingException, ArchiveCreationException, IOException,
- InvalidAssemblerConfigurationException
- {
- final MavenProject project = new MavenProject( new Model() );
-
- final DependencySet ds = new DependencySet();
- ds.setOutputDirectory( outputLocation );
- ds.setOutputFileNameMapping( "artifact" );
- ds.setUnpack( unpack );
- ds.setScope( Artifact.SCOPE_COMPILE );
-
- ds.setDirectoryMode( Integer.toString( 10, 8 ) );
- ds.setFileMode( Integer.toString( 10, 8 ) );
-
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
-
- final ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- final File artifactFile = artifactMock.setNewFile();
-
- if ( unpack )
- {
- macTask.expectAddArchivedFileSet();
-// macTask.expectModeChange( -1, -1, 10, 10, 2 );
- }
- else
- {
- macTask.expectAddFile( artifactFile, outputLocation + "/artifact", 10 );
- }
-
- macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectCSGetFinalName( "final-name" );
- macTask.expectCSGetRepositories( null, null );
-
- macTask.expectGetSession( null );
-
- final MavenProject depProject = new MavenProject( new Model() );
-
- macTask.expectBuildFromRepository( depProject );
- macTask.expectGetMode( 0222, 0222 );
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( ds ),
- Collections.singleton( artifactMock.getArtifact() ), project,
- macTask.projectBuilder, logger );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mockManager.replayAll();
-
- task.addDependencySet( ds, macTask.archiver, macTask.configSource );
-
- mockManager.verifyAll();
- }
-
- public void testGetDependencyArtifacts_ShouldGetOneDependencyArtifact()
- throws ArchiveCreationException, InvalidAssemblerConfigurationException
- {
- final MavenProject project = new MavenProject( new Model() );
-
- final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager );
-
- final ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
-
- project.setArtifacts( Collections.singleton( artifactMock.getArtifact() ) );
-
- final DependencySet dependencySet = new DependencySet();
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- mockManager.replayAll();
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( dependencySet ),
- Collections.singleton( artifactMock.getArtifact() ), project,
- macTask.projectBuilder, logger );
-
- final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet );
-
- assertNotNull( result );
- assertEquals( 1, result.size() );
- assertSame( artifactMock.getArtifact(), result.iterator()
- .next() );
-
- mockManager.verifyAll();
- }
-
- public void testGetDependencyArtifacts_ShouldFilterOneDependencyArtifactViaInclude()
- throws ArchiveCreationException, InvalidAssemblerConfigurationException
- {
- final MavenProject project = new MavenProject( new Model() );
-
- final Set<Artifact> artifacts = new HashSet<Artifact>();
-
- final ArtifactMock am = new ArtifactMock( mockManager, "group", "artifact", "1.0", "jar", false );
- am.setDependencyTrail( Collections.singletonList( project.getId() ) );
- artifacts.add( am.getArtifact() );
-
- final ArtifactMock am2 = new ArtifactMock( mockManager, "group2", "artifact2", "1.0", "jar", false );
- am2.setDependencyTrail( Collections.singletonList( project.getId() ) );
- artifacts.add( am2.getArtifact() );
-
- final DependencySet dependencySet = new DependencySet();
-
- dependencySet.addInclude( "group:artifact" );
- dependencySet.setUseTransitiveFiltering( true );
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- mockManager.replayAll();
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( dependencySet ), artifacts, project, null, logger );
-
- final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet );
-
- assertNotNull( result );
- assertEquals( 1, result.size() );
- assertSame( am.getArtifact(), result.iterator()
- .next() );
-
- mockManager.verifyAll();
- }
-
- public void testGetDependencyArtifacts_ShouldIgnoreTransitivePathFilteringWhenIncludeNotTransitive()
- throws ArchiveCreationException, InvalidAssemblerConfigurationException
- {
- final MavenProject project = new MavenProject( new Model() );
-
- final Set<Artifact> artifacts = new HashSet<Artifact>();
-
- final ArtifactMock am = new ArtifactMock( mockManager, "group", "artifact", "1.0", "jar", false );
- artifacts.add( am.getArtifact() );
-
- final ArtifactMock am2 = new ArtifactMock( mockManager, "group2", "artifact2", "1.0", "jar", false );
- artifacts.add( am2.getArtifact() );
-
- final DependencySet dependencySet = new DependencySet();
-
- dependencySet.addInclude( "group:artifact" );
- dependencySet.setUseTransitiveFiltering( false );
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- mockManager.replayAll();
-
- final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList( dependencySet ), artifacts, project, null, logger );
-
- final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet );
-
- assertNotNull( result );
- assertEquals( 1, result.size() );
- assertSame( am.getArtifact(), result.iterator()
- .next() );
-
- mockManager.verifyAll();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
deleted file mode 100644
index 6ffa1d7..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class AddDirectoryTaskTest
- extends TestCase
-{
-
- private EasyMockSupport mockManager;
-
- private TestFileManager fileManager;
-
- private Archiver archiver;
-
-
- public void setUp()
- {
- fileManager = new TestFileManager( "ArchiveAssemblyUtils.test.", "" );
-
- mockManager = new EasyMockSupport();
-
-
- archiver = mockManager.createMock(Archiver.class);
- }
-
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testAddDirectory_ShouldNotAddDirectoryIfNonExistent()
- throws ArchiveCreationException
- {
- File dir = new File( System.getProperty( "java.io.tmpdir" ), "non-existent." + System.currentTimeMillis() );
-
- configureModeExpectations( -1, -1, -1, -1, false );
-
- mockManager.replayAll();
-
- AddDirectoryTask task = new AddDirectoryTask( dir );
-
- task.execute( archiver );
-
- mockManager.verifyAll();
- }
-
- public void testAddDirectory_ShouldAddDirectory()
- throws ArchiveCreationException
- {
- File dir = fileManager.createTempDir();
-
- try
- {
- archiver.addFileSet( (FileSet) anyObject() );
- }
- catch ( ArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- configureModeExpectations( -1, -1, -1, -1, false );
-
- mockManager.replayAll();
-
- AddDirectoryTask task = new AddDirectoryTask( dir );
-
- task.setOutputDirectory( "dir" );
-
- task.execute( archiver );
-
- mockManager.verifyAll();
- }
-
- public void testAddDirectory_ShouldAddDirectoryWithDirMode()
- throws ArchiveCreationException
- {
- File dir = fileManager.createTempDir();
-
- try
- {
- archiver.addFileSet( (FileSet) anyObject() );
- }
- catch ( ArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- int dirMode = Integer.parseInt( "777", 8 );
- int fileMode = Integer.parseInt( "777", 8 );
-
- configureModeExpectations( -1, -1, dirMode, fileMode, true );
-
- mockManager.replayAll();
-
- AddDirectoryTask task = new AddDirectoryTask( dir );
-
- task.setDirectoryMode( dirMode );
- task.setFileMode( fileMode );
- task.setOutputDirectory( "dir" );
-
- task.execute( archiver );
-
- mockManager.verifyAll();
- }
-
- public void testAddDirectory_ShouldAddDirectoryWithIncludesAndExcludes()
- throws ArchiveCreationException
- {
- File dir = fileManager.createTempDir();
-
- try
- {
- archiver.addFileSet( (FileSet) anyObject() );
- }
- catch ( ArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- configureModeExpectations( -1, -1, -1, -1, false );
-
- mockManager.replayAll();
-
- AddDirectoryTask task = new AddDirectoryTask( dir );
-
- task.setIncludes( Collections.singletonList( "**/*.txt" ) );
- task.setExcludes( Collections.singletonList( "**/README.txt" ) );
- task.setOutputDirectory( "dir" );
-
- task.execute( archiver );
-
- mockManager.verifyAll();
- }
-
- private void configureModeExpectations( int defaultDirMode, int defaultFileMode, int dirMode, int fileMode,
- boolean expectTwoSets )
- {
- expect(archiver.getOverrideDirectoryMode()).andReturn( defaultDirMode );
- expect(archiver.getOverrideFileMode()).andReturn( defaultFileMode );
-
- if ( expectTwoSets )
- {
- if ( dirMode > -1 )
- {
- archiver.setDirectoryMode( dirMode );
- }
-
- if ( fileMode > -1 )
- {
- archiver.setFileMode( fileMode );
- }
- }
-
- if ( dirMode > -1 )
- {
- archiver.setDirectoryMode( defaultDirMode );
- }
-
- if ( fileMode > -1 )
- {
- archiver.setFileMode( defaultFileMode );
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
deleted file mode 100644
index aeb6466..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.expect;
-
-@SuppressWarnings("ResultOfMethodCallIgnored")
-public class AddFileSetsTaskTest
- extends TestCase
-{
-
- private EasyMockSupport mockManager;
-
- private TestFileManager fileManager;
-
- private MockAndControlForAddFileSetsTask macTask;
-
- @Override
- public void setUp()
- {
- mockManager = new EasyMockSupport();
-
- fileManager = new TestFileManager( "add-fileset.test.", "" );
-
- macTask = new MockAndControlForAddFileSetsTask( mockManager, fileManager );
- }
-
- @Override
- public void tearDown() throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testGetFileSetDirectory_ShouldReturnAbsoluteSourceDir()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final File dir = fileManager.createTempDir();
-
- final FileSet fs = new FileSet();
-
- fs.setDirectory( dir.getAbsolutePath() );
-
- final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, null, null );
-
- assertEquals( dir.getAbsolutePath(), result.getAbsolutePath() );
- }
-
- public void testGetFileSetDirectory_ShouldReturnBasedir()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final File dir = fileManager.createTempDir();
-
- final FileSet fs = new FileSet();
-
- final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, dir, null );
-
- assertEquals( dir.getAbsolutePath(), result.getAbsolutePath() );
- }
-
- public void testGetFileSetDirectory_ShouldReturnDirFromBasedirAndSourceDir()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final File dir = fileManager.createTempDir();
-
- final String srcPath = "source";
-
- final File srcDir = new File( dir, srcPath );
-
- final FileSet fs = new FileSet();
-
- fs.setDirectory( srcPath );
-
- final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, dir, null );
-
- assertEquals( srcDir.getAbsolutePath(), result.getAbsolutePath() );
- }
-
- public void testGetFileSetDirectory_ShouldReturnDirFromArchiveBasedirAndSourceDir()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final File dir = fileManager.createTempDir();
-
- final String srcPath = "source";
-
- final File srcDir = new File( dir, srcPath );
-
- final FileSet fs = new FileSet();
-
- fs.setDirectory( srcPath );
-
- final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, null, dir );
-
- assertEquals( srcDir.getAbsolutePath(), result.getAbsolutePath() );
- }
-
- public void testAddFileSet_ShouldAddDirectory() throws ArchiveCreationException, AssemblyFormattingException
- {
- final FileSet fs = new FileSet();
-
- final String dirname = "dir";
-
- fs.setDirectory( dirname );
- fs.setOutputDirectory( "dir2" );
-
- // ensure this exists, so the directory addition will proceed.
- final File srcDir = new File( macTask.archiveBaseDir, dirname );
- srcDir.mkdirs();
-
- final int[] modes = { -1, -1, -1, -1 };
-
- macTask.expectAdditionOfSingleFileSet( null, null, true, modes, 1, true, false );
-
-// macTask.expectGetProject( null );
-
- final MavenProject project = new MavenProject( new Model() );
-
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
- mockManager.replayAll();
-
- final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
-
- task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- task.setProject( project );
-
- task.addFileSet( fs, macTask.archiver, macTask.configSource, macTask.archiveBaseDir );
-
- mockManager.verifyAll();
- }
-
- public void testAddFileSet_ShouldAddDirectoryUsingSourceDirNameForDestDir()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final FileSet fs = new FileSet();
-
- final String dirname = "dir";
-
- fs.setDirectory( dirname );
-
- final File archiveBaseDir = fileManager.createTempDir();
-
- // ensure this exists, so the directory addition will proceed.
- final File srcDir = new File( archiveBaseDir, dirname );
- srcDir.mkdirs();
-
- final int[] modes = { -1, -1, -1, -1 };
-
- macTask.expectAdditionOfSingleFileSet( null, null, true, modes, 1, true, false );
-
- //macTask.expectGetProject( null );
-
- final MavenProject project = new MavenProject( new Model() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mockManager.replayAll();
-
- final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
-
- task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- task.setProject( project );
-
- task.addFileSet( fs, macTask.archiver, macTask.configSource, archiveBaseDir );
-
- mockManager.verifyAll();
- }
-
- public void testAddFileSet_ShouldNotAddDirectoryWhenSourceDirNonExistent()
- throws ArchiveCreationException, AssemblyFormattingException
- {
- final FileSet fs = new FileSet();
-
- final String dirname = "dir";
-
- fs.setDirectory( dirname );
-
- final File archiveBaseDir = fileManager.createTempDir();
-
- macTask.expectGetFinalName( "finalName" );
-
- //macTask.expectGetProject( null );
-
- expect(macTask.archiver.getOverrideDirectoryMode()).andReturn( -1 );
- expect(macTask.archiver.getOverrideFileMode()).andReturn( -1 );
-
- final MavenProject project = new MavenProject( new Model() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
-
- mockManager.replayAll();
-
- final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
-
- task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- task.setProject( project );
-
- task.addFileSet( fs, macTask.archiver, macTask.configSource, archiveBaseDir );
-
- mockManager.verifyAll();
- }
-
- public void testExecute_ShouldThrowExceptionIfArchiveBasedirProvidedIsNonExistent()
- throws AssemblyFormattingException
- {
- macTask.archiveBaseDir.delete();
-
- macTask.expectGetArchiveBaseDirectory();
-
- mockManager.replayAll();
-
- final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
-
- try
- {
- task.execute( macTask.archiver, macTask.configSource );
-
- fail( "Should throw exception due to non-existent archiveBasedir location that was provided." );
- }
- catch ( final ArchiveCreationException e )
- {
- // should do this, because it cannot use the provide archiveBasedir.
- }
-
- mockManager.verifyAll();
- }
-
- public void testExecute_ShouldThrowExceptionIfArchiveBasedirProvidedIsNotADirectory()
- throws AssemblyFormattingException, IOException
- {
-
- macTask.archiveBaseDir = fileManager.createTempFile();
- macTask.expectGetArchiveBaseDirectory();
-
- mockManager.replayAll();
-
- final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
-
- try
- {
- task.execute( macTask.archiver, macTask.configSource );
-
- fail( "Should throw exception due to non-directory archiveBasedir location that was provided." );
- }
- catch ( final ArchiveCreationException e )
- {
- // should do this, because it cannot use the provide archiveBasedir.
- }
-
- mockManager.verifyAll();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
deleted file mode 100644
index 5460051..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task.testutils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.expect;
-
-public class ArtifactMock
-{
-
-
- private final Artifact artifact;
-
-
- private final ArtifactHandler handler;
-
- private String groupId;
-
- private String artifactId;
-
- private String baseVersion;
-
- private File file;
-
- private Boolean isSnapshot;
-
- private String version;
-
- private List<String> dependencyTrail;
-
- private String id;
-
- private String dependencyConflictId;
-
- private String typeAndExt;
-
- private final String classifier;
-
- public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId,
- final String version, final String type, final boolean isSnapshot )
- {
- this( mockManager, groupId, artifactId, version, type, null, isSnapshot, null, null );
- }
-
- public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId,
- final String version, final String type, final boolean isSnapshot, final String baseVersion )
- {
- this( mockManager, groupId, artifactId, version, type, null, isSnapshot, baseVersion, null );
- }
-
- public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId,
- final String version, final String type, final String classifier, final boolean isSnapshot )
- {
- this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, null, null );
- }
-
- public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId,
- final String version, final String type, final String classifier, final boolean isSnapshot,
- final String baseVersion )
- {
- this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, baseVersion, null );
- }
-
- private ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId,
- final String version, final String type, final String classifier, final boolean isSnapshot,
- final String baseVersion, String scope )
- {
-
- artifact = mockManager.createMock( Artifact.class );
-
- if ( scope == null )
- {
- scope = Artifact.SCOPE_COMPILE;
- }
-
- expect( artifact.getScope()).andReturn( scope ).anyTimes();
-
- handler = mockManager.createMock( ArtifactHandler.class );
-
- expect(artifact.getArtifactHandler()).andReturn( handler ).anyTimes();
-
- this.classifier = classifier;
- expect(artifact.getClassifier()).andReturn( classifier ).anyTimes();
-
- setSnapshot( isSnapshot );
- setGroupId( groupId );
- setArtifactId( artifactId );
- setVersion( version );
- setBaseVersion( baseVersion );
- setType( type );
-
- setId();
- setDependencyConflictId();
- }
-
- public void setExtension( final String extension )
- {
- setTypeAndExt( extension );
- }
-
- public Artifact getArtifact()
- {
- return artifact;
- }
-
- void setArtifactId( final String artifactId )
- {
- if ( ( artifactId != null ) && ( this.artifactId == null ) )
- {
- expect(artifact.getArtifactId()).andReturn( artifactId ).anyTimes();
- this.artifactId = artifactId;
- }
- }
-
- public void setBaseVersion( final String baseVersion )
- {
- if ( ( baseVersion != null ) && ( this.baseVersion == null ) )
- {
- expect(artifact.getBaseVersion()).andReturn( baseVersion ).anyTimes();
-
- this.baseVersion = baseVersion;
- }
- }
-
- public void setFile( final File destination )
- {
- if ( ( destination != null ) && ( file == null ) )
- {
- expect(artifact.getFile()).andReturn( destination ).anyTimes();
- file = destination;
- }
- }
-
- void setGroupId( final String groupId )
- {
- if ( ( groupId != null ) && ( this.groupId == null ) )
- {
- expect(artifact.getGroupId()).andReturn( groupId ).anyTimes();
-
- this.groupId = groupId;
- }
- }
-
- void setVersion( final String version )
- {
- if ( ( version != null ) && ( this.version == null ) )
- {
- expect(artifact.getVersion()).andReturn( version ).anyTimes();
-
- this.version = version;
-
- if ( isSnapshot != Boolean.TRUE )
- {
- setBaseVersion( version );
- setSnapshot( false );
- }
- }
- }
-
- public void setDependencyTrail( final List<String> dependencyTrail )
- {
- if ( ( dependencyTrail != null ) && ( this.dependencyTrail == null ) )
- {
- expect(artifact.getDependencyTrail()).andReturn( dependencyTrail ).anyTimes();
- this.dependencyTrail = dependencyTrail;
- }
- }
-
- void setId( final String id )
- {
- if ( ( id != null ) && ( this.id == null ) )
- {
- expect(artifact.getId()).andReturn( id ).anyTimes();
- this.id = id;
- }
- }
-
- void setDependencyConflictId( final String id )
- {
- if ( ( id != null ) && ( dependencyConflictId == null ) )
- {
- expect( artifact.getDependencyConflictId()).andReturn( id ).anyTimes();
-
- dependencyConflictId = id;
- }
- }
-
- void setSnapshot( final boolean snapshot )
- {
- if ( isSnapshot == null )
- {
- expect(artifact.isSnapshot()).andReturn( snapshot ).anyTimes();
- isSnapshot = snapshot;
- }
- }
-
- public File setNewFile()
- throws IOException
- {
- if ( file == null )
- {
- final File newFile = File.createTempFile( "ArtifactMock.test.", "" );
- newFile.deleteOnExit();
- expect( artifact.getFile()).andReturn( newFile ).anyTimes();
- file = newFile;
- }
-
- return file;
- }
-
- void setType( final String type )
- {
- setTypeAndExt( type );
- }
-
- private void setTypeAndExt( final String type )
- {
- if ( ( type != null ) && ( typeAndExt == null ) )
- {
- expect(artifact.getType()).andReturn( type ).anyTimes();
- expect(handler.getExtension()).andReturn( type ).anyTimes();
- typeAndExt = type;
- }
- }
-
- private void setDependencyConflictId()
- {
- if ( ( groupId != null ) && ( artifactId != null ) && ( typeAndExt != null ) )
- {
- final String id =
- groupId + ":" + artifactId + ":" + typeAndExt + ( classifier == null ? "" : ":" + classifier );
- setDependencyConflictId( id );
- }
- }
-
- private void setId()
- {
- if ( ( groupId != null ) && ( artifactId != null ) && ( typeAndExt != null ) && ( version != null ) )
- {
- final String id =
- groupId + ":" + artifactId + ":" + version + ":" + typeAndExt
- + ( classifier == null ? "" : ":" + classifier );
- setId( id );
- }
- }
-
- public void setNullFile()
- {
- expect(artifact.getFile()).andReturn( null ).anyTimes();
-
- file = new File( "set-to-null" );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
deleted file mode 100644
index 19864c2..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task.testutils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.easymock.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.anyInt;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class MockAndControlForAddArtifactTask
-{
-
- public final Archiver archiver;
-
- public AssemblerConfigurationSource configSource;
-
- private MavenProject project = null;
-
- public final DependencyResolver dependencyResolver;
-
- public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager )
- {
- this( mockManager, null );
- }
-
- public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager, final MavenProject project )
- {
- this.project = project;
-
- archiver = mockManager.createMock(Archiver.class);
- configSource = mockManager.createMock(AssemblerConfigurationSource.class);
- dependencyResolver = mockManager.createMock( DependencyResolver.class);
-
- enableDefaultExpectations();
- }
-
- private void enableDefaultExpectations()
- {
- expect( configSource.getProject()).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession()).andReturn( null ).anyTimes();
- }
-
- public void expectGetFinalName( final String finalName )
- {
- expect(configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
- }
-
- public void expectGetDestFile( final File destFile )
- {
- expect(archiver.getDestFile()).andReturn( destFile ).atLeastOnce();
- }
-
- public void expectGetMode( final int originalDirMode, final int originalFileMode )
- {
- expect( archiver.getOverrideDirectoryMode()).andReturn( originalDirMode );
- expect(archiver.getOverrideFileMode()).andReturn( originalFileMode );
- archiver.setFileMode( anyInt() );
- EasyMock.expectLastCall().anyTimes();
- }
-
-
- public void expectAddArchivedFileSet()
- {
- try
- {
- archiver.addArchivedFileSet( (File)anyObject(), (String)anyObject(), (String[])anyObject(), (String[])anyObject() );
- EasyMock.expectLastCall().anyTimes();
- archiver.addArchivedFileSet((ArchivedFileSet) anyObject(), (Charset) anyObject() );
- EasyMock.expectLastCall().anyTimes();
-
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- public void expectModeChange( final int originalDirMode, final int originalFileMode, final int dirMode,
- final int fileMode, final int numberOfChanges )
- {
- expect( archiver.getOverrideDirectoryMode()).andReturn( originalDirMode );
- expect(archiver.getOverrideFileMode()).andReturn( originalFileMode );
-
- // one of the changes will occur below, when we restore the original mode.
- if ( numberOfChanges > 1 )
- {
- for ( int i = 1; i < numberOfChanges; i++ )
- {
- if ( dirMode > -1 )
- {
- archiver.setDirectoryMode( dirMode );
- }
-
- if ( fileMode > -1 )
- {
- archiver.setFileMode( fileMode );
- }
- }
- }
-
- if ( dirMode > -1 )
- {
- archiver.setDirectoryMode( originalDirMode );
- }
-
- if ( fileMode > -1 )
- {
- archiver.setFileMode( originalFileMode );
- }
- }
-
- public void expectAddFile( final File file, final String outputLocation, final int fileMode )
- {
- try
- {
- archiver.addFile( (File)anyObject(), (String) anyObject(), anyInt() );
- EasyMock.expectLastCall().anyTimes();
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
-
- public void expectAddFile( final File file, final String outputLocation )
- {
- try
- {
- archiver.addFile( file, outputLocation );
- EasyMock.expectLastCall().atLeastOnce();
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- public void expectGetReactorProjects( final List<MavenProject> projects )
- {
- expect(configSource.getReactorProjects()).andReturn( projects ).atLeastOnce();
- }
-
-
- public void expectResolveDependencySets()
- throws DependencyResolutionException
- {
- expect( dependencyResolver.resolveDependencySets( (Assembly) anyObject(), (ModuleSet) anyObject(),
- (AssemblerConfigurationSource) anyObject(), (List<DependencySet>) anyObject() ))
- .andReturn( new LinkedHashMap<DependencySet, Set<Artifact>>( ) ).anyTimes();
-
- }
-
- public void expectInterpolators()
- {
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
deleted file mode 100644
index fdb4b42..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task.testutils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.easymock.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.easymock.EasyMock.anyInt;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class MockAndControlForAddDependencySetsTask
-{
-
- public final Archiver archiver;
-
- public final AssemblerConfigurationSource configSource;
-
- public final MavenProjectBuilder projectBuilder;
-
- public final ArchiverManager archiverManager;
-
- private final MavenProject project;
-
- public final DependencyResolver dependencyResolver;
-
-
- public MockAndControlForAddDependencySetsTask( final EasyMockSupport mockManager )
- {
- this( mockManager, null );
- }
-
- public MockAndControlForAddDependencySetsTask( final EasyMockSupport mockManager, final MavenProject project )
- {
- this.project = project;
-
- archiver = mockManager.createMock(Archiver.class);
- configSource = mockManager.createMock (AssemblerConfigurationSource.class);
-
-
- projectBuilder = mockManager.createMock(MavenProjectBuilder.class);
-
- archiverManager = mockManager.createMock(ArchiverManager.class);
-
- dependencyResolver = mockManager.createMock( DependencyResolver.class);
-
-
- enableDefaultExpectations();
- }
-
- private void enableDefaultExpectations()
- {
- expect(configSource.getProject()).andReturn( project ).anyTimes();
- }
-
- public void expectAddArchivedFileSet()
- {
- try
- {
- archiver.addArchivedFileSet( (File) anyObject(), (String) anyObject(), (String[]) anyObject(),
- (String[]) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- archiver.addArchivedFileSet( (ArchivedFileSet)anyObject(), (Charset) anyObject() );
- EasyMock.expectLastCall().anyTimes();
-
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- public void expectModeChange( final int originalDirMode, final int originalFileMode, final int dirMode,
- final int fileMode, final int numberOfChanges )
- {
- expectGetMode( originalDirMode, originalFileMode );
- // one of the changes will occur below, when we restore the original mode.
- if ( numberOfChanges > 1 )
- {
- for ( int i = 1; i < numberOfChanges; i++ )
- {
- archiver.setDirectoryMode( dirMode );
- archiver.setFileMode( fileMode );
- }
- }
-
- archiver.setDirectoryMode( originalDirMode );
- archiver.setFileMode( originalFileMode );
- }
-
- public void expectGetMode( final int originalDirMode, final int originalFileMode )
- {
- archiver.setFileMode( anyInt() );
- EasyMock.expectLastCall().anyTimes();
- expect( archiver.getOverrideDirectoryMode()).andReturn( originalDirMode );
- expect( archiver.getOverrideFileMode() ).andReturn( originalFileMode );
- archiver.setDirectoryMode( anyInt() );
- EasyMock.expectLastCall().anyTimes();
-
- }
-
- public void expectAddFile( final File file, final String outputLocation )
- {
- try
- {
- archiver.addFile( file, outputLocation );
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- public void expectAddFile( final File file, final String outputLocation, final int fileMode )
- {
- try
- {
- archiver.addFile( file, outputLocation, fileMode );
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- public void expectAddAnyFile( )
- {
- try
- {
- archiver.addFile( (File) anyObject(), (String) anyObject(), anyInt());
- }
- catch ( final ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- public void expectGetReactorProjects( final List<MavenProject> projects )
- {
- expect(configSource.getReactorProjects()).andReturn( projects ).anyTimes();
- }
-
- public void expectCSGetFinalName( final String finalName )
- {
- expect(configSource.getFinalName()).andReturn( finalName ).anyTimes();
- }
-
- public void expectGetDestFile( final File destFile )
- {
- expect(archiver.getDestFile()).andReturn( destFile ).anyTimes();
- }
-
- public void expectCSGetRepositories( final ArtifactRepository localRepo, final List<ArtifactRepository> remoteRepos )
- {
- expect(configSource.getLocalRepository()).andReturn( localRepo ).anyTimes();
- expect(configSource.getRemoteRepositories()).andReturn( remoteRepos ).anyTimes();
- }
-
- public void expectBuildFromRepository( final ProjectBuildingException error )
- {
- try
- {
- expect(projectBuilder.buildFromRepository( (Artifact) anyObject(), (List) anyObject(),
- (ArtifactRepository) anyObject() )).andThrow( error );
-// projectBuilderCtl.setThrowable( error, MockControl.ONE_OR_MORE );
- }
- catch ( final ProjectBuildingException e )
- {
- Assert.fail( "should never happen" );
- }
- }
-
- public void expectBuildFromRepository( final MavenProject project )
- {
- try
- {
- expect(projectBuilder.buildFromRepository( ( Artifact) anyObject(), (List)anyObject(), (ArtifactRepository)anyObject() )).andReturn( project ).anyTimes();
- }
- catch ( final ProjectBuildingException e )
- {
- Assert.fail( "should never happen" );
- }
- }
-
- public void expectGetSession( final MavenSession session )
- {
- expect(configSource.getMavenSession()).andReturn( session ).anyTimes();
- }
-
- public void expectResolveDependencySets()
- throws DependencyResolutionException
- {
- expect( dependencyResolver.resolveDependencySets( (Assembly) anyObject(),
- (AssemblerConfigurationSource) anyObject(), (List<DependencySet>) anyObject() ))
- .andReturn( new LinkedHashMap<DependencySet, Set<Artifact>>( ) ).anyTimes();
-
- }
-
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
deleted file mode 100644
index 8826128..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.apache.maven.plugin.assembly.archive.task.testutils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.Assert;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
-import org.easymock.EasyMock;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
-public class MockAndControlForAddFileSetsTask
-{
-
- public final AssemblerConfigurationSource configSource;
-
-
- public Archiver archiver;
-
- public File archiveBaseDir;
-
- public MockAndControlForAddFileSetsTask( EasyMockSupport mockManager, TestFileManager fileManager )
- {
- configSource = mockManager.createMock (AssemblerConfigurationSource.class);
- archiver = mockManager.createMock (Archiver.class);
- archiveBaseDir = fileManager.createTempDir();
-
- expect(configSource.getMavenSession()).andReturn( null).anyTimes();
- }
-
- public void expectGetArchiveBaseDirectory()
- {
- expect(configSource.getArchiveBaseDirectory()).andReturn( archiveBaseDir ).anyTimes();
- }
-
- void expectModeChanges( int[] modes, int modeChangeCount )
- {
- expect(archiver.getOverrideDirectoryMode()).andReturn( modes[0] );
- expect(archiver.getOverrideFileMode()).andReturn( modes[1] );
-
-
- if ( modeChangeCount > 1 )
- {
- for ( int i = 1; i < modeChangeCount; i++ )
- {
- if ( modes[2] > -1 )
- {
- archiver.setDirectoryMode( modes[2] );
- }
-
- if ( modes[3] > -1 )
- {
- archiver.setFileMode( modes[3] );
- }
- }
- }
-
- if ( modes[2] > -1 )
- {
- archiver.setDirectoryMode( modes[0] );
- }
-
- if ( modes[3] > -1 )
- {
- archiver.setFileMode( modes[1] );
- }
- }
-
- public void expectAdditionOfSingleFileSet( MavenProject project, String finalName, boolean shouldAddDir, int[] modes, int modeChangeCount,
- boolean isDebugEnabled )
- {
- expectAdditionOfSingleFileSet( project, finalName, shouldAddDir, modes, modeChangeCount,
- isDebugEnabled, true );
-
- }
-
- public void expectAdditionOfSingleFileSet( MavenProject project, String finalName, boolean shouldAddDir, int[] modes, int modeChangeCount,
- boolean isDebugEnabled, boolean isProjectUsed )
- {
- // the logger sends a debug message with this info inside the addFileSet(..) method..
- if ( isDebugEnabled )
- {
- expect(archiver.getOverrideDirectoryMode()).andReturn( modes[0] );
- expect(archiver.getOverrideFileMode()).andReturn( modes[1] );
- }
-
- if ( isProjectUsed )
- {
- expect(configSource.getProject()).andReturn( project ).atLeastOnce();
- }
-
- expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
-
- if ( shouldAddDir )
- {
- expectModeChanges( modes, modeChangeCount );
-
- try
- {
- archiver.addFileSet( (FileSet) anyObject() );
- EasyMock.expectLastCall().atLeastOnce();
- }
- catch ( ArchiverException e )
- {
- Assert.fail( "Should never happen." );
- }
- }
-
- }
-
- public void expectGetProject( MavenProject project )
- {
- expect(configSource.getProject()).andReturn( project ).atLeastOnce();
- }
-
- public void expectGetFinalName( String finalName )
- {
- expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
deleted file mode 100644
index 5ad9f4d..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
+++ /dev/null
@@ -1,623 +0,0 @@
-package org.apache.maven.plugin.assembly.artifact;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.ModuleBinaries;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.resolved.AssemblyId;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import static org.easymock.EasyMock.expect;
-
-public class DefaultDependencyResolverTest
- extends PlexusTestCase
-{
-
- private ArtifactFactory factory;
-
- private ArtifactRepositoryFactory repoFactory;
-
- private ArtifactRepositoryLayout layout;
-
- private ArtifactResolver resolver;
-
- private ArtifactMetadataSource metadataSource;
-
- private ConsoleLogger logger;
-
- @Override
- public void setUp()
- throws Exception
- {
- super.setUp();
-
- resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
- metadataSource = (ArtifactMetadataSource) lookup( ArtifactMetadataSource.ROLE );
- factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- repoFactory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
- layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
- logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- }
-
- public void test_getDependencySetResolutionRequirements()
- throws DependencyResolutionException
- {
- final DependencySet ds1 = new DependencySet();
- ds1.setScope( Artifact.SCOPE_COMPILE );
- ds1.setUseTransitiveDependencies( false );
-
- final DependencySet ds2 = new DependencySet();
- ds2.setScope( Artifact.SCOPE_SYSTEM );
- ds2.setUseTransitiveDependencies( false );
-
- final MavenProject project = createMavenProject( "main-group", "main-artifact", "1", null );
-
- final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
-
- final Assembly assembly = new Assembly();
- new DefaultDependencyResolver( resolver, metadataSource, factory, logger ).updateDependencySetResolutionRequirements(
- ds1,
- info, AssemblyId.createAssemblyId( assembly),
- project);
-
- assertTrue( info.isResolutionRequired() );
- assertFalse( info.isResolvedTransitively() );
-
- assertTrue( info.getScopeFilter().isIncludeCompileScope() );
- assertTrue( info.getScopeFilter().isIncludeSystemScope() );
-
- assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
-
- assertFalse( info.getScopeFilter().isIncludeRuntimeScope() );
- assertFalse( info.getScopeFilter().isIncludeTestScope() );
- }
-
- public void test_getModuleSetResolutionRequirements()
- throws DependencyResolutionException
- {
- final EasyMockSupport mm = new EasyMockSupport();
-
- final AssemblerConfigurationSource cs = mm.createMock( AssemblerConfigurationSource.class );
-
- final File rootDir = new File( "root" );
- final MavenProject project = createMavenProject( "main-group", "main-artifact", "1", rootDir );
-
- final File module1Dir = new File( rootDir, "module-1" );
- final MavenProject module1 = createMavenProject( "main-group", "module-1", "1", module1Dir );
- final MavenProject module1a =
- createMavenProject( "group1", "module-1a", "1", new File( module1Dir, "module-1a" ) );
- final MavenProject module1b =
- createMavenProject( "group1.b", "module-1b", "1", new File( module1Dir, "module-1b" ) );
-
- module1.getModel().addModule( module1a.getArtifactId() );
- module1.getModel().addModule( module1b.getArtifactId() );
-
- final File module2Dir = new File( rootDir, "module-2" );
- final MavenProject module2 = createMavenProject( "main-group", "module-2", "1", module2Dir );
- final MavenProject module2a =
- createMavenProject( "main-group", "module-2a", "1", new File( module2Dir, "module-2a" ) );
-
- module2.getModel().addModule( module2a.getArtifactId() );
-
- project.getModel().addModule( module1.getArtifactId() );
- project.getModel().addModule( module2.getArtifactId() );
-
- final List<MavenProject> allProjects = new ArrayList<MavenProject>();
- allProjects.add( project );
- allProjects.add( module1 );
- allProjects.add( module1a );
- allProjects.add( module1b );
- allProjects.add( module2 );
- allProjects.add( module2a );
-
- expect( cs.getReactorProjects()).andReturn( allProjects ).anyTimes();
-
- expect( cs.getProject()).andReturn( project ).anyTimes();
-
- final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
-
- final List<ModuleSet> moduleSets = new ArrayList<ModuleSet>();
-
- final ModuleSet ms1 = new ModuleSet();
- final DependencySet ds1 = new DependencySet();
- {
- ms1.addInclude( "*module1*" );
- ms1.setIncludeSubModules( false );
-
- final ModuleBinaries mb = new ModuleBinaries();
-
- ds1.setScope( Artifact.SCOPE_COMPILE );
-
- mb.addDependencySet( ds1 );
- ms1.setBinaries( mb );
- moduleSets.add( ms1 );
- }
-
- final ModuleSet ms2 = new ModuleSet();
- final DependencySet ds2 = new DependencySet();
- {
- ms2.addInclude( "main-group:*" );
- ms2.setIncludeSubModules( true );
-
- final ModuleBinaries mb = new ModuleBinaries();
-
- ds2.setScope( Artifact.SCOPE_TEST );
-
- mb.addDependencySet( ds2 );
- ms2.setBinaries( mb );
- moduleSets.add( ms2 );
- }
-
- mm.replayAll();
-
- final DefaultDependencyResolver resolver =
- new DefaultDependencyResolver( this.resolver, metadataSource, factory, logger );
- resolver.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- final Assembly assembly = new Assembly();
- assembly.setModuleSets( moduleSets );
-
- resolver.updateModuleSetResolutionRequirements(AssemblyId.createAssemblyId( assembly), ms1, ds1, info, cs);
- resolver.updateModuleSetResolutionRequirements(AssemblyId.createAssemblyId( assembly ), ms2, ds2, info, cs);
-
- assertTrue( info.isResolutionRequired() );
-
- final Set<MavenProject> enabledProjects = info.getEnabledProjects();
- assertTrue( enabledProjects.contains( project ) );
-
- assertTrue( enabledProjects.contains( module1 ) );
-
- // these should be excluded since sub-modules are not traversable
- assertFalse( enabledProjects.contains( module1a ) );
- assertFalse( enabledProjects.contains( module1b ) );
-
- assertTrue( enabledProjects.contains( module2 ) );
- assertTrue( enabledProjects.contains( module2a ) );
-
- // these are the two we directly set above.
- assertTrue( info.getScopeFilter().isIncludeTestScope() );
- assertTrue( info.getScopeFilter().isIncludeCompileScope() );
-
- // this combination should be implied by the two direct scopes set above.
- assertTrue( info.getScopeFilter().isIncludeRuntimeScope() );
- assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
- assertTrue( info.getScopeFilter().isIncludeSystemScope() );
-
- mm.verifyAll();
- }
-
- public void test_getRepositoryResolutionRequirements()
- {
- final List<Repository> repositories = new ArrayList<Repository>();
-
- {
- final Repository r = new Repository();
- r.setScope( Artifact.SCOPE_COMPILE );
- repositories.add( r );
- }
-
- {
- final Repository r = new Repository();
- r.setScope( Artifact.SCOPE_SYSTEM );
- repositories.add( r );
- }
-
- final MavenProject project = createMavenProject( "group", "artifact", "1.0", null );
- final Assembly assembly = new Assembly();
- assembly.setRepositories( repositories );
-
- final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver( resolver, metadataSource, factory, logger ).updateRepositoryResolutionRequirements(assembly,
- info
- );
-
- assertTrue( info.isResolutionRequired() );
-
- assertTrue( info.getScopeFilter().isIncludeCompileScope() );
- assertTrue( info.getScopeFilter().isIncludeSystemScope() );
-
- assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
-
- assertFalse( info.getScopeFilter().isIncludeRuntimeScope() );
- assertFalse( info.getScopeFilter().isIncludeTestScope() );
- }
-
- public void test_aggregateRemoteArtifactRepositories()
- {
- final List<ArtifactRepository> externalRepos = new ArrayList<ArtifactRepository>();
-
- final ArtifactRepository er1 =
- repoFactory.createArtifactRepository( "test.1", "http://test.com/path", layout, null, null );
- externalRepos.add( er1 );
-
- final ArtifactRepository er2 =
- repoFactory.createArtifactRepository( "test.2", "http://test2.com/path", layout, null, null );
- externalRepos.add( er2 );
-
- final List<ArtifactRepository> projectRepos = new ArrayList<ArtifactRepository>();
-
- final ArtifactRepository pr1 =
- repoFactory.createArtifactRepository( "project.1", "http://test.com/project", layout, null, null );
- projectRepos.add( pr1 );
-
- final ArtifactRepository pr2 =
- repoFactory.createArtifactRepository( "project.2", "http://test2.com/path", layout, null, null );
- projectRepos.add( pr2 );
-
- final MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
- project.setRemoteArtifactRepositories( projectRepos );
-
- final List<ArtifactRepository> aggregated =
- new DefaultDependencyResolver( resolver, metadataSource, factory, logger ).aggregateRemoteArtifactRepositories( externalRepos,
- Collections.singleton( project ) );
-
- assertRepositoryWithId( er1.getId(), aggregated, true );
- assertRepositoryWithId( er2.getId(), aggregated, true );
- assertRepositoryWithId( pr1.getId(), aggregated, true );
- assertRepositoryWithId( pr2.getId(), aggregated, false );
- }
-
- // public void test_manageArtifact()
- // {
- // Artifact managed = factory.createArtifact( "group", "artifact", "1", Artifact.SCOPE_PROVIDED, "jar" );
- //
- // Artifact target =
- // factory.createArtifact( managed.getGroupId(), managed.getArtifactId(), "2", Artifact.SCOPE_COMPILE,
- // managed.getType() );
- //
- // Artifact target2 =
- // factory.createArtifact( "other-group", managed.getArtifactId(), "2", Artifact.SCOPE_COMPILE,
- // managed.getType() );
- //
- // Map managedVersions = Collections.singletonMap( managed.getDependencyConflictId(), managed );
- //
- // DefaultDependencyResolver resolver =
- // new DefaultDependencyResolver().setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- //
- // resolver.manageArtifact( target, managedVersions );
- // resolver.manageArtifact( target2, managedVersions );
- //
- // assertEquals( managed.getVersion(), target.getVersion() );
- // assertEquals( managed.getScope(), target.getScope() );
- //
- // assertEquals( "2", target2.getVersion() );
- // assertEquals( Artifact.SCOPE_COMPILE, target2.getScope() );
- // }
-
- // public void test_buildManagedVersionMap_NonTransitiveResolution()
- // throws ArtifactResolutionException, ArchiveCreationException, InvalidVersionSpecificationException,
- // InvalidDependencyVersionException
- // {
- // Assembly assembly = new Assembly();
- //
- // DependencySet ds = new DependencySet();
- // ds.setScope( Artifact.SCOPE_PROVIDED );
- // ds.setUseTransitiveDependencies( false );
- //
- // assembly.addDependencySet( ds );
- //
- // ModuleSet ms = new ModuleSet();
- // ModuleBinaries mb = new ModuleBinaries();
- // ms.setBinaries( mb );
- //
- // DependencySet mds = new DependencySet();
- // mds.setScope( Artifact.SCOPE_PROVIDED );
- // mds.setUseTransitiveDependencies( false );
- //
- // mb.addDependencySet( mds );
- //
- // assembly.addModuleSet( ms );
- //
- // MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
- //
- // Dependency d1 = new Dependency();
- // d1.setGroupId( "group.dep" );
- // d1.setArtifactId( "dep1" );
- // d1.setVersion( "1" );
- // d1.setScope( Artifact.SCOPE_COMPILE );
- //
- // project.getModel().addDependency( d1 );
- //
- // Dependency d2 = new Dependency();
- // d2.setGroupId( "group.dep" );
- // d2.setArtifactId( "dep2" );
- // d2.setVersion( "1" );
- // d2.setScope( Artifact.SCOPE_PROVIDED );
- //
- // project.getModel().addDependency( d2 );
- //
- // Dependency d3 = new Dependency();
- // d3.setGroupId( "group.dep" );
- // d3.setArtifactId( "dep3" );
- // d3.setVersion( "1" );
- // d3.setScope( Artifact.SCOPE_PROVIDED );
- //
- // project.getModel().addDependency( d3 );
- //
- // MavenProject module = createMavenProject( "group", "module", "1", new File( "base/module" ) );
- //
- // project.getModel().addModule( module.getArtifactId() );
- //
- // Dependency md = new Dependency();
- // md.setGroupId( "group.dep" );
- // md.setArtifactId( "dep3" );
- // md.setVersion( "2" );
- // md.setScope( Artifact.SCOPE_PROVIDED );
- //
- // module.getModel().addDependency( md );
- //
- // List allProjects = new ArrayList();
- // allProjects.add( project );
- // allProjects.add( module );
- //
- // MockManager mm = new MockManager();
- //
- // MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
- // mm.add( csControl );
- //
- // AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock();
- //
- // cs.getProject();
- // csControl.setReturnValue( project, MockControl.ZERO_OR_MORE );
- //
- // cs.getReactorProjects();
- // csControl.setReturnValue( allProjects, MockControl.ZERO_OR_MORE );
- //
- // cs.getRemoteRepositories();
- // csControl.setReturnValue( Collections.EMPTY_LIST, MockControl.ZERO_OR_MORE );
- //
- // mm.replayAll();
- //
- // DefaultDependencyResolver resolver = new DefaultDependencyResolver();
- // resolver.setArtifactFactory( factory );
- // resolver.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- //
- // Map managedVersionMap = resolver.buildManagedVersionMap( assembly, cs );
- //
- // {
- // Dependency d = d1;
- // Artifact a = (Artifact) managedVersionMap.get( d.getManagementKey() );
- // assertNull( a );
- // }
- //
- // {
- // Dependency d = d2;
- // Artifact a = (Artifact) managedVersionMap.get( d.getManagementKey() );
- // assertNotNull( a );
- // assertEquals( d.getVersion(), a.getVersion() );
- // assertEquals( d.getScope(), a.getScope() );
- // }
- //
- // {
- // Dependency d = d3;
- // Artifact a = (Artifact) managedVersionMap.get( d.getManagementKey() );
- // assertNotNull( a );
- // assertEquals( d.getVersion(), a.getVersion() );
- // assertEquals( d.getScope(), a.getScope() );
- // }
- //
- // mm.verifyAll();
- // }
- //
- // public void test_buildManagedVersionMap_TransitiveResolution()
- // throws ArtifactResolutionException, ArchiveCreationException, InvalidVersionSpecificationException,
- // InvalidDependencyVersionException
- // {
- // Assembly assembly = new Assembly();
- //
- // DependencySet ds = new DependencySet();
- // ds.setScope( Artifact.SCOPE_COMPILE );
- // ds.setUseTransitiveDependencies( true );
- //
- // assembly.addDependencySet( ds );
- //
- // MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
- //
- // Dependency d1 = new Dependency();
- // d1.setGroupId( "group.dep" );
- // d1.setArtifactId( "dep1" );
- // d1.setVersion( "1" );
- // d1.setScope( Artifact.SCOPE_COMPILE );
- //
- // project.getModel().addDependency( d1 );
- //
- // Dependency d2 = new Dependency();
- // d2.setGroupId( "group.dep" );
- // d2.setArtifactId( "dep2" );
- // d2.setVersion( "1" );
- // d2.setScope( Artifact.SCOPE_COMPILE );
- // final Artifact a2 = factory.createArtifact( d2.getGroupId(), d2.getArtifactId(), d2.getVersion(), d2.getScope(),
- // "jar" );
- //
- // project.getModel().addDependency( d2 );
- //
- // Dependency d3 = new Dependency();
- // d3.setGroupId( "group.dep" );
- // d3.setArtifactId( "dep3" );
- // d3.setVersion( "1" );
- // d3.setScope( Artifact.SCOPE_COMPILE );
- //
- // project.getModel().addDependency( d3 );
- //
- // final Artifact a2a = factory.createArtifact( d3.getGroupId(), d3.getArtifactId(), "2", Artifact.SCOPE_RUNTIME,
- // "jar" );
- //
- // MockManager mm = new MockManager();
- //
- // MockControl msControl = MockControl.createControl( ArtifactMetadataSource.class );
- // mm.add( msControl );
- //
- // ArtifactMetadataSource ms = (ArtifactMetadataSource) msControl.getMock();
- //
- // try
- // {
- // ms.retrieve( null, null, null );
- // }
- // catch ( ArtifactMetadataRetrievalException e )
- // {
- // }
- //
- // msControl.setDefaultReturnValue( new ResolutionGroup( null, Collections.EMPTY_SET, Collections.EMPTY_LIST ) );
- // msControl.setMatcher( new ArgumentsMatcher()
- // {
- // public boolean matches( Object[] expected, Object[] actual )
- // {
- // Artifact a = (Artifact) actual[0];
- //
- // return a2.getArtifactId().equals( a.getArtifactId() );
- // }
- //
- // public String toString( Object[] args )
- // {
- // return "with artifact: " + args[0] ;
- // }
- //
- // } );
- // msControl.setReturnValue( new ResolutionGroup( a2, Collections.singleton( a2a ), Collections.EMPTY_LIST ) );
- //
- //
- // MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
- // mm.add( csControl );
- //
- // AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock();
- //
- // cs.getProject();
- // csControl.setReturnValue( project, MockControl.ZERO_OR_MORE );
- //
- // String tmpDir = System.getProperty( "java.io.tmpdir" );
- // ArtifactRepository lr = repoFactory.createArtifactRepository( "local", "file://" + tmpDir, layout, null, null );
- //
- // cs.getLocalRepository();
- // csControl.setReturnValue( lr, MockControl.ZERO_OR_MORE );
- //
- // cs.getRemoteRepositories();
- // csControl.setReturnValue( Collections.EMPTY_LIST, MockControl.ZERO_OR_MORE );
- //
- // mm.replayAll();
- //
- // DefaultDependencyResolver resolver = new DefaultDependencyResolver();
- // resolver.setArtifactMetadataSource( ms );
- // resolver.setArtifactCollector( collector );
- // resolver.setArtifactFactory( factory );
- // resolver.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- //
- // Map managedVersionMap = resolver.buildManagedVersionMap( assembly, cs );
- //
- // {
- // Dependency d = d1;
- // Artifact a = (Artifact) managedVersionMap.get( d.getManagementKey() );
- // assertNotNull( a );
- // assertEquals( d.getVersion(), a.getVersion() );
- // assertEquals( d.getScope(), a.getScope() );
- // }
- //
- // {
- // Dependency d = d2;
- // Artifact a = (Artifact) managedVersionMap.get( d.getManagementKey() );
- // assertNotNull( a );
- // assertEquals( d.getVersion(), a.getVersion() );
- // assertEquals( d.getScope(), a.getScope() );
- // }
- //
- // {
- // Dependency d = d3;
- // Artifact a = (Artifact) managedVersionMap.get( d.getManagementKey() );
- // assertNotNull( a );
- // assertEquals( d.getVersion(), a.getVersion() );
- // assertEquals( d.getScope(), a.getScope() );
- // }
- //
- // mm.verifyAll();
- // }
-
- private void assertRepositoryWithId( final String repoId, final List<ArtifactRepository> repos,
- final boolean shouldExist )
- {
- if ( ( repos == null || repos.isEmpty() ) )
- {
- if ( shouldExist )
- {
- fail( "Repository with id: " + repoId + " should be present, but repository list is null or empty." );
- }
- }
- else
- {
- boolean found = false;
- for (final ArtifactRepository repo : repos) {
- if (repoId.equals(repo.getId())) {
- found = true;
- break;
- }
- }
-
- if ( shouldExist )
- {
- assertTrue( "Repository with id: " + repoId + " should be present in repository list.", found );
- }
- else
- {
- assertFalse( "Repository with id: " + repoId + " should NOT be present in repository list.", found );
- }
- }
- }
-
- private MavenProject createMavenProject( final String groupId, final String artifactId, final String version,
- final File basedir )
- {
- final Model model = new Model();
-
- model.setGroupId( groupId );
- model.setArtifactId( artifactId );
- model.setVersion( version );
- model.setPackaging( "pom" );
-
- final MavenProject project = new MavenProject( model );
-
- final Artifact pomArtifact = factory.createProjectArtifact( groupId, artifactId, version );
- project.setArtifact( pomArtifact );
-
- project.setFile( new File( basedir, "pom.xml" ) );
-
- return project;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfoTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfoTest.java
deleted file mode 100644
index c31ce9d..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfoTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.apache.maven.plugin.assembly.artifact;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.project.MavenProject;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-
-public class ResolutionManagementInfoTest
- extends TestCase
-{
-
- public void testName()
- throws Exception
- {
-
- }
-
- public void testAddSingleArtifactWithReplacemen()
- throws Exception
- {
- ResolutionManagementInfo rmi = new ResolutionManagementInfo( new MavenProject( ) );
- Artifact a1 = new DefaultArtifact( "groupid", "1", VersionRange.createFromVersion("1.0"), "test", "jar", null, new DefaultArtifactHandler() );
- rmi.addArtifacts( Collections.singleton( a1));
- Artifact a2 = new DefaultArtifact( "groupid", "1", VersionRange.createFromVersion("1.0"), "compile", "jar", null, new DefaultArtifactHandler() );
- rmi.addArtifacts( Collections.singleton( a2));
- assertEquals( 1, rmi.getArtifacts().size());
- Artifact next = rmi.getArtifacts().iterator().next();
- assertEquals("compile", next.getScope());
- }
-
- public void testAddMultiArtifactWithReplacemen()
- throws Exception
- {
- ResolutionManagementInfo rmi = new ResolutionManagementInfo( new MavenProject( ) );
- Artifact a1 = new DefaultArtifact( "groupid", "a1", VersionRange.createFromVersion("1.0"), "test", "jar", null, new DefaultArtifactHandler() );
- Artifact a2 = new DefaultArtifact( "groupid", "a2", VersionRange.createFromVersion("1.0"), "test", "jar", null, new DefaultArtifactHandler() );
- Artifact a3 = new DefaultArtifact( "groupid", "a3", VersionRange.createFromVersion("1.0"), "test", "jar", null, new DefaultArtifactHandler() );
- rmi.addArtifacts( new HashSet<Artifact>( Arrays.asList( a1, a2, a3 )));
- Artifact b2 = new DefaultArtifact( "groupid", "a2", VersionRange.createFromVersion("1.0"), "compile", "jar", null, new DefaultArtifactHandler() );
- Artifact b3 = new DefaultArtifact( "groupid", "a3", VersionRange.createFromVersion("1.0"), "compile", "jar", null, new DefaultArtifactHandler() );
- rmi.addArtifacts( new HashSet<Artifact>( Arrays.asList( b2, b3)));
- assertEquals( 3, rmi.getArtifacts().size());
- int compile = 0;
- int test = 0;
- for ( Artifact artifact : rmi.getArtifacts() )
- {
- if ( Artifact.SCOPE_COMPILE.equals( artifact.getScope() )) compile++;
- else test++;
- }
- assertEquals(2, compile);
- assertEquals(1, test);
- }
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
deleted file mode 100644
index 289311d..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
+++ /dev/null
@@ -1,631 +0,0 @@
-package org.apache.maven.plugin.assembly.filter;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.codehaus.plexus.archiver.ArchiveEntry;
-import org.codehaus.plexus.archiver.ArchiveFinalizer;
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
-import org.codehaus.plexus.archiver.ResourceIterator;
-import org.codehaus.plexus.archiver.diags.NoOpArchiver;
-import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
-
-import javax.annotation.Nonnull;
-
-public class ComponentsXmlArchiverFileFilterTest
- extends TestCase
-{
- private ComponentsXmlArchiverFileFilter filter;
-
- private final TestFileManager fileManager = new TestFileManager( "componentsXmlArchiverFileFilter.test", ".zip" );
-
- @Override
- public void setUp()
- {
- filter = new ComponentsXmlArchiverFileFilter();
- }
-
- @Override
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testAddComponentsXml_ShouldAddComponentWithoutRoleHint()
- throws IOException, XmlPullParserException
- {
- final Reader reader = writeComponentsXml(
- Collections.singletonList( new ComponentDef( "role", null, "org.apache.maven.Impl" ) ) );
-
- filter.addComponentsXml( reader );
-
- assertFalse( filter.components.isEmpty() );
-
- final Xpp3Dom componentDom = filter.components.get( "role" );
-
- assertEquals( "role", componentDom.getChild( "role" ).getValue() );
- assertNull( componentDom.getChild( "role-hint" ) );
- assertEquals( "org.apache.maven.Impl", componentDom.getChild( "implementation" ).getValue() );
- }
-
- public void testAddComponentsXml_ShouldAddComponentWithRoleHint()
- throws IOException, XmlPullParserException
- {
- final Reader reader = writeComponentsXml(
- Collections.singletonList( new ComponentDef( "role", "hint", "org.apache.maven.Impl" ) ) );
-
- filter.addComponentsXml( reader );
-
- assertFalse( filter.components.isEmpty() );
-
- final Xpp3Dom componentDom = filter.components.get( "rolehint" );
-
- assertEquals( "role", componentDom.getChild( "role" ).getValue() );
- assertEquals( "hint", componentDom.getChild( "role-hint" ).getValue() );
- assertEquals( "org.apache.maven.Impl", componentDom.getChild( "implementation" ).getValue() );
- }
-
- public void testAddComponentsXml_ShouldAddTwoComponentsWithRoleHints()
- throws IOException, XmlPullParserException
- {
- final List<ComponentDef> defs = new ArrayList<ComponentDef>();
-
- defs.add( new ComponentDef( "role", "hint", "org.apache.maven.Impl" ) );
- defs.add( new ComponentDef( "role", "hint2", "org.apache.maven.Impl2" ) );
-
- final Reader reader = writeComponentsXml( defs );
-
- filter.addComponentsXml( reader );
-
- assertFalse( filter.components.isEmpty() );
-
- Xpp3Dom componentDom = filter.components.get( "rolehint" );
-
- assertEquals( "role", componentDom.getChild( "role" ).getValue() );
- assertEquals( "hint", componentDom.getChild( "role-hint" ).getValue() );
- assertEquals( "org.apache.maven.Impl", componentDom.getChild( "implementation" ).getValue() );
-
- componentDom = filter.components.get( "rolehint2" );
-
- assertEquals( "role", componentDom.getChild( "role" ).getValue() );
- assertEquals( "hint2", componentDom.getChild( "role-hint" ).getValue() );
- assertEquals( "org.apache.maven.Impl2", componentDom.getChild( "implementation" ).getValue() );
- }
-
- public void testAddToArchive_ShouldWriteComponentWithoutHintToFile()
- throws IOException, ArchiverException, JDOMException
- {
- final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", null, "impl" ) );
-
- filter.components = new LinkedHashMap<String, Xpp3Dom>();
- filter.components.put( "role", dom );
-
- final FileCatchingArchiver fca = new FileCatchingArchiver();
-
- filter.finalizeArchiveCreation( fca );
-
- assertEquals( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH, fca.getDestFileName() );
-
- final SAXBuilder builder = new SAXBuilder( false );
-
- final Document doc = builder.build( fca.getFile() );
-
- final XPath role = XPath.newInstance( "//component[position()=1]/role/text()" );
- final XPath hint = XPath.newInstance( "//component[position()=1]/role-hint/text()" );
- final XPath implementation = XPath.newInstance( "//component[position()=1]/implementation/text()" );
-
- assertEquals( "role", ( (Text) role.selectSingleNode( doc ) ).getText() );
- assertNull( hint.selectSingleNode( doc ) );
- assertEquals( "impl", ( (Text) implementation.selectSingleNode( doc ) ).getText() );
- }
-
- public void testAddToArchive_ShouldWriteComponentWithHintToFile()
- throws IOException, ArchiverException, JDOMException
- {
- final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", "hint", "impl" ) );
-
- filter.components = new LinkedHashMap<String, Xpp3Dom>();
- filter.components.put( "rolehint", dom );
-
- final FileCatchingArchiver fca = new FileCatchingArchiver();
-
- filter.finalizeArchiveCreation( fca );
-
- assertEquals( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH, fca.getDestFileName() );
-
- final SAXBuilder builder = new SAXBuilder( false );
-
- final Document doc = builder.build( fca.getFile() );
-
- final XPath role = XPath.newInstance( "//component[position()=1]/role/text()" );
- final XPath hint = XPath.newInstance( "//component[position()=1]/role-hint/text()" );
- final XPath implementation = XPath.newInstance( "//component[position()=1]/implementation/text()" );
-
- assertEquals( "role", ( (Text) role.selectSingleNode( doc ) ).getText() );
- assertEquals( "hint", ( (Text) hint.selectSingleNode( doc ) ).getText() );
- assertEquals( "impl", ( (Text) implementation.selectSingleNode( doc ) ).getText() );
- }
-
- public void testAddToArchive_ShouldWriteTwoComponentToFile()
- throws IOException, ArchiverException, JDOMException
- {
- filter.components = new LinkedHashMap<String, Xpp3Dom>();
-
- final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", "hint", "impl" ) );
-
- filter.components.put( "rolehint", dom );
-
- final Xpp3Dom dom2 = createComponentDom( new ComponentDef( "role", "hint2", "impl" ) );
-
- filter.components.put( "rolehint2", dom2 );
-
- final FileCatchingArchiver fca = new FileCatchingArchiver();
-
- filter.finalizeArchiveCreation( fca );
-
- assertEquals( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH, fca.getDestFileName() );
-
- final SAXBuilder builder = new SAXBuilder( false );
-
- final Document doc = builder.build( fca.getFile() );
-
- final XPath role = XPath.newInstance( "//component[position()=1]/role/text()" );
- final XPath hint = XPath.newInstance( "//component[position()=1]/role-hint/text()" );
- final XPath implementation = XPath.newInstance( "//component[position()=1]/implementation/text()" );
-
- assertEquals( "role", ( (Text) role.selectSingleNode( doc ) ).getText() );
- assertEquals( "hint", ( (Text) hint.selectSingleNode( doc ) ).getText() );
- assertEquals( "impl", ( (Text) implementation.selectSingleNode( doc ) ).getText() );
-
- final XPath role2 = XPath.newInstance( "//component[position()=2]/role/text()" );
- final XPath hint2 = XPath.newInstance( "//component[position()=2]/role-hint/text()" );
- final XPath implementation2 = XPath.newInstance( "//component[position()=2]/implementation/text()" );
-
- assertEquals( "role", ( (Text) role2.selectSingleNode( doc ) ).getText() );
- assertEquals( "hint2", ( (Text) hint2.selectSingleNode( doc ) ).getText() );
- assertEquals( "impl", ( (Text) implementation2.selectSingleNode( doc ) ).getText() );
-
- }
-
- public void testAddToArchive_ShouldWriteTwoComponentToArchivedFile()
- throws IOException, ArchiverException, JDOMException
- {
- filter.components = new LinkedHashMap<String, Xpp3Dom>();
-
- final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", "hint", "impl" ) );
-
- filter.components.put( "rolehint", dom );
-
- final Xpp3Dom dom2 = createComponentDom( new ComponentDef( "role", "hint2", "impl" ) );
-
- filter.components.put( "rolehint2", dom2 );
-
- final ZipArchiver archiver = new ZipArchiver();
-
- final File archiveFile = fileManager.createTempFile();
-
- archiver.setDestFile( archiveFile );
-
- final File descriptorFile = fileManager.createTempFile();
-
- archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( filter ) );
-
- archiver.createArchive();
-
- final ZipFile zf = new ZipFile( archiveFile );
-
- final ZipEntry ze = zf.getEntry( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH );
-
- assertNotNull( ze );
-
- final FileOutputStream fileStream = new FileOutputStream( descriptorFile );
-
- IOUtil.copy( zf.getInputStream( ze ), fileStream );
- IOUtil.close( fileStream );
-
- final SAXBuilder builder = new SAXBuilder( false );
-
- final Document doc = builder.build( descriptorFile );
-
- final XPath role = XPath.newInstance( "//component[position()=1]/role/text()" );
- final XPath hint = XPath.newInstance( "//component[position()=1]/role-hint/text()" );
- final XPath implementation = XPath.newInstance( "//component[position()=1]/implementation/text()" );
-
- assertEquals( "role", ( (Text) role.selectSingleNode( doc ) ).getText() );
- assertEquals( "hint", ( (Text) hint.selectSingleNode( doc ) ).getText() );
- assertEquals( "impl", ( (Text) implementation.selectSingleNode( doc ) ).getText() );
-
- final XPath role2 = XPath.newInstance( "//component[position()=2]/role/text()" );
- final XPath hint2 = XPath.newInstance( "//component[position()=2]/role-hint/text()" );
- final XPath implementation2 = XPath.newInstance( "//component[position()=2]/implementation/text()" );
-
- assertEquals( "role", ( (Text) role2.selectSingleNode( doc ) ).getText() );
- assertEquals( "hint2", ( (Text) hint2.selectSingleNode( doc ) ).getText() );
- assertEquals( "impl", ( (Text) implementation2.selectSingleNode( doc ) ).getText() );
-
- }
-
- private Xpp3Dom createComponentDom( final ComponentDef def )
- {
- final Xpp3Dom dom = new Xpp3Dom( "component" );
-
- final Xpp3Dom role = new Xpp3Dom( "role" );
- role.setValue( def.role );
- dom.addChild( role );
-
- final String hint = def.roleHint;
- if ( hint != null )
- {
- final Xpp3Dom roleHint = new Xpp3Dom( "role-hint" );
- roleHint.setValue( hint );
- dom.addChild( roleHint );
- }
-
- final Xpp3Dom impl = new Xpp3Dom( "implementation" );
- impl.setValue( def.implementation );
- dom.addChild( impl );
-
- return dom;
- }
-
- private Reader writeComponentsXml( final List<ComponentDef> componentDefs )
- throws IOException
- {
- final StringWriter writer = new StringWriter();
-
- final PrettyPrintXMLWriter xmlWriter = new PrettyPrintXMLWriter( writer );
-
- xmlWriter.startElement( "component-set" );
- xmlWriter.startElement( "components" );
-
- for ( final ComponentDef def : componentDefs )
- {
- xmlWriter.startElement( "component" );
-
- xmlWriter.startElement( "role" );
- xmlWriter.writeText( def.role );
- xmlWriter.endElement();
-
- final String roleHint = def.roleHint;
- if ( roleHint != null )
- {
- xmlWriter.startElement( "role-hint" );
- xmlWriter.writeText( roleHint );
- xmlWriter.endElement();
- }
-
- xmlWriter.startElement( "implementation" );
- xmlWriter.writeText( def.implementation );
- xmlWriter.endElement();
-
- xmlWriter.endElement();
- }
-
- xmlWriter.endElement();
- xmlWriter.endElement();
-
- return new StringReader( writer.toString() );
- }
-
- private static final class ComponentDef
- {
- final String role;
-
- final String roleHint;
-
- final String implementation;
-
- ComponentDef( final String role, final String roleHint, final String implementation )
- {
- this.role = role;
- this.roleHint = roleHint;
- this.implementation = implementation;
-
- }
- }
-
- private static final class FileCatchingArchiver
- extends NoOpArchiver
- {
-
- private File inputFile;
-
- private String destFileName;
-
- public void addDirectory( final @Nonnull File directory )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addDirectory( final @Nonnull File directory, final String prefix )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addDirectory( final @Nonnull File directory, final String[] includes, final String[] excludes )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addDirectory( final @Nonnull File directory, final String prefix, final String[] includes,
- final String[] excludes )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName )
- throws ArchiverException
- {
- this.inputFile = inputFile;
- this.destFileName = destFileName;
- }
-
- File getFile()
- {
- return inputFile;
- }
-
- String getDestFileName()
- {
- return destFileName;
- }
-
- public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName, final int permissions )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void createArchive()
- throws ArchiverException, IOException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public int getDefaultDirectoryMode()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public int getDefaultFileMode()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public File getDestFile()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addSymlink( String s, String s2 )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addSymlink( String s, int i, String s2 )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- @SuppressWarnings( "rawtypes" )
- public Map<String, ArchiveEntry> getFiles()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public boolean getIncludeEmptyDirs()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setDefaultDirectoryMode( final int mode )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setDefaultFileMode( final int mode )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setDestFile( final File destFile )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setIncludeEmptyDirs( final boolean includeEmptyDirs )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addArchivedFileSet( final @Nonnull File archiveFile )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix, final String[] includes,
- final String[] excludes )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setForced( final boolean forced )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public boolean isForced()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public boolean isSupportingForced()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setDotFileDirectory( final File dotFileDirectory )
- {
- }
-
- public void addArchivedFileSet( final ArchivedFileSet fileSet )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addFileSet( final @Nonnull FileSet fileSet )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void addResources( final PlexusIoResourceCollection resources )
- throws ArchiverException
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public
- @Nonnull
- ResourceIterator getResources()
- throws ArchiverException
- {
- return new ResourceIterator()
- {
-
- public boolean hasNext()
- throws ArchiverException
- {
- return false;
- }
-
- public ArchiveEntry next()
- throws ArchiverException
- {
- throw new NoSuchElementException();
- }
-
- public void remove()
- {
- throw new NoSuchElementException();
- }
- };
- }
-
- public String getDuplicateBehavior()
- {
- return Archiver.DUPLICATES_ADD;
- }
-
- public void setDuplicateBehavior( final String duplicate )
- {
- }
-
- public int getDirectoryMode()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public int getFileMode()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public int getOverrideDirectoryMode()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public int getOverrideFileMode()
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setDirectoryMode( final int mode )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
-
- public void setFileMode( final int mode )
- {
- throw new UnsupportedOperationException( "not supported" );
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java
deleted file mode 100644
index 2bc196d..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.apache.maven.plugin.assembly.format;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.testutils.PojoConfigSource;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.filtering.DefaultMavenReaderFilter;
-import org.codehaus.plexus.archiver.resources.PlexusIoVirtualFileResource;
-import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import static org.apache.maven.plugin.assembly.format.ReaderFormatter.getFileSetTransformers;
-import static org.junit.Assert.assertEquals;
-
-
-@SuppressWarnings( "ConstantConditions" )
-public class ReaderFormatterTest
-{
- @Test
- public void lineDosFeed()
- throws IOException, AssemblyFormattingException
- {
- final PojoConfigSource cfg = getPojoConfigSource();
- InputStreamTransformer fileSetTransformers = getFileSetTransformers( cfg, true, "dos" );
- InputStream fud = fileSetTransformers.transform( dummyResource(), payload( "This is a\ntest." ) );
- assertEquals( "This is a\r\ntest.", readResultStream( fud ) );
- }
-
- @Test
- public void lineDosFeed_withoutFiltering()
- throws IOException, AssemblyFormattingException
- {
- final PojoConfigSource cfg = getPojoConfigSource();
- InputStreamTransformer fileSetTransformers = getFileSetTransformers( cfg, false, "dos" );
- InputStream fud = fileSetTransformers.transform( dummyResource(), payload( "This is a\ntest." ) );
- assertEquals( "This is a\r\ntest.", readResultStream( fud ) );
- }
-
- @Test
- public void lineUnixFeedWithInterpolation()
- throws IOException, AssemblyFormattingException
- {
- final PojoConfigSource cfg = getPojoConfigSource();
- InputStreamTransformer fileSetTransformers = getFileSetTransformers( cfg, true, "unix" );
- InputStream fud = fileSetTransformers.transform( dummyResource(), payload( "This is a test for project: ${artifactId} @artifactId@.") );
- assertEquals( "This is a test for project: anArtifact anArtifact.", readResultStream( fud ) );
- }
-
-
- private MavenProject createBasicMavenProject()
- {
- final Model model = new Model();
- model.setArtifactId( "anArtifact" );
- model.setGroupId( "group" );
- model.setVersion( "version" );
-
- return new MavenProject( model );
- }
-
-
- private String readResultStream( InputStream fud )
- throws IOException
- {
- byte[] actual = new byte[100];
- int read = IOUtils.read( fud, actual );
- return new String( actual, 0, read);
- }
-
- private ByteArrayInputStream payload( String payload )
- {
- return new ByteArrayInputStream( payload.getBytes() );
- }
-
- private PojoConfigSource getPojoConfigSource()
- {
- final PojoConfigSource cfg = new PojoConfigSource();
- cfg.setEncoding( "UTF-8" );
- DefaultMavenReaderFilter mavenReaderFilter = new DefaultMavenReaderFilter();
- mavenReaderFilter.enableLogging( new ConsoleLogger( 2, "fud" ) );
- cfg.setMavenReaderFilter( mavenReaderFilter );
- cfg.setEscapeString( null );
- cfg.setMavenProject( createBasicMavenProject() );
-
-/* expect( configSource.getFilters()).andReturn( filters );
-
- expect( configSource.isIncludeProjectBuildFilters()).andReturn( includeProjectBuildFilters );
-
- expect( configSource.getDelimiters()).andReturn( delimiters );
-*/
- return cfg;
- }
-
- private PlexusIoVirtualFileResource dummyResource()
- {
- return new PlexusIoVirtualFileResource( new File( "fud" ), "fud" )
- {
- };
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java
deleted file mode 100644
index 71d92b3..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.apache.maven.plugin.assembly.interpolation;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.testutils.PojoConfigSource;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource;
-import org.easymock.classextension.EasyMockSupport;
-import org.easymock.classextension.IMocksControl;
-
-import java.util.Properties;
-
-import static org.easymock.EasyMock.expect;
-
-public class AssemblyExpressionEvaluatorTest
- extends TestCase
-{
-
- private final PojoConfigSource configSourceStub = new PojoConfigSource();
-
- public void testShouldResolveModelGroupId()
- throws ExpressionEvaluationException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- configSourceStub.setMavenProject( new MavenProject( model ) );
- setupInterpolation();
-
-
-
- final Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${groupId}" );
-
- assertEquals( "assembly.group.id", result );
- }
-
- private void setupInterpolation()
- {
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create() );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
- configSourceStub.setEnvInterpolator( FixedStringSearchInterpolator.create() );
-
- }
-
- public void testShouldResolveModelPropertyBeforeModelGroupId()
- throws ExpressionEvaluationException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Properties props = new Properties();
- props.setProperty( "groupId", "other.id" );
-
- model.setProperties( props );
-
- configSourceStub.setMavenProject( new MavenProject( model ) );
- setupInterpolation();
-
- final Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${groupId}" );
-
- assertEquals( "assembly.other.id", result );
- }
-
- public void testShouldResolveContextValueBeforeModelPropertyOrModelGroupIdInAssemblyId()
- throws ExpressionEvaluationException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Properties props = new Properties();
- props.setProperty( "groupId", "other.id" );
-
- model.setProperties( props );
-
- final EasyMockSupport mm = new EasyMockSupport();
-
- MavenSession session = mm.createControl().createMock( MavenSession.class );
-
- final Properties execProps = new Properties();
- execProps.setProperty( "groupId", "still.another.id" );
-
- PropertiesBasedValueSource cliProps = new PropertiesBasedValueSource( execProps );
- expect( session.getExecutionProperties()).andReturn( execProps ).anyTimes();
- expect( session.getUserProperties()).andReturn( new Properties() ).anyTimes();
-
-
-
-
- AssemblerConfigurationSource cs = mm.createControl().createMock( AssemblerConfigurationSource.class );
- expect( cs.getCommandLinePropsInterpolator() ).andReturn( FixedStringSearchInterpolator.create(cliProps) ).anyTimes();
- expect( cs.getRepositoryInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( cs.getEnvInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
-
- expect( cs.getMavenSession() ).andReturn( session ).anyTimes();
- expect( cs.getProject() ).andReturn( new MavenProject( model ) );
-
- final IMocksControl lrCtl = mm.createControl();
- final ArtifactRepository lr = lrCtl.createMock( ArtifactRepository.class );
-
- expect( lr.getBasedir()).andReturn( "/path/to/local/repo" ).anyTimes();
- expect( cs.getLocalRepository()).andReturn( lr ).anyTimes();
-
- mm.replayAll();
-
- final Object result = new AssemblyExpressionEvaluator( cs ).evaluate( "assembly.${groupId}" );
-
- assertEquals( "assembly.still.another.id", result );
-
- mm.verifyAll();
- }
-
- public void testShouldReturnUnchangedInputForUnresolvedExpression()
- throws ExpressionEvaluationException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- configSourceStub.setMavenProject( new MavenProject( model ) );
- setupInterpolation();
-
- final Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${unresolved}" );
-
- assertEquals( "assembly.${unresolved}", result );
- }
-
- public void testShouldInterpolateMultiDotProjectExpression()
- throws ExpressionEvaluationException
- {
- final Build build = new Build();
- build.setFinalName( "final-name" );
-
- final Model model = new Model();
- model.setBuild( build );
-
- configSourceStub.setMavenProject( new MavenProject( model ) );
- setupInterpolation();
-
-
- final Object result =
- new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${project.build.finalName}" );
-
- assertEquals( "assembly.final-name", result );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
deleted file mode 100644
index a87f77b..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package org.apache.maven.plugin.assembly.interpolation;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.io.AssemblyReadException;
-import org.apache.maven.plugin.assembly.io.DefaultAssemblyReader;
-import org.apache.maven.plugin.assembly.io.DefaultAssemblyReaderTest;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.testutils.PojoConfigSource;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.List;
-import java.util.Properties;
-
-import static org.easymock.EasyMock.expect;
-
-public class AssemblyInterpolatorTest
- extends TestCase
-{
-
- public void testDependencySetOutputFileNameMappingsAreNotInterpolated()
- throws IOException, AssemblyInterpolationException, AssemblyReadException,
- InvalidAssemblerConfigurationException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final MavenProject project = new MavenProject( model );
-
- final Assembly assembly = new Assembly();
-
- // artifactId is blacklisted, but packaging is not.
- final String outputFileNameMapping = "${artifactId}.${packaging}";
-
- final DependencySet set = new DependencySet();
- set.setOutputFileNameMapping( outputFileNameMapping );
-
- assembly.addDependencySet( set );
-
- final PojoConfigSource configSourceStub = new PojoConfigSource();
-
-
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create( ) );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
-
- configSourceStub.setMavenProject( project);
- final Assembly outputAssembly = roundTripInterpolation( assembly, configSourceStub );
-
- final List<DependencySet> outputDependencySets = outputAssembly.getDependencySets();
- assertEquals( 1, outputDependencySets.size() );
-
- final DependencySet outputSet = outputDependencySets.get( 0 );
-
- assertEquals( "${artifactId}.${packaging}", outputSet.getOutputFileNameMapping() );
- }
-
- public void testDependencySetOutputDirectoryIsNotInterpolated()
- throws IOException, AssemblyInterpolationException, AssemblyReadException,
- InvalidAssemblerConfigurationException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Assembly assembly = new Assembly();
-
- final String outputDirectory = "${artifactId}.${packaging}";
-
- final DependencySet set = new DependencySet();
- set.setOutputDirectory( outputDirectory );
-
- assembly.addDependencySet( set );
-
- final PojoConfigSource configSourceStub = new PojoConfigSource();
-
-
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create() );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
-
- final MavenProject project = new MavenProject( model );
- configSourceStub.setMavenProject( project);
- final Assembly outputAssembly = roundTripInterpolation( assembly, configSourceStub );
-
- final List<DependencySet> outputDependencySets = outputAssembly.getDependencySets();
- assertEquals( 1, outputDependencySets.size() );
-
- final DependencySet outputSet = outputDependencySets.get( 0 );
-
- assertEquals( "${artifactId}.${packaging}", outputSet.getOutputDirectory() );
- }
-
- public Assembly roundTripInterpolation( Assembly assembly, AssemblerConfigurationSource configSource )
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final StringReader stringReader = DefaultAssemblyReaderTest.writeToStringReader( assembly );
- return new DefaultAssemblyReader().readAssembly( stringReader, "testLocation", null,
- configSource );
- }
-
- public void testShouldResolveModelGroupIdInAssemblyId()
- throws AssemblyInterpolationException, InvalidAssemblerConfigurationException, AssemblyReadException,
- IOException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "assembly.${groupId}" );
-
- final MavenProject project = new MavenProject( model );
- final PojoConfigSource configSourceStub = new PojoConfigSource();
-
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create() );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
- configSourceStub.setMavenProject( project);
- final Assembly outputAssembly = roundTripInterpolation( assembly, configSourceStub );
- assertEquals( "assembly.group.id", outputAssembly.getId() );
- }
-
- public void testShouldResolveModelPropertyBeforeModelGroupIdInAssemblyId()
- throws AssemblyInterpolationException, InvalidAssemblerConfigurationException, AssemblyReadException,
- IOException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Properties props = new Properties();
- props.setProperty( "groupId", "other.id" );
-
- model.setProperties( props );
-
- final PojoConfigSource configSourceStub = new PojoConfigSource();
-
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create( ) );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "assembly.${groupId}" );
-
- final MavenProject project = new MavenProject( model );
- configSourceStub.setMavenProject( project);
- final Assembly result = roundTripInterpolation( assembly, configSourceStub );
-
- assertEquals( "assembly.other.id", result.getId() );
- }
-
- public void testShouldResolveContextValueBeforeModelPropertyOrModelGroupIdInAssemblyId()
- throws AssemblyInterpolationException, InvalidAssemblerConfigurationException, AssemblyReadException,
- IOException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Properties props = new Properties();
- props.setProperty( "groupId", "other.id" );
-
- model.setProperties( props );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "assembly.${groupId}" );
-
- final EasyMockSupport mm = new EasyMockSupport();
-
- final MavenSession session = mm.createMock( MavenSession.class );
-
- final Properties execProps = new Properties();
- execProps.setProperty( "groupId", "still.another.id" );
-
- expect( session.getExecutionProperties()).andReturn( execProps ).anyTimes();
-
- expect( session.getUserProperties()).andReturn( new Properties()).anyTimes();
-
- final PojoConfigSource cs = new PojoConfigSource();
-
- final ArtifactRepository lr = mm.createMock( ArtifactRepository.class );
-
- cs.setLocalRepository( lr );
- cs.setMavenSession( session );
- cs.setRootInterpolator( FixedStringSearchInterpolator.create() );
- cs.setEnvironmentInterpolator( FixedStringSearchInterpolator.create(
- new PropertiesBasedValueSource(execProps) ));
- cs.setEnvInterpolator( FixedStringSearchInterpolator.empty() );
-
- expect( lr.getBasedir() ).andReturn( "/path/to/local/repo").anyTimes();
-
- mm.replayAll();
-
- final MavenProject project = new MavenProject( model );
- cs.setMavenProject( project );
- final Assembly result = roundTripInterpolation( assembly, cs );
-
- assertEquals( "assembly.still.another.id", result.getId() );
-
- mm.verifyAll();
- mm.resetAll();
- }
-
- public void testShouldNotTouchUnresolvedExpression()
- throws AssemblyInterpolationException, InvalidAssemblerConfigurationException, AssemblyReadException,
- IOException
- {
- final Model model = new Model();
- model.setArtifactId( "artifact-id" );
- model.setGroupId( "group.id" );
- model.setVersion( "1" );
- model.setPackaging( "jar" );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "assembly.${unresolved}" );
-
- final PojoConfigSource configSourceStub = new PojoConfigSource();
-
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create( ) );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
-
-
- final MavenProject project = new MavenProject( model );
- configSourceStub.setMavenProject( project);
- final Assembly result = roundTripInterpolation( assembly, configSourceStub );
- assertEquals( "assembly.${unresolved}", result.getId() );
- }
-
- public void testShouldInterpolateMultiDotProjectExpression()
- throws AssemblyInterpolationException, InvalidAssemblerConfigurationException, AssemblyReadException,
- IOException
- {
- final Build build = new Build();
- build.setFinalName( "final-name" );
-
- final Model model = new Model();
- model.setBuild( build );
-
- final Assembly assembly = new Assembly();
-
- assembly.setId( "assembly.${project.build.finalName}" );
-
- final PojoConfigSource configSourceStub = new PojoConfigSource();
-
- configSourceStub.setRootInterpolator( FixedStringSearchInterpolator.create( ) );
- configSourceStub.setEnvironmentInterpolator( FixedStringSearchInterpolator.create() );
-
- final MavenProject project = new MavenProject( model );
- configSourceStub.setMavenProject( project);
- final Assembly result = roundTripInterpolation( assembly, configSourceStub );
- assertEquals( "assembly.final-name", result.getId() );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
deleted file mode 100644
index ee9b8da..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
+++ /dev/null
@@ -1,1145 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.Component;
-import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.FileItem;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer;
-import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader;
-import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Writer;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.interpolation.fixed.InterpolationState;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.IOUtil;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.easymock.EasyMock.expect;
-
-@SuppressWarnings("ResultOfMethodCallIgnored")
-public class DefaultAssemblyReaderTest
- extends TestCase
-{
-
- private TestFileManager fileManager;
-
- private EasyMockSupport mockManager;
-
-
- private AssemblerConfigurationSource configSource;
-
-
- @Override
- public void setUp()
- {
- fileManager = new TestFileManager( "assembly-reader.test.", ".xml" );
- mockManager = new EasyMockSupport();
-
- configSource = mockManager.createMock(AssemblerConfigurationSource.class);
-
- ArtifactRepository localRepo = mockManager.createMock( ArtifactRepository.class );
-
- expect( localRepo.getBasedir()).andReturn("/path/to/local/repo").anyTimes();
- expect(configSource.getLocalRepository()).andReturn( localRepo ).anyTimes();
- expect( configSource.getRemoteRepositories()).andReturn( Collections.<ArtifactRepository>emptyList()).anyTimes();
- expect(configSource.getMavenSession()).andReturn( null).anyTimes();
- }
-
- @Override
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testIncludeSiteInAssembly_ShouldFailIfSiteDirectoryNonExistent()
- throws IOException
- {
- final File siteDir = File.createTempFile( "assembly-reader.", ".test" );
- siteDir.delete();
-
- expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes();
-
- final Assembly assembly = new Assembly();
-
- mockManager.replayAll();
-
- try
- {
- new DefaultAssemblyReader().includeSiteInAssembly( assembly, configSource );
-
- fail( "Should fail when site directory is non-existent." );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- // this should happen.
- }
-
- mockManager.verifyAll();
- }
-
- public void testIncludeSiteInAssembly_ShouldAddSiteDirFileSetWhenDirExists()
- throws IOException, InvalidAssemblerConfigurationException
- {
- final File siteDir = fileManager.createTempDir();
-
- expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes();
-
- final Assembly assembly = new Assembly();
-
- mockManager.replayAll();
-
- new DefaultAssemblyReader().includeSiteInAssembly( assembly, configSource );
-
- final List<FileSet> fileSets = assembly.getFileSets();
-
- assertNotNull( fileSets );
- assertEquals( 1, fileSets.size() );
-
- final FileSet fs = fileSets.get( 0 );
-
- assertEquals( siteDir.getPath(), fs.getDirectory() );
-
- mockManager.verifyAll();
- }
-
- // public void testReadComponent_ShouldReadComponentFromXml()
- // throws IOException, AssemblyReadException
- // {
- // Component component = new Component();
- //
- // FileSet fileSet = new FileSet();
- // fileSet.setDirectory( "/dir" );
- //
- // component.addFileSet( fileSet );
- //
- // StringWriter sw = new StringWriter();
- //
- // ComponentXpp3Writer componentWriter = new ComponentXpp3Writer();
- //
- // componentWriter.write( sw, component );
- //
- // Component result = new DefaultAssemblyReader().readComponent( new StringReader( sw.toString() ) );
- //
- // List<FileSet> fileSets = result.getFileSets();
- //
- // assertNotNull( fileSets );
- // assertEquals( 1, fileSets.size() );
- //
- // FileSet fs = (FileSet) fileSets.get( 0 );
- //
- // assertEquals( "/dir", fs.getDirectory() );
- // }
- //
- // public void testGetComponentFromFile_ShouldReadComponent()
- // throws IOException, AssemblyReadException
- // {
- // Component component = new Component();
- //
- // FileSet fileSet = new FileSet();
- // fileSet.setDirectory( "/dir" );
- //
- // component.addFileSet( fileSet );
- //
- // File componentFile = fileManager.createTempFile();
- //
- // FileWriter writer = null;
- //
- // try
- // {
- // writer = new FileWriter( componentFile );
- //
- // ComponentXpp3Writer componentWriter = new ComponentXpp3Writer();
- //
- // componentWriter.write( writer, component );
- // }
- // finally
- // {
- // IOUtil.close( writer );
- // }
- //
- // File basedir = componentFile.getParentFile();
- // String filename = componentFile.getName();
- //
- // configSource.getBasedir();
- // configSourceControl.setReturnValue( basedir );
- //
- // mockManager.replayAll();
- //
- // Component result = new DefaultAssemblyReader().getComponentFromFile( filename, configSource );
- //
- // List<FileSet> fileSets = result.getFileSets();
- //
- // assertNotNull( fileSets );
- // assertEquals( 1, fileSets.size() );
- //
- // FileSet fs = (FileSet) fileSets.get( 0 );
- //
- // assertEquals( "/dir", fs.getDirectory() );
- //
- // mockManager.verifyAll();
- // }
-
- public void testMergeComponentWithAssembly_ShouldAddOneFileSetToExistingListOfTwo()
- {
- final Assembly assembly = new Assembly();
-
- FileSet fs = new FileSet();
- fs.setDirectory( "/dir" );
-
- assembly.addFileSet( fs );
-
- fs = new FileSet();
- fs.setDirectory( "/other-dir" );
- assembly.addFileSet( fs );
-
- fs = new FileSet();
- fs.setDirectory( "/third-dir" );
-
- final Component component = new Component();
-
- component.addFileSet( fs );
-
- new DefaultAssemblyReader().mergeComponentWithAssembly( component, assembly );
-
- final List<FileSet> fileSets = assembly.getFileSets();
-
- assertNotNull( fileSets );
- assertEquals( 3, fileSets.size() );
-
- final FileSet rfs1 = fileSets.get( 0 );
- assertEquals( "/dir", rfs1.getDirectory() );
-
- final FileSet rfs2 = fileSets.get( 1 );
- assertEquals( "/other-dir", rfs2.getDirectory() );
-
- final FileSet rfs3 = fileSets.get( 2 );
- assertEquals( "/third-dir", rfs3.getDirectory() );
-
- }
-
- public void testMergeComponentWithAssembly_ShouldAddOneFileItemToExistingListOfTwo()
- {
- final Assembly assembly = new Assembly();
-
- FileItem fi = new FileItem();
- fi.setSource( "file" );
-
- assembly.addFile( fi );
-
- fi = new FileItem();
- fi.setSource( "file2" );
-
- assembly.addFile( fi );
-
- fi = new FileItem();
- fi.setSource( "file3" );
-
- final Component component = new Component();
-
- component.addFile( fi );
-
- new DefaultAssemblyReader().mergeComponentWithAssembly( component, assembly );
-
- final List<FileItem> fileItems = assembly.getFiles();
-
- assertNotNull( fileItems );
- assertEquals( 3, fileItems.size() );
-
- final FileItem rf1 = fileItems.get( 0 );
- assertEquals( "file", rf1.getSource() );
-
- final FileItem rf2 = fileItems.get( 1 );
- assertEquals( "file2", rf2.getSource() );
-
- final FileItem rf3 = fileItems.get( 2 );
- assertEquals( "file3", rf3.getSource() );
-
- }
-
- public void testMergeComponentWithAssembly_ShouldAddOneDependencySetToExistingListOfTwo()
- {
- final Assembly assembly = new Assembly();
-
- DependencySet ds = new DependencySet();
- ds.setScope( Artifact.SCOPE_RUNTIME );
-
- assembly.addDependencySet( ds );
-
- ds = new DependencySet();
- ds.setScope( Artifact.SCOPE_COMPILE );
-
- assembly.addDependencySet( ds );
-
- final Component component = new Component();
-
- ds = new DependencySet();
- ds.setScope( Artifact.SCOPE_SYSTEM );
-
- component.addDependencySet( ds );
-
- new DefaultAssemblyReader().mergeComponentWithAssembly( component, assembly );
-
- final List<DependencySet> depSets = assembly.getDependencySets();
-
- assertNotNull( depSets );
- assertEquals( 3, depSets.size() );
-
- assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 )
- .getScope() );
- assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 )
- .getScope() );
- assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 )
- .getScope() );
- }
-
- public void testMergeComponentWithAssembly_ShouldAddOneRepositoryToExistingListOfTwo()
- {
- final Assembly assembly = new Assembly();
-
- Repository repo = new Repository();
- repo.setScope( Artifact.SCOPE_RUNTIME );
-
- assembly.addRepository( repo );
-
- repo = new Repository();
- repo.setScope( Artifact.SCOPE_COMPILE );
-
- assembly.addRepository( repo );
-
- final Component component = new Component();
-
- repo = new Repository();
- repo.setScope( Artifact.SCOPE_SYSTEM );
-
- component.addRepository( repo );
-
- new DefaultAssemblyReader().mergeComponentWithAssembly( component, assembly );
-
- final List<Repository> depSets = assembly.getRepositories();
-
- assertNotNull( depSets );
- assertEquals( 3, depSets.size() );
-
- assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 )
- .getScope() );
- assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 )
- .getScope() );
- assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 )
- .getScope() );
- }
-
- public void testMergeComponentWithAssembly_ShouldAddOneContainerDescriptorHandlerToExistingListOfTwo()
- {
- final Assembly assembly = new Assembly();
-
- ContainerDescriptorHandlerConfig cfg = new ContainerDescriptorHandlerConfig();
- cfg.setHandlerName( "one" );
-
- assembly.addContainerDescriptorHandler( cfg );
-
- cfg = new ContainerDescriptorHandlerConfig();
- cfg.setHandlerName( "two" );
-
- assembly.addContainerDescriptorHandler( cfg );
-
- final Component component = new Component();
-
- cfg = new ContainerDescriptorHandlerConfig();
- cfg.setHandlerName( "three" );
-
- component.addContainerDescriptorHandler( cfg );
-
- new DefaultAssemblyReader().mergeComponentWithAssembly( component, assembly );
-
- final List<ContainerDescriptorHandlerConfig> result = assembly.getContainerDescriptorHandlers();
-
- assertNotNull( result );
- assertEquals( 3, result.size() );
-
- final Iterator<ContainerDescriptorHandlerConfig> it = result.iterator();
- assertEquals( "one", it.next()
- .getHandlerName() );
- assertEquals( "two", it.next()
- .getHandlerName() );
- assertEquals( "three", it.next()
- .getHandlerName() );
- }
-
- // FIXME: Deep merging should take place...
- // public void
- // testMergeComponentWithAssembly_ShouldMergeOneFileSetToOneOfExistingTwo()
- // {
- // Assembly assembly = new Assembly();
- //
- // FileSet fs = new FileSet();
- // fs.setDirectory( "/dir" );
- // fs.addInclude( "**/test.txt" );
- //
- // assembly.addFileSet( fs );
- //
- // fs = new FileSet();
- // fs.setDirectory( "/other-dir" );
- // assembly.addFileSet( fs );
- //
- // fs = new FileSet();
- // fs.setDirectory( "/dir" );
- // fs.addInclude( "**/components.txt" );
- //
- // Component component = new Component();
- //
- // component.addFileSet( fs );
- //
- // new DefaultAssemblyReader().mergeComponentWithAssembly( component,
- // assembly );
- //
- // List<FileSet> fileSets = assembly.getFileSets();
- //
- // assertNotNull( fileSets );
- // assertEquals( 2, fileSets.size() );
- //
- // FileSet rfs1 = (FileSet) fileSets.get( 0 );
- // assertEquals( "/dir", rfs1.getDirectory() );
- //
- // List includes = rfs1.getIncludes();
- //
- // assertNotNull( includes );
- // assertEquals( 2, includes.size() );
- // assertTrue( includes.contains( "**/test.txt" ) );
- // assertTrue( includes.contains( "**/components.txt" ) );
- //
- // FileSet rfs2 = (FileSet) fileSets.get( 1 );
- // assertEquals( "/other-dir", rfs2.getDirectory() );
- //
- // }
-
- public void testMergeComponentsWithMainAssembly_ShouldAddOneFileSetToAssembly()
- throws IOException, AssemblyReadException
- {
- final Component component = new Component();
-
- final FileSet fileSet = new FileSet();
- fileSet.setDirectory( "/dir" );
-
- component.addFileSet( fileSet );
-
- final File componentFile = fileManager.createTempFile();
-
- Writer writer = null;
-
- try
- {
- writer = new OutputStreamWriter( new FileOutputStream( componentFile ), "UTF-8" );
-
- final ComponentXpp3Writer componentWriter = new ComponentXpp3Writer();
-
- componentWriter.write( writer, component );
- writer.flush();
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- final String filename = componentFile.getName();
-
- final Assembly assembly = new Assembly();
- assembly.addComponentDescriptor( filename );
-
- final File basedir = componentFile.getParentFile();
-
-
- final MavenProject project = new MavenProject();
-
- expect( configSource.getProject()).andReturn( project ).anyTimes();
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- InterpolationState is = new InterpolationState();
- ComponentXpp3Reader.ContentTransformer componentIp = AssemblyInterpolator.componentInterpolator(
- FixedStringSearchInterpolator.create(), is, new ConsoleLogger( Logger.LEVEL_DEBUG, "console" ) );
-
-
- mockManager.replayAll();
-
- new DefaultAssemblyReader().mergeComponentsWithMainAssembly( assembly, null, configSource, componentIp );
-
- final List<FileSet> fileSets = assembly.getFileSets();
-
- assertNotNull( fileSets );
- assertEquals( 1, fileSets.size() );
-
- final FileSet fs = fileSets.get( 0 );
-
- assertEquals( "/dir", fs.getDirectory() );
-
- mockManager.verifyAll();
- }
-
- public void testReadAssembly_ShouldReadAssemblyWithoutComponentsInterpolationOrSiteDirInclusion()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final StringReader sr = writeToStringReader( assembly );
-
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject()).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- mockManager.verifyAll();
- }
-
- public void testReadAssembly_ShouldReadAssemblyWithSiteDirInclusionFromAssemblyWithoutComponentsOrInterpolation()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- assembly.setIncludeSiteDirectory( true );
-
- final StringReader sr = writeToStringReader( assembly );
-
- final File siteDir = fileManager.createTempDir();
-
- expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes();
-
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect(configSource.getProject()).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- final List<FileSet> fileSets = result.getFileSets();
-
- assertEquals( 1, fileSets.size() );
-
- assertEquals( "/site", fileSets.get( 0 )
- .getOutputDirectory() );
-
- mockManager.verifyAll();
- }
-
- public void testReadAssembly_ShouldReadAssemblyWithSiteDirInclusionFromConfigWithoutComponentsOrInterpolation()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final StringReader sr = writeToStringReader( assembly );
-
- final File siteDir = fileManager.createTempDir();
-
- expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes();
-
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject()).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( true ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- final List<FileSet> fileSets = result.getFileSets();
-
- assertEquals( 1, fileSets.size() );
-
- assertEquals( "/site", fileSets.get( 0 )
- .getOutputDirectory() );
-
- mockManager.verifyAll();
- }
-
- public void testReadAssembly_ShouldReadAssemblyWithComponentWithoutSiteDirInclusionOrInterpolation()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final File componentsFile = fileManager.createTempFile();
-
- final File basedir = componentsFile.getParentFile();
- final String componentsFilename = componentsFile.getName();
-
- final Component component = new Component();
-
- final FileSet fs = new FileSet();
- fs.setDirectory( "/dir" );
-
- component.addFileSet( fs );
-
- Writer fw = null;
-
- try
- {
- fw = new OutputStreamWriter( new FileOutputStream( componentsFile ), "UTF-8" );
- new ComponentXpp3Writer().write( fw, component );
- }
- finally
- {
- IOUtil.close( fw );
- }
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- assembly.addComponentDescriptor( componentsFilename );
-
- final StringReader sr = writeToStringReader( assembly );
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
- expect( configSource.getProject()).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- final List<FileSet> fileSets = result.getFileSets();
-
- assertEquals( 1, fileSets.size() );
-
- assertEquals( "/dir", fileSets.get( 0 )
- .getDirectory() );
-
- mockManager.verifyAll();
- }
-
- public void testReadAssembly_ShouldReadAssemblyWithComponentInterpolationWithoutSiteDirInclusionOrAssemblyInterpolation()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final File componentsFile = fileManager.createTempFile();
-
- final File basedir = componentsFile.getParentFile();
- final String componentsFilename = componentsFile.getName();
-
- final Component component = new Component();
-
- final FileSet fs = new FileSet();
- fs.setDirectory( "${groupId}-dir" );
-
- component.addFileSet( fs );
-
- Writer fw = null;
-
- try
- {
- fw = new OutputStreamWriter( new FileOutputStream( componentsFile ), "UTF-8" );
- new ComponentXpp3Writer().write( fw, component );
- }
- finally
- {
- IOUtil.close( fw );
- }
-
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- assembly.addComponentDescriptor( componentsFilename );
-
- final StringReader sr = writeToStringReader( assembly );
-
- expect( configSource.getBasedir()).andReturn( basedir ).atLeastOnce();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject()).andReturn( project ).atLeastOnce();
-
- expect( configSource.isSiteIncluded()).andReturn( false );
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- final List<FileSet> fileSets = result.getFileSets();
-
- assertEquals( 1, fileSets.size() );
-
- assertEquals( "group-dir", fileSets.get( 0 )
- .getDirectory() );
-
- mockManager.verifyAll();
- }
-
- public static StringReader writeToStringReader( Assembly assembly )
- throws IOException
- {
- final StringWriter sw = new StringWriter();
- final AssemblyXpp3Writer assemblyWriter = new AssemblyXpp3Writer();
-
- assemblyWriter.write( sw, assembly );
-
- return new StringReader( sw.toString() );
- }
-
- public void testReadAssembly_ShouldReadAssemblyWithInterpolationWithoutComponentsOrSiteDirInclusion()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "${groupId}-assembly" );
-
- final StringReader sr = writeToStringReader( assembly );
-
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject()).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
-
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
-
- assertEquals( "group-assembly", result.getId() );
-
- mockManager.verifyAll();
- }
-
- public void testGetAssemblyFromDescriptorFile_ShouldReadAssembly()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final FileSet fs = new FileSet();
- fs.setDirectory( "/dir" );
-
- assembly.addFileSet( fs );
-
- final File assemblyFile = fileManager.createTempFile();
-
- final File basedir = assemblyFile.getParentFile();
-
- expect( configSource.getBasedir()).andReturn( basedir).anyTimes();
-
- expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
-
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- Writer writer = null;
- try
- {
- writer = new OutputStreamWriter( new FileOutputStream( assemblyFile ), "UTF-8" );
- new AssemblyXpp3Writer().write( writer, assembly );
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().getAssemblyFromDescriptorFile( assemblyFile, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- mockManager.verifyAll();
- }
-
- public void testGetAssemblyForDescriptorReference_ShouldReadBinaryAssemblyRef()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir()).andReturn( basedir).anyTimes();
-
- expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
-
- expect( configSource.isIgnoreMissingDescriptor()).andReturn( false ).anyTimes();
-
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().getAssemblyForDescriptorReference( "bin", configSource );
-
- assertEquals( "bin", result.getId() );
-
- mockManager.verifyAll();
- }
-
- public void testReadAssemblies_ShouldGetAssemblyDescriptorFromSingleFile()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final FileSet fs = new FileSet();
- fs.setDirectory( "/dir" );
-
- assembly.addFileSet( fs );
-
- final File basedir = fileManager.createTempDir();
-
- final List<String> files = writeAssembliesToFile( Collections.singletonList( assembly ), basedir );
-
- final String assemblyFile = files.get( 0 );
-
- final List<Assembly> assemblies = performReadAssemblies( basedir, assemblyFile, null, null, null, null );
-
- assertNotNull( assemblies );
- assertEquals( 1, assemblies.size() );
-
- final Assembly result = assemblies.get( 0 );
-
- assertEquals( assembly.getId(), result.getId() );
- }
-
- public void testReadAssemblies_ShouldFailWhenSingleDescriptorFileMissing()
- throws IOException, InvalidAssemblerConfigurationException
- {
- final File basedir = fileManager.createTempDir();
-
- final File assemblyFile = new File( basedir, "test.xml" );
- assemblyFile.delete();
-
- try
- {
- performReadAssemblies( basedir, assemblyFile.getAbsolutePath(), null, null, null, null, false );
-
- fail( "Should fail when descriptor file is missing and ignoreDescriptors == false" );
- }
- catch ( final AssemblyReadException e )
- {
- // expected.
- }
- }
-
- public void testReadAssemblies_ShouldIgnoreMissingSingleDescriptorFileWhenIgnoreIsConfigured()
- throws IOException, InvalidAssemblerConfigurationException
- {
- final File basedir = fileManager.createTempDir();
-
- final File assemblyFile = new File( basedir, "test.xml" );
- assemblyFile.delete();
-
- try
- {
- performReadAssemblies( basedir, assemblyFile.getAbsolutePath(), null, null, null, null, true );
- }
- catch ( final AssemblyReadException e )
- {
- fail( "Setting ignoreMissingDescriptor == true (true flag in performReadAssemblies, above) should NOT produce an exception." );
- }
- }
-
- public void testReadAssemblies_ShouldGetAssemblyDescriptorFromSingleRef()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final File basedir = fileManager.createTempDir();
-
- final List<Assembly> assemblies = performReadAssemblies( basedir, null, "bin", null, null, null );
-
- assertNotNull( assemblies );
- assertEquals( 1, assemblies.size() );
-
- final Assembly result = assemblies.get( 0 );
-
- assertEquals( "bin", result.getId() );
- }
-
- public void testReadAssemblies_ShouldGetAssemblyDescriptorFromFileArray()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly1 = new Assembly();
- assembly1.setId( "test" );
-
- final Assembly assembly2 = new Assembly();
- assembly2.setId( "test2" );
-
- final List<Assembly> assemblies = new ArrayList<Assembly>();
- assemblies.add( assembly1 );
- assemblies.add( assembly2 );
-
- final File basedir = fileManager.createTempDir();
-
- final List<String> files = writeAssembliesToFile( assemblies, basedir );
-
- final List<Assembly> results =
- performReadAssemblies( basedir, null, null, files.toArray(new String[files.size()]), null, null );
-
- assertNotNull( results );
- assertEquals( 2, results.size() );
-
- final Assembly result1 = assemblies.get( 0 );
-
- assertEquals( assembly1.getId(), result1.getId() );
-
- final Assembly result2 = assemblies.get( 1 );
-
- assertEquals( assembly2.getId(), result2.getId() );
- }
-
- public void testReadAssemblies_ShouldGetAssemblyDescriptorFromMultipleRefs()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final File basedir = fileManager.createTempDir();
-
- final List<Assembly> assemblies =
- performReadAssemblies( basedir, null, null, null, new String[] { "bin", "src" }, null );
-
- assertNotNull( assemblies );
- assertEquals( 2, assemblies.size() );
-
- final Assembly result = assemblies.get( 0 );
-
- assertEquals( "bin", result.getId() );
-
- final Assembly result2 = assemblies.get( 1 );
-
- assertEquals( "src", result2.getId() );
- }
-
- public void testReadAssemblies_ShouldGetAssemblyDescriptorFromDirectory()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly1 = new Assembly();
- assembly1.setId( "test" );
-
- final Assembly assembly2 = new Assembly();
- assembly2.setId( "test2" );
-
- final List<Assembly> assemblies = new ArrayList<Assembly>();
- assemblies.add( assembly1 );
- assemblies.add( assembly2 );
-
- final File basedir = fileManager.createTempDir();
-
- writeAssembliesToFile( assemblies, basedir );
-
- final List<Assembly> results = performReadAssemblies( basedir, null, null, null, null, basedir );
-
- assertNotNull( results );
- assertEquals( 2, results.size() );
-
- final Assembly result1 = assemblies.get( 0 );
-
- assertEquals( assembly1.getId(), result1.getId() );
-
- final Assembly result2 = assemblies.get( 1 );
-
- assertEquals( assembly2.getId(), result2.getId() );
- }
-
- public void testReadAssemblies_ShouldGetTwoAssemblyDescriptorsFromDirectoryWithThreeFiles()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final Assembly assembly1 = new Assembly();
- assembly1.setId( "test" );
-
- final Assembly assembly2 = new Assembly();
- assembly2.setId( "test2" );
-
- final List<Assembly> assemblies = new ArrayList<Assembly>();
- assemblies.add( assembly1 );
- assemblies.add( assembly2 );
-
- final File basedir = fileManager.createTempDir();
-
- writeAssembliesToFile( assemblies, basedir );
-
- fileManager.createFile( basedir, "readme.txt", "This is just a readme file, not a descriptor." );
-
- final List<Assembly> results = performReadAssemblies( basedir, null, null, null, null, basedir );
-
- assertNotNull( results );
- assertEquals( 2, results.size() );
-
- final Assembly result1 = assemblies.get( 0 );
-
- assertEquals( assembly1.getId(), result1.getId() );
-
- final Assembly result2 = assemblies.get( 1 );
-
- assertEquals( assembly2.getId(), result2.getId() );
- }
-
- private List<String> writeAssembliesToFile( final List<Assembly> assemblies, final File dir )
- throws IOException
- {
- final List<String> files = new ArrayList<String>();
-
- for (final Assembly assembly : assemblies) {
- final File assemblyFile = new File(dir, assembly.getId() + ".xml");
-
- Writer writer = null;
- try {
- writer = new OutputStreamWriter(new FileOutputStream(assemblyFile), "UTF-8");
- new AssemblyXpp3Writer().write(writer, assembly);
- } finally {
- IOUtil.close(writer);
- }
-
- files.add(assemblyFile.getAbsolutePath());
- }
-
- return files;
- }
-
- private List<Assembly> performReadAssemblies( final File basedir, final String descriptor,
- final String descriptorRef, final String[] descriptors,
- final String[] descriptorRefs, final File descriptorDir )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- return performReadAssemblies( basedir, descriptor, descriptorRef, descriptors, descriptorRefs, descriptorDir,
- false );
- }
-
- private List<Assembly> performReadAssemblies( final File basedir, final String descriptor,
- final String descriptorRef, final String[] descriptors,
- final String[] descriptorRefs, final File descriptorDir,
- final boolean ignoreMissing )
- throws AssemblyReadException, InvalidAssemblerConfigurationException
- {
- expect( configSource.getDescriptor()).andReturn( descriptor );
-
- expect( configSource.getDescriptorId()).andReturn( descriptorRef );
-
- expect( configSource.getDescriptorReferences()).andReturn( descriptorRefs );
-
- expect( configSource.getDescriptors()).andReturn( descriptors );
-
- expect( configSource.getDescriptorSourceDirectory()).andReturn( descriptorDir );
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
-
- expect( configSource.isIgnoreMissingDescriptor()).andReturn( ignoreMissing).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final List<Assembly> assemblies = new DefaultAssemblyReader().readAssemblies( configSource );
-
- mockManager.verifyAll();
-
- return assemblies;
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
deleted file mode 100644
index e8265e8..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.apache.maven.plugin.assembly.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-import org.apache.maven.shared.io.location.Location;
-import org.apache.maven.shared.io.location.LocatorStrategy;
-import org.apache.maven.shared.io.logging.DefaultMessageHolder;
-import org.apache.maven.shared.io.logging.MessageHolder;
-
-/**
- * @author Benjamin Bentmann
- */
-public class PrefixedClasspathLocatorStrategyTest
- extends TestCase
-{
-
- public void testResolvePrefixWithLeadingSlashAndWithTrailingSlash()
- {
- MessageHolder mh = new DefaultMessageHolder();
-
- LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "/assemblies/" );
- Location location = ls.resolve( "empty.xml", mh );
-
- assertNotNull( location );
- assertEquals( 0, mh.size() );
- }
-
- public void testResolvePrefixWithLeadingSlashAndWithoutTrailingSlash()
- {
- MessageHolder mh = new DefaultMessageHolder();
-
- LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "/assemblies" );
- Location location = ls.resolve( "empty.xml", mh );
-
- assertNotNull( location );
- assertEquals( 0, mh.size() );
- }
-
- public void testResolvePrefixWithoutLeadingSlashAndWithTrailingSlash()
- {
- MessageHolder mh = new DefaultMessageHolder();
-
- LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "assemblies/" );
- Location location = ls.resolve( "empty.xml", mh );
-
- assertNotNull( location );
- assertEquals( 0, mh.size() );
- }
-
- public void testResolvePrefixWithoutLeadingSlashAndWithoutTrailingSlash()
- {
- MessageHolder mh = new DefaultMessageHolder();
-
- LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "assemblies" );
- Location location = ls.resolve( "empty.xml", mh );
-
- assertNotNull( location );
- assertEquals( 0, mh.size() );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java
deleted file mode 100644
index 87d308e..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.plugin.assembly.testutils;
-
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.filtering.MavenReaderFilter;
-import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.util.List;
-
-public class PojoConfigSource implements AssemblerConfigurationSource
-{
- String descriptor;
-
- private File basedir;
-
- private MavenProject mavenProject;
-
- private boolean isSitencluded;
-
- private File siteDirectory;
-
- private String decriptorId;
-
- private String finalName;
-
- private List<String> delimiters;
-
- private String escapeString;
-
- private String encoding;
-
- private boolean isUpdateOnly;
-
- private boolean isUseJvmChmod;
-
- private boolean isIgnorePermissions;
-
- private String archiverConfig;
-
- private boolean isAssemblyIdAppended;
-
- private String classifier;
-
- private String tarLongFileMode;
-
- private File workingDirectory;
-
- private MavenArchiveConfiguration jarArchiveConfiguration;
-
- private MavenReaderFilter mavenReaderFilter;
-
- private File outputDirectory;
-
- private String[] descriptors;
-
- private String[] descriptorReferences;
-
- private File descriptorSourceReference;
-
- private ArtifactRepository localRepository;
-
- private File temporaryRootDirectory;
-
- private File archiveBaseDirectory;
-
- private List<String> filters;
-
- private boolean isIncludeProjectBuildFilter;
-
- private List<MavenProject> reactorProjects;
-
- private List<ArtifactRepository> remoteRepository;
-
- private boolean isDryRun;
-
- private boolean isIgnoreDirFormatExtensions;
-
- private boolean isIgnoreMissingDescriptor;
-
- private MavenSession mavenSession;
-
- private FixedStringSearchInterpolator rootInterpolator = FixedStringSearchInterpolator.empty();
-
- private FixedStringSearchInterpolator environmentInterpolator = FixedStringSearchInterpolator.empty();
-
- private FixedStringSearchInterpolator envInterpolator = FixedStringSearchInterpolator.empty();
-
- private FixedStringSearchInterpolator mainProjectInterpolator;
-
- public String getDescriptor()
- {
- return descriptor;
- }
-
- public String getDescriptorId()
- {
- return decriptorId;
- }
-
- public String[] getDescriptors()
- {
- return descriptors;
- }
-
- public String[] getDescriptorReferences()
- {
- return descriptorReferences;
- }
-
- public File getDescriptorSourceDirectory()
- {
- return descriptorSourceReference;
- }
-
- public File getBasedir()
- {
- return basedir;
- }
-
- public MavenProject getProject()
- {
- return mavenProject;
- }
-
- public boolean isSiteIncluded()
- {
- return isSitencluded;
- }
-
- public File getSiteDirectory()
- {
- return siteDirectory;
- }
-
- public String getFinalName()
- {
- return finalName;
- }
-
- public boolean isAssemblyIdAppended()
- {
- return isAssemblyIdAppended;
- }
-
- public String getClassifier()
- {
- return classifier;
- }
-
- public String getTarLongFileMode()
- {
- return tarLongFileMode;
- }
-
- public File getOutputDirectory()
- {
- return outputDirectory;
- }
-
- public File getWorkingDirectory()
- {
- return workingDirectory;
- }
-
- public MavenArchiveConfiguration getJarArchiveConfiguration()
- {
- return jarArchiveConfiguration;
- }
-
- public ArtifactRepository getLocalRepository()
- {
- return localRepository;
- }
-
- public File getTemporaryRootDirectory()
- {
- return temporaryRootDirectory;
- }
-
- public File getArchiveBaseDirectory()
- {
- return archiveBaseDirectory;
- }
-
- public List<String> getFilters()
- {
- return filters;
- }
-
- public boolean isIncludeProjectBuildFilters()
- {
- return isIncludeProjectBuildFilter;
- }
-
- public List<MavenProject> getReactorProjects()
- {
- return reactorProjects;
- }
-
- public List<ArtifactRepository> getRemoteRepositories()
- {
- return remoteRepository;
- }
-
- public boolean isDryRun()
- {
- return isDryRun;
- }
-
- public boolean isIgnoreDirFormatExtensions()
- {
- return isIgnoreDirFormatExtensions;
- }
-
- public boolean isIgnoreMissingDescriptor()
- {
- return isIgnoreMissingDescriptor;
- }
-
- public MavenSession getMavenSession()
- {
- return mavenSession;
- }
-
- public String getArchiverConfig()
- {
- return archiverConfig;
- }
-
- public MavenReaderFilter getMavenReaderFilter()
- {
- return mavenReaderFilter;
- }
-
- public boolean isUpdateOnly()
- {
- return isUpdateOnly;
- }
-
- public boolean isUseJvmChmod()
- {
- return isUseJvmChmod;
- }
-
- public boolean isIgnorePermissions()
- {
- return isIgnorePermissions;
- }
-
- public String getEncoding()
- {
- return encoding;
- }
-
- public String getEscapeString()
- {
- return escapeString;
- }
-
- public List<String> getDelimiters()
- {
- return delimiters;
- }
-
- public void setDescriptor( String descriptor )
- {
- this.descriptor = descriptor;
- }
-
- public void setBasedir( File basedir )
- {
- this.basedir = basedir;
- }
-
- public void setMavenProject( MavenProject mavenProject )
- {
- this.mavenProject = mavenProject;
- }
-
- public void setSitencluded( boolean isSitencluded )
- {
- this.isSitencluded = isSitencluded;
- }
-
- public void setSiteDirectory( File siteDirectory )
- {
- this.siteDirectory = siteDirectory;
- }
-
- public void setDecriptorId( String decriptorId )
- {
- this.decriptorId = decriptorId;
- }
-
- public void setFinalName( String finalName )
- {
- this.finalName = finalName;
- }
-
- public void setDelimiters( List<String> delimiters )
- {
- this.delimiters = delimiters;
- }
-
- public void setEscapeString( String escapeString )
- {
- this.escapeString = escapeString;
- }
-
- public void setEncoding( String encoding )
- {
- this.encoding = encoding;
- }
-
- public void setUpdateOnly( boolean isUpdateOnly )
- {
- this.isUpdateOnly = isUpdateOnly;
- }
-
- public void setUseJvmChmod( boolean isUseJvmChmod )
- {
- this.isUseJvmChmod = isUseJvmChmod;
- }
-
- public void setIgnorePermissions( boolean isIgnorePermissions )
- {
- this.isIgnorePermissions = isIgnorePermissions;
- }
-
- public void setArchiverConfig( String archiverConfig )
- {
- this.archiverConfig = archiverConfig;
- }
-
- public void setAssemblyIdAppended( boolean isAssemblyIdAppended )
- {
- this.isAssemblyIdAppended = isAssemblyIdAppended;
- }
-
- public void setClassifier( String classifier )
- {
- this.classifier = classifier;
- }
-
- public void setTarLongFileMode( String tarLongFileMode )
- {
- this.tarLongFileMode = tarLongFileMode;
- }
-
- public void setWorkingDirectory( File workingDirectory )
- {
- this.workingDirectory = workingDirectory;
- }
-
- public void setJarArchiveConfiguration( MavenArchiveConfiguration jarArchiveConfiguration )
- {
- this.jarArchiveConfiguration = jarArchiveConfiguration;
- }
-
- public void setMavenReaderFilter( MavenReaderFilter mavenReaderFilter )
- {
- this.mavenReaderFilter = mavenReaderFilter;
- }
-
- public void setOutputDirectory( File outputDirectory )
- {
- this.outputDirectory = outputDirectory;
- }
-
- public void setDescriptors( String[] descriptors )
- {
- this.descriptors = descriptors;
- }
-
- public void setDescriptorReferences( String[] descriptorReferences )
- {
- this.descriptorReferences = descriptorReferences;
- }
-
- public void setDescriptorSourceReference( File descriptorSourceReference )
- {
- this.descriptorSourceReference = descriptorSourceReference;
- }
-
- public void setLocalRepository( ArtifactRepository localRepository )
- {
- this.localRepository = localRepository;
- }
-
- public void setTemporaryRootDirectory( File temporaryRootDirectory )
- {
- this.temporaryRootDirectory = temporaryRootDirectory;
- }
-
- public void setArchiveBaseDirectory( File archiveBaseDirectory )
- {
- this.archiveBaseDirectory = archiveBaseDirectory;
- }
-
- public void setFilters( List<String> filters )
- {
- this.filters = filters;
- }
-
- public void setIncludeProjectBuildFilter( boolean isIncludeProjectBuildFilter )
- {
- this.isIncludeProjectBuildFilter = isIncludeProjectBuildFilter;
- }
-
- public void setReactorProjects( List<MavenProject> reactorProjects )
- {
- this.reactorProjects = reactorProjects;
- }
-
- public void setRemoteRepository( List<ArtifactRepository> remoteRepository )
- {
- this.remoteRepository = remoteRepository;
- }
-
- public void setDryRun( boolean isDryRun )
- {
- this.isDryRun = isDryRun;
- }
-
- public void setIgnoreDirFormatExtensions( boolean isIgnoreDirFormatExtensions )
- {
- this.isIgnoreDirFormatExtensions = isIgnoreDirFormatExtensions;
- }
-
- public void setIgnoreMissingDescriptor( boolean isIgnoreMissingDescriptor )
- {
- this.isIgnoreMissingDescriptor = isIgnoreMissingDescriptor;
- }
-
- public void setMavenSession( MavenSession mavenSession )
- {
- this.mavenSession = mavenSession;
- }
-
- @Nonnull
- public FixedStringSearchInterpolator getRepositoryInterpolator()
- {
- return rootInterpolator;
- }
-
- @Nonnull
- public FixedStringSearchInterpolator getCommandLinePropsInterpolator()
- {
- return environmentInterpolator;
- }
-
- public void setRootInterpolator( @Nonnull FixedStringSearchInterpolator rootInterpolator )
- {
- this.rootInterpolator = rootInterpolator;
- }
-
- @Nonnull
- public FixedStringSearchInterpolator getEnvInterpolator()
- {
- return envInterpolator;
- }
-
- public void setEnvInterpolator( FixedStringSearchInterpolator envInterpolator )
- {
- this.envInterpolator = envInterpolator;
- }
-
- @Nonnull
- public FixedStringSearchInterpolator getMainProjectInterpolator()
- {
- return mainProjectInterpolator;
- }
-
-
- public void setMainProjectInterpolator( FixedStringSearchInterpolator mainProjectInterpolator )
- {
- this.mainProjectInterpolator = mainProjectInterpolator;
- }
-
- public void setEnvironmentInterpolator( @Nonnull FixedStringSearchInterpolator environmentInterpolator )
- {
- this.environmentInterpolator = environmentInterpolator;
- }
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java
deleted file mode 100644
index a31b2c3..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.apache.maven.plugin.assembly.testutils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class TestFileManager
-{
-
- public static final String TEMP_DIR_PATH = System.getProperty( "java.io.tmpdir" );
-
- private final List<File> filesToDelete = new ArrayList<File>();
-
- private final String baseFilename;
-
- private final String fileSuffix;
-
- private StackTraceElement callerInfo;
-
- private boolean warnAboutCleanup = false;
-
- public TestFileManager( final String baseFilename, final String fileSuffix )
- {
- this.baseFilename = baseFilename;
- this.fileSuffix = fileSuffix;
-
- initializeCleanupMonitoring();
- }
-
- private void initializeCleanupMonitoring()
- {
- callerInfo = new NullPointerException().getStackTrace()[2];
-
- final Runnable warning = new Runnable()
- {
-
- public void run()
- {
- maybeWarnAboutCleanUp();
- }
-
- };
-
- Thread cleanupWarning = new Thread( warning );
-
- Runtime.getRuntime()
- .addShutdownHook( cleanupWarning );
- }
-
- private void maybeWarnAboutCleanUp()
- {
- if ( warnAboutCleanup )
- {
- System.out.println( "[WARNING] TestFileManager from: " + callerInfo.getClassName() + " not cleaned up!" );
- }
- }
-
- public void markForDeletion( final File toDelete )
- {
- filesToDelete.add( toDelete );
- warnAboutCleanup = true;
- }
-
- public synchronized File createTempDir()
- {
- try
- {
- Thread.sleep( 20 );
- }
- catch ( final InterruptedException ignore )
- {
- }
-
- final File dir = new File( TEMP_DIR_PATH, baseFilename + System.currentTimeMillis() );
-
- //noinspection ResultOfMethodCallIgnored
- dir.mkdirs();
- markForDeletion( dir );
-
- return dir;
- }
-
- public synchronized File createTempFile() throws IOException
- {
- final File tempFile = File.createTempFile( baseFilename, fileSuffix );
- tempFile.deleteOnExit();
- markForDeletion( tempFile );
-
- return tempFile;
- }
-
- public void cleanUp()
- {
- for ( final Iterator<File> it = filesToDelete.iterator(); it.hasNext(); )
- {
- final File file = it.next();
-
- if ( file.exists() )
- {
- try
- {
- FileUtils.forceDelete( file );
- }
- catch ( final Exception e )
- {
- System.err.println( "Error while deleting test file/dir: " + file + "; ignoring." );
- }
- }
-
- it.remove();
- }
-
- warnAboutCleanup = false;
- }
-
- /**
- * NOTE: the file content is written using platform encoding.
- */
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
- public File createFile( final File dir, final String filename, final String contents ) throws IOException
- {
- final File file = new File( dir, filename );
-
- file.getParentFile()
- .mkdirs();
-
- FileWriter writer = null;
-
- try
- {
- writer = new FileWriter( file ); // platform encoding
-
- writer.write( contents );
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- markForDeletion( file );
-
- return file;
- }
-
- /**
- * NOTE: the file content is read using platform encoding.
- */
- public String getFileContents( final File file ) throws IOException
- {
- String result = null;
-
- FileReader reader = null;
- try
- {
- reader = new FileReader( file ); // platform encoding
-
- result = IOUtil.toString( reader );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- return result;
- }
-
- @Override
- protected void finalize() throws Throwable
- {
- maybeWarnAboutCleanUp();
-
- super.finalize();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java
deleted file mode 100644
index 87c7235..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.easymock.EasyMock.expect;
-
-public class AssemblyFileUtilsTest
- extends TestCase
-{
-
- private final TestFileManager fileManager = new TestFileManager( "file-utils.test.", "" );
-
- public void tearDown()
- throws IOException
- {
- fileManager.cleanUp();
- }
-
- public void testUnpack_ShouldSetSourceAndDestinationAndCallExtract()
- throws IOException, ArchiveExpansionException, NoSuchArchiverException
- {
- EasyMockSupport mockManager = new EasyMockSupport();
-
- File source = fileManager.createTempFile();
- File destDir = fileManager.createTempDir();
-
- UnArchiver unarchiver = mockManager.createMock( UnArchiver.class );
-
- ArchiverManager archiverManager = mockManager.createMock( ArchiverManager.class );
-
- try
- {
- expect(archiverManager.getUnArchiver( source )).andReturn( unarchiver );
- }
- catch ( NoSuchArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- unarchiver.setSourceFile( source );
- unarchiver.setDestDirectory( destDir );
-
- try
- {
- unarchiver.extract();
- }
- catch ( ArchiverException e )
- {
- fail( "Should never happen." );
- }
-
- mockManager.replayAll();
-
- AssemblyFileUtils.unpack( source, destDir, archiverManager );
-
- mockManager.verifyAll();
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
deleted file mode 100644
index ed4ec1a..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
+++ /dev/null
@@ -1,833 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.project.MavenProject;
-import org.easymock.classextension.EasyMockSupport;
-
-import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.*;
-import static org.easymock.EasyMock.expect;
-
-public class AssemblyFormatUtilsTest
- extends TestCase
-{
-
- private final EasyMockSupport mockManager = new EasyMockSupport();
-
- public void testFixRelativePathRefs_ShouldRemoveRelativeRefToCurrentDir()
- throws AssemblyFormattingException
- {
- assertEquals( "path/", AssemblyFormatUtils.fixRelativeRefs( "./path/" ) );
- }
-
- public void testFixRelativePathRefs_ShouldRemoveEmbeddedSameDirRef()
- throws AssemblyFormattingException
- {
- assertEquals( "some/path/", AssemblyFormatUtils.fixRelativeRefs( "some/./path/" ) );
- assertEquals( "some\\path\\", AssemblyFormatUtils.fixRelativeRefs( "some\\.\\path\\" ) );
- }
-
- public void testFixRelativePathRefs_ShouldRemoveEmbeddedParentDirRef()
- throws AssemblyFormattingException
- {
- assertEquals( "path/", AssemblyFormatUtils.fixRelativeRefs( "some/../path/" ) );
- }
-
- public void testFixRelativePathRefs_ShouldTruncateRelativeRefToParentDir()
- throws AssemblyFormattingException
- {
- assertEquals( "path/", AssemblyFormatUtils.fixRelativeRefs( "../path/" ) );
- }
-
- public void testGetDistroName_ShouldUseJustFinalNameWithNoAppendAssemblyIdOrClassifier()
- {
- verifyDistroName( "assembly", null, "finalName", false, "finalName" );
- }
-
- public void testGetDistroName_ShouldUseFinalNamePlusClassifierWhenAppendAssemblyIdIsNull()
- {
- verifyDistroName( "assembly", "classifier", "finalName", false, "finalName-classifier" );
- }
-
- public void testGetOutputDir_ShouldResolveGroupIdInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingArtifactProject( "${artifact.groupId}", null, "group", null, null, null, null, "group/" );
- }
-
- public void testGetOutputDir_ShouldResolveArtifactIdInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingArtifactProject( "${artifact.artifactId}", null, null, "artifact", null, null, null,
- "artifact/" );
- }
-
- public void testGetOutputDir_ShouldResolveVersionInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingArtifactProject( "${artifact.version}", null, null, null, "version", null, null, "version/" );
- }
-
- public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingArtifactProject( "${artifact.build.finalName}", null, null, null, null, "finalName", null,
- "finalName/" );
- }
-
- public void testGetOutputDir_ShouldResolveGroupIdInOutDir_UseModuleInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingModuleProject( "${module.groupId}", null, "group", null, null, null, null, "group/" );
- }
-
- public void testGetOutputDir_ShouldResolveArtifactIdInOutDir_UseModuleInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingModuleProject( "${module.artifactId}", null, null, "artifact", null, null, null,
- "artifact/" );
- }
-
- public void testGetOutputDir_ShouldResolveVersionInOutDir_UseModuleInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingModuleProject( "${module.version}", null, null, null, "version", null, null, "version/" );
- }
-
- public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir_UseModuleInfo()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingModuleProject( "${module.build.finalName}", null, null, null, null, "finalName", null,
- "finalName/" );
- }
-
- public void testGetOutputDir_ShouldResolveGroupIdInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${pom.groupId}", null, "group", null, null, null, null, "group/" );
- }
-
- public void testGetOutputDir_ShouldResolveArtifactIdInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${pom.artifactId}", null, null, "artifact", null, null, null, "artifact/" );
- }
-
- public void testGetOutputDir_ShouldResolveVersionInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${pom.version}", null, null, null, "version", null, null, "version/" );
- }
-
- public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${pom.build.finalName}", null, null, null, null, "finalName", null,
- "finalName/" );
- }
-
- public void testGetOutputDir_ShouldResolveGroupIdInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${project.groupId}", null, "group", null, null, null, null, "group/" );
- }
-
- public void testGetOutputDir_ShouldResolveArtifactIdInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${project.artifactId}", null, null, "artifact", null, null, null, "artifact/" );
- }
-
- public void testGetOutputDir_ShouldResolveVersionInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${project.version}", null, null, null, "version", null, null, "version/" );
- }
-
- public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "${project.build.finalName}", null, "finalName", "finalName/" );
- }
-
- public void testGetOutputDir_ShouldNotAlterOutDirWhenIncludeBaseFalseAndNoExpressions()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "dir/", "finalName", null, "dir/" );
- }
-
- public void testGetOutputDir_ShouldNotAlterOutDirWhenIncludeBaseFalseAndNoExpressions_CheckWithBackslash()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "dir\\", "finalName", null, "dir\\" );
- }
-
- public void testGetOutputDir_ShouldAppendSlashToOutDirWhenMissingAndIncludeBaseFalseAndNoExpressions()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "dir", "finalName", null, "dir/" );
- }
-
- public void testGetOutputDir_ShouldResolveGroupIdInOutDir()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${groupId}", "finalName", "group", null, null, null, null, "group/" );
- }
-
- public void testGetOutputDir_ShouldResolveArtifactIdInOutDir()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${artifactId}", "finalName", null, "artifact", null, null, null, "artifact/" );
- }
-
- public void testGetOutputDir_ShouldResolveVersionInOutDir()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "${version}", "finalName", null, null, "version", null, null, "version/" );
- }
-
- public void testGetOutputDir_ShouldResolveVersionInLargerOutDirExpr()
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( "my-special-${version}", "finalName", null, null, "99", null, null,
- "my-special-99/" );
- }
-
- public void testGetOutputDir_ShouldResolveFinalNameInOutDir()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "${finalName}", "finalName", null, "finalName/" );
- }
-
- public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "${build.finalName}", "finalName", null, "finalName/" );
- }
-
- public void testGetOutputDir_ShouldReturnEmptyPathWhenAllInputIsEmptyAndIncludeBaseFalse()
- throws AssemblyFormattingException
- {
- verifyOutputDir( null, null, null, "" );
- }
-
- public void testGetOutputDir_ShouldRemoveRelativeRefToCurrentDir()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "./path/", null, null, "path/" );
- }
-
- public void testGetOutputDir_ShouldRemoveEmbeddedSameDirRef()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "some/./path/", null, null, "some/path/" );
- }
-
- public void testGetOutputDir_ShouldRemoveEmbeddedParentDirRef()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "some/../path/", null, null, "path/" );
- }
-
- public void testGetOutputDir_ShouldTruncateRelativeRefToParentDir()
- throws AssemblyFormattingException
- {
- verifyOutputDir( "../path/", null, null, "path/" );
- }
-
- public void testGetOutputDir_ShouldResolveProjectProperty()
- throws AssemblyFormattingException
- {
- final Properties props = new Properties();
- props.setProperty( "myProperty", "value" );
-
- verifyOutputDirUsingMainProject( "file.${myProperty}", null, null, null, null, null, props, "file.value/" );
- }
-
- public void testGetOutputDir_ShouldResolveProjectPropertyAltExpr()
- throws AssemblyFormattingException
- {
- final Properties props = new Properties();
- props.setProperty( "myProperty", "value" );
-
- verifyOutputDirUsingMainProject( "file.${pom.properties.myProperty}", null, null, null, null, null, props,
- "file.value/" );
- }
-
- public void testEvalFileNameMapping_ShouldResolveArtifactIdAndBaseVersionInOutDir_UseArtifactInfo_WithValidMainProject()
- throws AssemblyFormattingException
- {
- final MavenProject mainProject = createProject( "group", "main", "1", null );
-
- final String artifactVersion = "2-20070807.112233-1";
- final String artifactBaseVersion = "2-SNAPSHOT";
- final MavenProject artifactProject = createProject( "group", "artifact", artifactVersion, null );
- final ArtifactMock artifactMock =
- new ArtifactMock( mockManager, "group", "artifact", artifactVersion, "jar", true, artifactBaseVersion );
-
- artifactProject.setArtifact( artifactMock.getArtifact() );
-
- final MavenSession session = mockManager.createMock(MavenSession.class);
- expect( session.getExecutionProperties()).andReturn( null ).anyTimes();
-
- expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes();
-
-
- final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
- expect( cs.getMavenSession()).andReturn( session ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( cs);
-
- mockManager.replayAll();
-
- final String result =
- evaluateFileNameMapping( "${artifact.artifactId}-${artifact.baseVersion}", artifactMock.getArtifact(),
- mainProject, null, cs, moduleProjectInterpolator( null ),
- artifactProjectInterpolator( artifactProject ) );
-
-/*
- final Artifact artifact = artifactMock.getArtifact();
- final String result =
- AssemblyFormatUtils.evaluateFileNameMapping( "${artifact.artifactId}-${artifact.baseVersion}",
- moduleArtifactInterpolator( null ),
- moduleProjectInterpolator( null ),
- artifactInterpolator( artifact ),
- artifactProjectInterpolator( artifactProject ),
- mainArtifactPropsOnly( mainProject ),
- classifierRules( artifact ),
- FixedStringSearchInterpolator.empty() );
-
- */
- assertEquals( "artifact-2-SNAPSHOT", result );
-
- mockManager.verifyAll();
-
- // clear out for next call.
- mockManager.resetAll();
- }
-
- public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingArtifactProject( "${artifact.groupId}", null, "group", null, null, null, "group",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingArtifactProject( "${artifact.artifactId}", null, null, "artifact", null, null,
- "artifact", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseArtifactInfo()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingArtifactProject( "${artifact.version}", null, null, null, "version", null,
- "version", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfoAndModulePrefix()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingModuleProject( "${module.groupId}", null, "group", null, null, null, "group",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseArtifactInfoAndModulePrefix()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingModuleProject( "${module.artifactId}", null, null, "artifact", null, null,
- "artifact", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseArtifactInfoAndModulePrefix()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingModuleProject( "${module.version}", null, null, null, "version", null, "version",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${pom.groupId}", null, "group", null, null, null, "group", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${pom.artifactId}", null, null, "artifact", null, null, "artifact",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseExplicitMainProject()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${pom.version}", null, null, null, "version", null, "version", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${project.groupId}", null, "group", null, null, null, "group", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${project.artifactId}", null, null, "artifact", null, null,
- "artifact", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseExplicitMainProject_projectRef()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${project.version}", null, null, null, "version", null, "version",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldRemoveRelativeRefToCurrentDir()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "./path/", null, null, null, null, null, "path/",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldRemoveEmbeddedSameDirRef()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "some/./path/", null, null, null, null, null, "some/path/",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldRemoveEmbeddedParentDirRef()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "some/../path/", null, null, null, null, null, "path/",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldTruncateRelativeRefToParentDir()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "../path/", null, null, null, null, null, "path/",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldPassExpressionThroughUnchanged()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "filename", null, null, "filename", null );
- }
-
- public void testEvalFileNameMapping_ShouldInsertClassifierAheadOfExtension()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "filename-${artifact.classifier}.ext", "classifier", null,
- "filename-classifier.ext", null );
- }
-
- public void testEvalFileNameMapping_ShouldAppendDashClassifierWhenClassifierPresent()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "filename${dashClassifier?}", "classifier", null, "filename-classifier", null );
- }
-
- public void testEvalFileNameMapping_ShouldNotAppendDashClassifierWhenClassifierMissing()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "filename${dashClassifier?}", null, null, "filename", null );
- }
-
- public void testEvalFileNameMapping_ShouldNotAppendDashClassifierWhenClassifierEmpty()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "filename${dashClassifier?}", "", null, "filename", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveGroupId()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${groupId}", null, "group", null, null, null, "group", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveArtifactId()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${artifactId}", null, null, "artifact", null, null, "artifact",
- null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveVersion()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( "${version}", null, null, null, "version", null, "version", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveExtension()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "file.${artifact.extension}", null, "ext", "file.ext", null );
- }
-
- public void testEvalFileNameMapping_ShouldResolveProjectProperty()
- throws AssemblyFormattingException
- {
- final Properties props = new Properties();
- props.setProperty( "myProperty", "value" );
-
- verifyEvalFileNameMapping( "file.${myProperty}", null, null, "file.value", props );
- }
-
- public void testEvalFileNameMapping_ShouldResolveProjectPropertyAltExpr()
- throws AssemblyFormattingException
- {
- final Properties props = new Properties();
- props.setProperty( "myProperty", "value" );
-
- verifyEvalFileNameMapping( "file.${pom.properties.myProperty}", null, null, "file.value", props );
- }
-
- public void testEvalFileNameMapping_ShouldResolveSystemPropertyWithoutMainProjectPresent()
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMapping( "file.${java.version}", null, null, "file." + System.getProperty( "java.version" ),
- null );
- }
-
- private void verifyEvalFileNameMapping( final String expression, final String classifier, final String extension,
- final String checkValue, final Properties projectProperties )
- throws AssemblyFormattingException
- {
- verifyEvalFileNameMappingUsingMainProject( expression, classifier, null, null, null, extension, checkValue,
- projectProperties );
- }
-
- private void verifyEvalFileNameMappingUsingMainProject( final String expression, final String classifier,
- final String groupId, final String artifactId,
- final String version, final String extension,
- final String checkValue, final Properties projectProperties )
- throws AssemblyFormattingException
- {
- final MavenProject mainProject = createProject( groupId, artifactId, version, projectProperties );
-
- final MavenProject artifactProject = createProject( "unknown", "unknown", "unknown", null );
- final MavenProject moduleProject = createProject( "unknown", "unknown", "unknown", null );
-
- verifyEvalFileNameMapping( expression, classifier, extension, mainProject, moduleProject, artifactProject,
- checkValue );
- }
-
- private void verifyEvalFileNameMappingUsingArtifactProject( final String expression, final String classifier,
- final String groupId, final String artifactId,
- final String version, final String extension,
- final String checkValue,
- final Properties projectProperties )
- throws AssemblyFormattingException
- {
- final MavenProject artifactProject = createProject( groupId, artifactId, version, projectProperties );
-
- final MavenProject mainProject = createProject( "unknown", "unknown", "unknown", null );
- final MavenProject moduleProject = createProject( "unknown", "unknown", "unknown", null );
-
- verifyEvalFileNameMapping( expression, classifier, extension, mainProject, moduleProject, artifactProject,
- checkValue );
- }
-
- private void verifyEvalFileNameMappingUsingModuleProject( final String expression, final String classifier,
- final String groupId, final String artifactId,
- final String version, final String extension,
- final String checkValue,
- final Properties projectProperties )
- throws AssemblyFormattingException
- {
- final MavenProject moduleProject = createProject( groupId, artifactId, version, projectProperties );
-
- final MavenProject mainProject = createProject( "unknown", "unknown", "unknown", null );
- final MavenProject artifactProject = createProject( "unknown", "unknown", "unknown", null );
-
- verifyEvalFileNameMapping( expression, classifier, extension, mainProject, moduleProject, artifactProject,
- checkValue );
- }
-
- private MavenProject createProject( String groupId, String artifactId, String version,
- final Properties projectProperties )
- {
- if ( artifactId == null )
- {
- artifactId = "artifact";
- }
-
- if ( groupId == null )
- {
- groupId = "group";
- }
-
- if ( version == null )
- {
- version = "version";
- }
-
- final Model model = new Model();
- model.setGroupId( groupId );
- model.setArtifactId( artifactId );
- model.setVersion( version );
-
- model.setProperties( projectProperties );
-
- return new MavenProject( model );
- }
-
- private void verifyEvalFileNameMapping( final String expression, final String classifier, final String extension,
- final MavenProject mainProject, final MavenProject moduleProject,
- final MavenProject artifactProject, final String checkValue )
- throws AssemblyFormattingException
- {
- final ArtifactMock artifactMock =
- new ArtifactMock( mockManager, artifactProject.getGroupId(), artifactProject.getArtifactId(),
- artifactProject.getVersion(), extension, classifier, false, null );
-
- final ArtifactMock moduleArtifactMock =
- new ArtifactMock( mockManager, moduleProject.getGroupId(), moduleProject.getArtifactId(),
- moduleProject.getVersion(), "jar", false, null );
-
-
- final MavenSession session = mockManager.createMock( MavenSession.class );
- expect( session.getExecutionProperties()).andReturn( System.getProperties() ).anyTimes();
-
- expect(session.getUserProperties()).andReturn( new Properties( ) ).anyTimes();
-
-
- final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
- expect( cs.getMavenSession()).andReturn( session ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( cs, mainProject);
-
-
- mockManager.replayAll();
-
- final String result =
- AssemblyFormatUtils.evaluateFileNameMapping( expression, artifactMock.getArtifact(), mainProject,
- moduleArtifactMock.getArtifact(), cs,
- moduleProjectInterpolator( moduleProject ),
- artifactProjectInterpolator( artifactProject ) );
-
- /*
- final String result =
- AssemblyFormatUtils.evaluateFileNameMapping( expression,
- moduleArtifactInterpolator( moduleArtifactMock.getArtifact() ),
- moduleProjectInterpolator( moduleProject ),
- artifactInterpolator( artifactMock.getArtifact() ),
- artifactProjectInterpolator( artifactProject ),
- mainArtifactPropsOnly( mainProject ),
- classifierRules( artifactMock.getArtifact() ),
- FixedStringSearchInterpolator.create( new PropertiesBasedValueSource( System.getProperties() )) );
-
- */
- assertEquals( checkValue, result );
-
- mockManager.verifyAll();
-
- // clear out for next call.
- mockManager.resetAll();
- }
-
- private void verifyOutputDir( final String outDir, final String finalName, final String projectFinalName,
- final String checkValue )
- throws AssemblyFormattingException
- {
- verifyOutputDirUsingMainProject( outDir, finalName, null, null, null, projectFinalName, null, checkValue );
- }
-
- private void verifyOutputDirUsingMainProject( final String outDir, final String finalName, final String groupId,
- final String artifactId, final String version,
- final String projectFinalName, final Properties properties,
- final String checkValue )
- throws AssemblyFormattingException
- {
- final MavenProject project = createProject( groupId, artifactId, version, properties );
-
- if ( projectFinalName != null )
- {
- final Build build = new Build();
- build.setFinalName( projectFinalName );
-
- project.getModel().setBuild( build );
- }
-
- final MavenProject moduleProject = createProject( "unknown", "unknown", "unknown", null );
- final MavenProject artifactProject = createProject( "unknown", "unknown", "unknown", null );
-
- verifyOutputDir( outDir, finalName, project, moduleProject, artifactProject, checkValue );
- }
-
- private void verifyOutputDirUsingModuleProject( final String outDir, final String finalName, final String groupId,
- final String artifactId, final String version,
- final String projectFinalName, final Properties properties,
- final String checkValue )
- throws AssemblyFormattingException
- {
- final MavenProject project = createProject( groupId, artifactId, version, properties );
-
- if ( projectFinalName != null )
- {
- final Build build = new Build();
- build.setFinalName( projectFinalName );
-
- project.getModel().setBuild( build );
- }
-
- final MavenProject mainProject = createProject( "unknown", "unknown", "unknown", null );
- final MavenProject artifactProject = createProject( "unknown", "unknown", "unknown", null );
-
- verifyOutputDir( outDir, finalName, mainProject, project, artifactProject, checkValue );
- }
-
- private void verifyOutputDirUsingArtifactProject( final String outDir, final String finalName,
- final String groupId, final String artifactId,
- final String version, final String projectFinalName,
- final Properties properties, final String checkValue )
- throws AssemblyFormattingException
- {
- final MavenProject project = createProject( groupId, artifactId, version, properties );
-
- if ( projectFinalName != null )
- {
- final Build build = new Build();
- build.setFinalName( projectFinalName );
-
- project.getModel().setBuild( build );
- }
-
- final MavenProject moduleProject = createProject( "unknown", "unknown", "unknown", null );
- final MavenProject mainProject = createProject( "unknown", "unknown", "unknown", null );
-
- verifyOutputDir( outDir, finalName, mainProject, moduleProject, project, checkValue );
- }
-
- private void verifyOutputDir( final String outDir, final String finalName, final MavenProject mainProject,
- final MavenProject moduleProject, final MavenProject artifactProject,
- final String checkValue )
- throws AssemblyFormattingException
- {
-
- final MavenSession session = mockManager.createMock( MavenSession.class );
- expect( session.getExecutionProperties()).andReturn( System.getProperties()).anyTimes();
-
- expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes();
-
-
-
- final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
- expect( cs.getMavenSession()).andReturn( session ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( cs, mainProject);
-
- String result;
-
- mockManager.replayAll();
- result =
- AssemblyFormatUtils.getOutputDirectory( outDir, finalName, cs,
- moduleProjectInterpolator( moduleProject ),
- artifactProjectInterpolator( artifactProject ) );
-
-
- assertEquals( checkValue, result );
-
- mockManager.verifyAll();
-
- mockManager.resetAll();
- }
-
- private void verifyDistroName( final String assemblyId, final String classifier, final String finalName,
- final boolean appendAssemblyId, final String checkValue )
- {
- final MockAndControlForGetDistroName mac =
- new MockAndControlForGetDistroName( finalName, appendAssemblyId, classifier );
-
- mockManager.replayAll();
-
- final Assembly assembly = new Assembly();
- assembly.setId( assemblyId );
-
- final String result = AssemblyFormatUtils.getDistributionName( assembly, mac.configSource );
-
- assertEquals( checkValue, result );
-
- mockManager.verifyAll();
-
- // clear it out for the next call.
- mockManager.resetAll();
- }
-
- public void testWindowsPath(){
- assertTrue( AssemblyFormatUtils.isWindowsPath( "C:\foobar" ));
- }
- public void testLinuxRootReferencePath(){
- assertTrue( AssemblyFormatUtils.isLinuxRootReference( "/etc/home" ) );
- }
-
-
- private final class MockAndControlForGetDistroName
- {
- final AssemblerConfigurationSource configSource;
-
- private final String classifier;
-
- private final boolean isAssemblyIdAppended;
-
- private final String finalName;
-
- public MockAndControlForGetDistroName( final String finalName, final boolean isAssemblyIdAppended,
- final String classifier )
- {
- this.finalName = finalName;
- this.isAssemblyIdAppended = isAssemblyIdAppended;
- this.classifier = classifier;
-
- configSource = mockManager.createMock (AssemblerConfigurationSource.class);
-
- enableExpectations();
- }
-
- private void enableExpectations()
- {
- expect(configSource.getClassifier()).andReturn( classifier ).atLeastOnce();
-
- expect(configSource.isAssemblyIdAppended()).andReturn( isAssemblyIdAppended ).atLeastOnce();
-
- expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
- }
-
-
-
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
deleted file mode 100644
index de37f8c..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
+++ /dev/null
@@ -1,413 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.easymock.EasyMock.expect;
-
-public class FilterUtilsTest
- extends TestCase
-{
-
- private final EasyMockSupport mockManager = new EasyMockSupport();
-
- private Logger logger;
-
- @Override
- public void setUp()
- {
- clearAll();
- }
-
- private void clearAll()
- {
- logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- }
-
- public void testFilterArtifacts_ShouldThrowExceptionUsingStrictModeWithUnmatchedInclude()
- {
- final Artifact artifact = mockManager.createMock( Artifact.class );
-
- expect(artifact.getGroupId()).andReturn( "group").atLeastOnce();
-
- expect( artifact.getArtifactId()).andReturn( "artifact").atLeastOnce();
-
- expect( artifact.getId()).andReturn( "group:artifact:type:version").atLeastOnce();
-
- expect( artifact.getDependencyConflictId()).andReturn( "group:artifact:type").atLeastOnce();
-
- final List<String> includes = new ArrayList<String>();
-
- includes.add( "other.group:other-artifact:type:version" );
-
- final List<String> excludes = Collections.emptyList();
-
- final Set<Artifact> artifacts = new HashSet<Artifact>();
- artifacts.add( artifact );
-
- mockManager.replayAll();
-
- try
- {
- FilterUtils.filterArtifacts( artifacts, includes, excludes, true, false, logger );
-
- fail( "Should fail because of unmatched include." );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- // expected.
- }
-
- mockManager.verifyAll();
- }
-
- public void testFilterArtifacts_ShouldNotRemoveArtifactDirectlyIncluded()
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactInclusion( "group", "artifact", "group:artifact", null, null, null );
- verifyArtifactInclusion( "group", "artifact", "group:artifact:jar", null, null, null );
- }
-
- public void testFilterArtifacts_ShouldNotRemoveArtifactTransitivelyIncluded()
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactInclusion( "group",
- "artifact",
- "group:dependentArtifact",
- null,
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version"), null );
- }
-
- public void testFilterArtifacts_ShouldRemoveArtifactTransitivelyExcluded()
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactExclusion( "group",
- "artifact",
- null,
- "group:dependentArtifact",
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version"), null );
- }
-
- public void testFilterArtifacts_ShouldRemoveArtifactDirectlyExcluded()
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactExclusion( "group", "artifact", null, "group:artifact", null, null );
-
- clearAll();
-
- verifyArtifactExclusion( "group", "artifact", null, "group:artifact:jar", null, null );
- }
-
- public void testFilterArtifacts_ShouldNotRemoveArtifactNotIncludedAndNotExcluded()
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactInclusion( "group", "artifact", null, null, null, null );
- verifyArtifactInclusion( "group", "artifact", null, null, null, null );
- }
-
- public void testFilterArtifacts_ShouldRemoveArtifactExcludedByAdditionalFilter()
- throws InvalidAssemblerConfigurationException
- {
- final ArtifactFilter filter = new ArtifactFilter()
- {
-
- public boolean include( final Artifact artifact )
- {
- return false;
- }
-
- };
-
- verifyArtifactExclusion( "group", "artifact", "fail:fail", null, null, filter );
- }
-
- public void testFilterProjects_ShouldNotRemoveProjectDirectlyIncluded()
- {
- verifyProjectInclusion( "group", "artifact", "group:artifact", null, null );
- verifyProjectInclusion( "group", "artifact", "group:artifact:jar", null, null );
- }
-
- public void testFilterProjects_ShouldNotRemoveProjectTransitivelyIncluded()
- {
- verifyProjectInclusion( "group",
- "artifact",
- "group:dependentArtifact",
- null,
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version") );
- }
-
- public void testFilterProjects_ShouldRemoveProjectTransitivelyExcluded()
- {
- verifyProjectExclusion( "group",
- "artifact",
- null,
- "group:dependentArtifact",
- Arrays.asList("current:project:jar:1.0",
- "group:dependentArtifact:jar:version") );
- }
-
- public void testFilterProjects_ShouldRemoveProjectDirectlyExcluded()
- {
- verifyProjectExclusion( "group", "artifact", null, "group:artifact", null );
- verifyProjectExclusion( "group", "artifact", null, "group:artifact:jar", null );
- }
-
- public void testFilterProjects_ShouldNotRemoveProjectNotIncludedAndNotExcluded()
- {
- verifyProjectInclusion( "group", "artifact", null, null, null );
- verifyProjectInclusion( "group", "artifact", null, null, null );
- }
-
- private void verifyArtifactInclusion( final String groupId, final String artifactId, final String inclusionPattern,
- final String exclusionPattern, final List<String> depTrail,
- final ArtifactFilter additionalFilter )
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactFiltering( groupId, artifactId, inclusionPattern, exclusionPattern, depTrail, true,
- additionalFilter );
- }
-
- private void verifyArtifactExclusion( final String groupId, final String artifactId, final String inclusionPattern,
- final String exclusionPattern, final List<String> depTrail,
- final ArtifactFilter additionalFilter )
- throws InvalidAssemblerConfigurationException
- {
- verifyArtifactFiltering( groupId, artifactId, inclusionPattern, exclusionPattern, depTrail, false,
- additionalFilter );
- }
-
- private void verifyArtifactFiltering( final String groupId, final String artifactId, final String inclusionPattern,
- final String exclusionPattern, final List<String> depTrail,
- final boolean verifyInclusion, final ArtifactFilter additionalFilter )
- throws InvalidAssemblerConfigurationException
- {
- final ArtifactMockAndControl mac = new ArtifactMockAndControl( groupId, artifactId, depTrail );
-
- mockManager.replayAll();
-
- List<String> inclusions;
- if ( inclusionPattern != null )
- {
- inclusions = Collections.singletonList( inclusionPattern );
- }
- else
- {
- inclusions = Collections.emptyList();
- }
-
- List<String> exclusions;
- if ( exclusionPattern != null )
- {
- exclusions = Collections.singletonList( exclusionPattern );
- }
- else
- {
- exclusions = Collections.emptyList();
- }
-
- final Set<Artifact> artifacts = new HashSet<Artifact>();
- artifacts.add( mac.artifact );
-
- FilterUtils.filterArtifacts( artifacts, inclusions, exclusions, false, depTrail != null, logger,
- additionalFilter );
-
- if ( verifyInclusion )
- {
- assertEquals( 1, artifacts.size() );
- assertEquals( mac.artifact.getDependencyConflictId(), artifacts.iterator()
- .next()
- .getDependencyConflictId() );
- }
- else
- {
- // just make sure this trips, to meet the mock's expectations.
- mac.artifact.getDependencyConflictId();
-
- assertTrue( artifacts.isEmpty() );
- }
-
- mockManager.verifyAll();
-
- // get ready for multiple calls per test.
- mockManager.resetAll();
- }
-
- private void verifyProjectInclusion( final String groupId, final String artifactId, final String inclusionPattern,
- final String exclusionPattern, final List<String> depTrail )
- {
- verifyProjectFiltering( groupId, artifactId, inclusionPattern, exclusionPattern, depTrail, true );
- }
-
- private void verifyProjectExclusion( final String groupId, final String artifactId, final String inclusionPattern,
- final String exclusionPattern, final List<String> depTrail )
- {
- verifyProjectFiltering( groupId, artifactId, inclusionPattern, exclusionPattern, depTrail, false );
- }
-
- private void verifyProjectFiltering( final String groupId, final String artifactId, final String inclusionPattern,
- final String exclusionPattern, final List<String> depTrail,
- final boolean verifyInclusion )
- {
- final ProjectWithArtifactMockControl pmac = new ProjectWithArtifactMockControl( groupId, artifactId, depTrail );
-
- mockManager.replayAll();
-
- // make sure the mock is satisfied...you can't disable this expectation.
- pmac.mac.artifact.getDependencyConflictId();
-
- final Set<MavenProject> projects = new HashSet<MavenProject>();
- projects.add( pmac );
-
- List<String> inclusions;
- if ( inclusionPattern != null )
- {
- inclusions = Collections.singletonList( inclusionPattern );
- }
- else
- {
- inclusions = Collections.emptyList();
- }
-
- List<String> exclusions;
- if ( exclusionPattern != null )
- {
- exclusions = Collections.singletonList( exclusionPattern );
- }
- else
- {
- exclusions = Collections.emptyList();
- }
-
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
- Set<MavenProject> result =
- FilterUtils.filterProjects( projects, inclusions, exclusions, depTrail != null, logger );
-
- if ( verifyInclusion )
- {
- assertEquals( 1, result.size() );
- assertEquals( pmac.getId(), result.iterator()
- .next()
- .getId() );
- }
- else
- {
- assertTrue( result.isEmpty() );
- }
-
- mockManager.verifyAll();
-
- // get ready for multiple calls per test.
- mockManager.resetAll();
- }
-
- private static Model buildModel( final String groupId, final String artifactId )
- {
- final Model model = new Model();
- model.setGroupId( groupId );
- model.setArtifactId( artifactId );
-
- return model;
- }
-
- private final class ProjectWithArtifactMockControl
- extends MavenProject
- {
- final ArtifactMockAndControl mac;
-
- ProjectWithArtifactMockControl( final String groupId, final String artifactId, final List<String> depTrail )
- {
- super( buildModel( groupId, artifactId ) );
-
- mac = new ArtifactMockAndControl( groupId, artifactId, depTrail );
-
- setArtifact( mac.artifact );
- }
-
- }
-
- private final class ArtifactMockAndControl
- {
- final Artifact artifact;
-
- final String groupId;
-
- final String artifactId;
-
- final List<String> dependencyTrail;
-
- ArtifactMockAndControl( final String groupId, final String artifactId, final List<String> dependencyTrail )
- {
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.dependencyTrail = dependencyTrail;
-
- artifact = mockManager.createMock (Artifact.class);
-
- // this is always enabled, for verification purposes.
- enableGetDependencyConflictId();
- enableGetGroupIdArtifactIdAndId();
-
- if ( dependencyTrail != null )
- {
- enableGetDependencyTrail();
- }
- }
-
- void enableGetDependencyTrail()
- {
- expect( artifact.getDependencyTrail()).andReturn( dependencyTrail ).anyTimes();
- }
-
- void enableGetDependencyConflictId()
- {
- expect(artifact.getDependencyConflictId()).andReturn( groupId + ":" + artifactId + ":jar").anyTimes();
- }
-
- void enableGetGroupIdArtifactIdAndId()
- {
- expect( artifact.getGroupId()).andReturn( groupId).anyTimes();
-
- expect( artifact.getArtifactId()).andReturn( artifactId ).anyTimes();
-
- expect( artifact.getId()).andReturn( groupId + ":" + artifactId + ":version:null:jar").anyTimes();
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java
deleted file mode 100644
index 3be732b..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.util.IOUtil;
-import org.junit.Test;
-
-public class LineEndingsUtilsTest
-{
-
- private static final String CRLF = "\r\n";
-
- private static final String LF = "\n";
-
- @Test
- public void shouldWorkCauseWeTestJdkEnumConversion()
- {
- LineEndings lineEnding = LineEndings.valueOf( "windows" );
- assertEquals( CRLF, lineEnding.getLineEndingCharacters() );
- }
-
- @Test
- public void shouldReturnDosLineEnding()
- {
- assertEquals( CRLF, LineEndings.windows.getLineEndingCharacters() );
- assertEquals( CRLF, LineEndings.dos.getLineEndingCharacters() );
- assertEquals( CRLF, LineEndings.crlf.getLineEndingCharacters() );
- }
-
- @Test
- public void shouldReturnUnixLineEnding()
- {
- assertEquals( LF, LineEndings.unix.getLineEndingCharacters() );
- assertEquals( LF, LineEndings.lf.getLineEndingCharacters() );
- }
-
- @Test
- public void shouldReturnNullAsLineEndingForKeep()
- {
- assertEquals( null, LineEndings.keep.getLineEndingCharacters() );
- }
-
- @Test
- public void testGetLineEndingChars_ShouldReturnDosLineEnding()
- throws AssemblyFormattingException
- {
- assertEquals( "\r\n", LineEndingsUtils.getLineEndingCharacters( "windows" ) );
- assertEquals( "\r\n", LineEndingsUtils.getLineEndingCharacters( "dos" ) );
- assertEquals( "\r\n", LineEndingsUtils.getLineEndingCharacters( "crlf" ) );
- }
-
- @Test
- public void testGetLineEndingChars_ShouldReturnUnixLineEnding()
- throws AssemblyFormattingException
- {
- assertEquals( "\n", LineEndingsUtils.getLineEndingCharacters( "unix" ) );
- assertEquals( "\n", LineEndingsUtils.getLineEndingCharacters( "lf" ) );
- }
-
- @Test
- public void testGetLineEndingChars_ShouldReturnNullLineEnding()
- throws AssemblyFormattingException
- {
- assertNull( LineEndingsUtils.getLineEndingCharacters( "keep" ) );
- }
-
- @Test( expected = AssemblyFormattingException.class )
- public void testGetLineEndingChars_ShouldThrowFormattingExceptionWithInvalidHint()
- throws AssemblyFormattingException
- {
- LineEndingsUtils.getLineEndingCharacters( "invalid" );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceLFWithCRLF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, LineEndings.crlf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceLFWithCRLFAtEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, LineEndings.crlf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceCRLFWithLF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \ntest.";
-
- testConversion( test, check, LineEndings.lf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceCRLFWithLFAtEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, LineEndings.lf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceLFWithLF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \ntest.";
-
- testConversion( test, check, LineEndings.lf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceLFWithLFAtEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, LineEndings.lf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceCRLFWithCRLF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, LineEndings.crlf, null );
- }
-
- @Test
- public void testConvertLineEndings_ShouldReplaceCRLFWithCRLFAtEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, LineEndings.crlf, null );
- }
-
- @Test
- public void testConvertLineEndings_LFToCRLFNoEOFForceEOF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, LineEndings.crlf, true );
- }
-
- @Test
- public void testConvertLineEndings_LFToCRLFWithEOFForceEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, LineEndings.crlf, true );
- }
-
- @Test
- public void testConvertLineEndings_LFToCRLFNoEOFStripEOF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, LineEndings.crlf, false );
- }
-
- @Test
- public void testConvertLineEndings_LFToCRLFWithEOFStripEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, LineEndings.crlf, false );
- }
-
- @Test
- public void testConvertLineEndings_CRLFToLFNoEOFForceEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, LineEndings.lf, true );
- }
-
- @Test
- public void testConvertLineEndings_CRLFToLFWithEOFForceEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, LineEndings.lf, true );
- }
-
- @Test
- public void testConvertLineEndings_CRLFToLFNoEOFStripEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \ntest.";
-
- testConversion( test, check, LineEndings.lf, false );
- }
-
- @Test
- public void testConvertLineEndings_CRLFToLFWithEOFStripEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \ntest.";
-
- testConversion( test, check, LineEndings.lf, false );
- }
-
- private void testConversion( String test, String check, LineEndings lineEndingChars, Boolean eof )
- throws IOException
- {
- File source = File.createTempFile( "line-conversion-test-in.", "" );
- source.deleteOnExit();
- File dest = File.createTempFile( "line-conversion-test-out.", "" );
- dest.deleteOnExit();
-
- FileWriter sourceWriter = null;
- StringReader sourceReader = new StringReader( test );
- try
- {
- sourceWriter = new FileWriter( source );
-
- IOUtil.copy( sourceReader, sourceWriter );
- }
- finally
- {
- IOUtil.close( sourceWriter );
- }
-
- // Using platform encoding for the conversion tests in this class is OK
- LineEndingsUtils.convertLineEndings( source, dest, lineEndingChars, eof, null );
-
- FileReader destReader = null;
- StringWriter destWriter = new StringWriter();
- try
- {
- destReader = new FileReader( dest );
-
- IOUtil.copy( destReader, destWriter );
- }
- finally
- {
- IOUtil.close( destReader );
- }
-
- assertEquals( check, destWriter.toString() );
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
deleted file mode 100644
index 3e15ec7..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-public class LinuxLineFeedInputStreamTest
- extends TestCase
-{
-
- public void testSimpleString()
- throws Exception
- {
- assertEquals( "abc\n", roundtrip( "abc" ) );
- }
-
- public void testInTheMiddleOfTheLine()
- throws Exception
- {
- assertEquals( "a\nbc\n", roundtrip( "a\r\nbc" ) );
- }
-
- public void testCrOnly()
- throws Exception
- {
- assertEquals( "a\nb\n", roundtrip( "a\rb" ) );
- }
-
- public void testCrAtEnd() throws Exception {
- assertEquals( "a\n", roundtrip( "a\r" ) );
- }
-
-
- public void testMultipleBlankLines()
- throws Exception
- {
- assertEquals( "a\n\nbc\n", roundtrip( "a\r\n\r\nbc" ) );
- }
-
- public void testTwoLinesAtEnd()
- throws Exception
- {
- assertEquals( "a\n\n", roundtrip( "a\r\n\r\n" ) );
- }
-
- public void testRetainLineFeed()
- throws Exception
- {
- assertEquals( "a\n\n", roundtrip( "a\r\n\r\n", false ) );
- assertEquals( "a", roundtrip( "a", false ) );
- }
-
- private String roundtrip( String msg )
- throws IOException
- {
- return roundtrip( msg, true );
- }
-
- private String roundtrip( String msg, boolean ensure )
- throws IOException
- {
- ByteArrayInputStream baos = new ByteArrayInputStream( msg.getBytes() );
- LinuxLineFeedInputStream lf = new LinuxLineFeedInputStream( baos, ensure );
- byte[] buf = new byte[100];
- final int read = lf.read( buf );
- return new String( buf, 0, read );
- }
-
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java
deleted file mode 100644
index b1373aa..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-
-public class ProjectUtilsTest
- extends TestCase
-{
-
- private MavenProject createTestProject( final String artifactId, final String groupId, final String version )
- {
- final Model model = new Model();
- model.setArtifactId( artifactId );
- model.setGroupId( groupId );
- model.setVersion( version );
-
- return new MavenProject( model );
- }
-
- public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() throws IOException
- {
- final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
-
- master.setFile( new File( "pom.xml" ) );
-
- master.getModel()
- .addModule( "module" );
-
- final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
-
- module.setFile( new File( "module/pom.xml" ) );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>( 2 );
-
- projects.add( master );
- projects.add( module );
-
- final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
-
- assertNotNull( result );
- assertEquals( 1, result.size() );
- assertEquals( module.getId(), result.iterator()
- .next()
- .getId() );
- }
-
- public void testGetProjectModules_ShouldNotIncludeMasterProject() throws IOException
- {
- final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
-
- final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, Collections.singletonList( master ), true,
- new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
-
- assertNotNull( result );
- assertTrue( result.isEmpty() );
- }
-
- public void testGetProjectModules_ShouldIncludeInDirectModuleOfMasterWhenIncludeSubModulesIsTrue()
- throws IOException
- {
- final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
-
- master.setFile( new File( "project/pom.xml" ) );
-
- master.getModel()
- .addModule( "module" );
-
- final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
-
- module.getModel()
- .addModule( "submodule" );
-
- module.setFile( new File( "project/module/pom.xml" ) );
-
- final MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" );
-
- subModule.setFile( new File( "project/module/submodule/pom.xml" ) );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>( 3 );
-
- projects.add( master );
- projects.add( module );
- projects.add( subModule );
-
- final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
-
- assertNotNull( result );
- assertEquals( 2, result.size() );
-
- final List<MavenProject> verify = new ArrayList<MavenProject>( projects );
- verify.remove( master );
-
- verifyProjectsPresent( verify, result );
- }
-
- public void testGetProjectModules_ShouldExcludeInDirectModuleOfMasterWhenIncludeSubModulesIsFalse()
- throws IOException
- {
- final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
-
- master.setFile( new File( "project/pom.xml" ) );
-
- master.getModel()
- .addModule( "module" );
-
- final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
-
- module.getModel()
- .addModule( "submodule" );
-
- module.setFile( new File( "project/module/pom.xml" ) );
-
- final MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" );
-
- subModule.setFile( new File( "project/module/submodule/pom.xml" ) );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>( 3 );
-
- projects.add( master );
- projects.add( module );
- projects.add( subModule );
-
- final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, false, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
-
- assertNotNull( result );
- assertEquals( 1, result.size() );
-
- final List<MavenProject> verify = new ArrayList<MavenProject>( projects );
- verify.remove( master );
- verify.remove( subModule );
-
- verifyProjectsPresent( verify, result );
- }
-
- public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() throws IOException
- {
- final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
-
- master.setFile( new File( "project/pom.xml" ) );
-
- final MavenProject other = createTestProject( "other", "testGroup", "1.0" );
-
- other.setFile( new File( "other/pom.xml" ) );
-
- final List<MavenProject> projects = new ArrayList<MavenProject>( 3 );
-
- projects.add( master );
- projects.add( other );
-
- final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
-
- assertNotNull( result );
- assertTrue( result.isEmpty() );
- }
-
- private void verifyProjectsPresent( final List<MavenProject> verify, final Set<MavenProject> result )
- {
- final List<MavenProject> verifyCopy = new ArrayList<MavenProject>( verify );
-
- final List<MavenProject> unexpected = new ArrayList<MavenProject>();
-
- for (final MavenProject project : result) {
- boolean removed = false;
-
- for (final Iterator<MavenProject> verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) {
- final MavenProject verification = verifyIterator.next();
-
- if (verification.getId()
- .equals(project.getId())) {
- verifyIterator.remove();
- removed = true;
- }
- }
-
- if (!removed) {
- unexpected.add(project);
- }
- }
-
- if ( !verifyCopy.isEmpty() )
- {
- fail( "Failed to verify presence of: " + verifyCopy );
- }
-
- if ( !unexpected.isEmpty() )
- {
- fail( "Found unexpected projects in result: " + unexpected );
- }
- }
-
- // private void verifyProjectsNotPresent( List verify, Set result )
- // {
- // List verifyCopy = new ArrayList( verify );
- //
- // for ( Iterator it = result.iterator(); it.hasNext(); )
- // {
- // MavenProject project = (MavenProject) it.next();
- //
- // for ( Iterator verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); )
- // {
- // MavenProject verification = (MavenProject) verifyIterator.next();
- //
- // if ( verification.getId().equals( project.getId() ) )
- // {
- // verifyIterator.remove();
- // }
- // }
- // }
- //
- // if ( verifyCopy.size() != verify.size() )
- // {
- // List found = new ArrayList( verify );
- // found.removeAll( verifyCopy );
- //
- // fail( "Failed to verify absence of: " + found );
- // }
- // }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java
deleted file mode 100644
index e37926b..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-
-public class TypeConversionUtilsTest
- extends TestCase
-{
-
- public void testModeToInt_InterpretAsOctalWithoutLeadingZero() throws AssemblyFormattingException
- {
- final int check = Integer.decode("0777");
- final int test = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- assertEquals( check, test );
- }
-
- public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal() throws AssemblyFormattingException
- {
- final int check = Integer.decode("0777");
- final int test = TypeConversionUtils.modeToInt( "0777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- assertEquals( check, test );
- }
-
- public void testModeToInt_FailOnInvalidOctalValue()
- {
- try
- {
- TypeConversionUtils.modeToInt( "493", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- fail( "'493' is an invalid mode and should trigger an exception." );
- }
- catch ( final AssemblyFormattingException e )
- {
- // expected.
- }
- }
-
- public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_002()
- {
- final List<String> messages = new ArrayList<String>( 2 );
- messages.add( "World has write access, but user does not." );
- messages.add( "World has write access, but group does not." );
-
- checkFileModeSanity( "002", false, messages );
- }
-
- public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_020()
- {
- final List<String> messages = new ArrayList<String>( 1 );
- messages.add( "Group has write access, but user does not." );
-
- checkFileModeSanity( "020", false, messages );
- }
-
- public void testVerifyModeSanity_ReturnTrueForValidOctalValue_775()
- {
- checkFileModeSanity( "775", true, null );
- }
-
- private void checkFileModeSanity( final String mode, final boolean isSane,
- final List<String> messagesToCheckIfInsane )
- {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- final PrintStream ps = new PrintStream( baos );
-
- final PrintStream oldOut = System.out;
- final PrintStream oldErr = System.err;
-
- try
- {
- System.setOut( ps );
- System.setErr( ps );
-
- assertEquals( "Mode sanity should be: " + isSane, isSane,
- TypeConversionUtils.verifyModeSanity( Integer.parseInt( mode, 8 ),
- new ConsoleLogger( Logger.LEVEL_WARN, "test" ) ) );
- }
- finally
- {
- System.setOut( oldOut );
- System.setErr( oldErr );
- }
-
- if ( !isSane && messagesToCheckIfInsane != null && !messagesToCheckIfInsane.isEmpty() )
- {
- final String message = new String( baos.toByteArray() );
-
- for (final String checkMessage : messagesToCheckIfInsane) {
- assertTrue("\'" + checkMessage + "\' is not present in output.", message.contains(checkMessage));
- }
- }
- }
-
-}
diff --git a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStreamTest.java b/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStreamTest.java
deleted file mode 100644
index ae1e0fc..0000000
--- a/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStreamTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.apache.maven.plugin.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-public class WindowsLineFeedInputStreamTest
- extends TestCase
-{
-
- public void testSimpleString()
- throws Exception
- {
- assertEquals( "abc\r\n", roundtrip( "abc" ) );
- }
-
- public void testInTheMiddleOfTheLine()
- throws Exception
- {
- assertEquals( "a\r\nbc\r\n", roundtrip( "a\r\nbc" ) );
- }
-
- public void testMultipleBlankLines()
- throws Exception
- {
- assertEquals( "a\r\n\r\nbc\r\n", roundtrip( "a\r\n\r\nbc" ) );
- }
-
- public void testTwoLinesAtEnd()
- throws Exception
- {
- assertEquals( "a\r\n\r\n", roundtrip( "a\r\n\r\n" ) );
- }
-
- public void testLinuxLinefeeds()
- throws Exception
- {
- final String roundtrip = roundtrip( "ab\nc", false );
- assertEquals( "ab\r\nc", roundtrip );
- }
-
-
- public void testMalformed()
- throws Exception
- {
- assertEquals( "a\rbc", roundtrip( "a\rbc", false ) );
- }
-
- public void testRetainLineFeed()
- throws Exception
- {
- assertEquals( "a\r\n\r\n", roundtrip( "a\r\n\r\n", false ) );
- assertEquals( "a", roundtrip( "a", false ) );
- }
-
- private String roundtrip( String msg )
- throws IOException
- {
- return roundtrip( msg, true );
- }
-
- private String roundtrip( String msg, boolean ensure )
- throws IOException
- {
- ByteArrayInputStream baos = new ByteArrayInputStream( msg.getBytes() );
- WindowsLineFeedInputStream lf = new WindowsLineFeedInputStream( baos, ensure );
- byte[] buf = new byte[100];
- final int read = lf.read( buf );
- return new String( buf, 0, read );
- }
-
-
-}
\ No newline at end of file
diff --git a/maven-assembly-plugin-2.x/src/test/resources/assemblies/empty.xml b/maven-assembly-plugin-2.x/src/test/resources/assemblies/empty.xml
deleted file mode 100644
index 0e29d96..0000000
--- a/maven-assembly-plugin-2.x/src/test/resources/assemblies/empty.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
diff --git a/pom.xml b/pom.xml
index f8bf7da..6aada28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,29 +334,6 @@
<profiles>
<profile>
<id>run-its</id>
- <repositories>
- <repository>
- <id>codehaus.org</id>
- <url>http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org</url>
- </pluginRepository>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<properties>
<invokerPluginVersion>1.9</invokerPluginVersion>
<itParent>${project.build.directory}/it/it-project-parent</itParent>
