You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/10/23 23:01:38 UTC
svn commit: r1633948 [2/21] - in /maven/plugins/branches/MASSEMBLY-704: ./
integration-test-archetype/
integration-test-archetype/src/main/resources/META-INF/maven/
integration-test-archetype/src/main/resources/archetype-resources/
integration-test-arc...
Propchange: maven/plugins/branches/MASSEMBLY-704/
------------------------------------------------------------------------------
Merged /maven/plugins/trunk/maven-assembly-plugin:r1618909-1633944
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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>
@@ -27,4 +47,4 @@
<url>${test.remote.repo.url}</url>
</repository>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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">
@@ -32,4 +52,4 @@
</includes>
</fileSet>
</fileSets>
-</archetype-descriptor>
\ No newline at end of file
+</archetype-descriptor>
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/META-INF/maven/archetype.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
@@ -12,4 +32,4 @@
<resource>src/assemble/bin.xml</resource>
<resource>verify.bsh</resource>
</resources>
-</archetype>
\ No newline at end of file
+</archetype>
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/java/AppTest.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,24 @@
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;
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/assembly/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/src/main/java/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,24 @@
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!
*
Modified: maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/integration-test-archetype/src/main/resources/archetype-resources/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.File;
/*
Modified: maven/plugins/branches/MASSEMBLY-704/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/pom.xml Thu Oct 23 21:01:23 2014
@@ -21,7 +21,7 @@ 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>
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.2-SNAPSHOT</version>
+ <version>2.6-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Assembly Plugin</name>
@@ -59,7 +59,7 @@ under the License.
<properties>
<mdoVersion>1.1.2</mdoVersion>
<mavenArchiverVersion>2.5</mavenArchiverVersion>
- <mavenFilteringVersion>1.2</mavenFilteringVersion>
+ <mavenFilteringVersion>1.3</mavenFilteringVersion>
<mavenVersion>2.2.1</mavenVersion>
<testOutputToFile>true</testOutputToFile>
<mavenPluginVersion>3.2</mavenPluginVersion>
@@ -69,6 +69,9 @@ under the License.
<contributor>
<name>Stephen Colebourne</name>
</contributor>
+ <contributor>
+ <name>Tony Jewell</name>
+ </contributor>
</contributors>
<dependencies>
@@ -117,12 +120,12 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.19</version>
+ <version>1.21</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.4.4</version>
+ <version>2.8</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -141,6 +144,11 @@ under the License.
<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>
@@ -148,7 +156,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>2.0.9</version>
+ <version>2.3.2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -164,7 +172,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <version>3.0.20</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -190,6 +198,12 @@ under the License.
<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>
@@ -230,11 +244,12 @@ under the License.
<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>
@@ -279,6 +294,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>3.3</version>
<executions>
<execution>
<id>mojo-descriptor</id>
@@ -318,6 +334,28 @@ under the License.
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ 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>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -370,7 +408,7 @@ under the License.
<configuration>
<localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
<properties>
- <useJvmChmod>${useJvmChmod}</useJvmChmod>
+ <useJvmChmod>${useJvmChmod}</useJvmChmod>
<testVersion>${testVersion}</testVersion>
<localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
<invokerPluginVersion>${invokerPluginVersion}</invokerPluginVersion>
@@ -410,7 +448,7 @@ under the License.
<useJvmChmod>${useJvmChmod}</useJvmChmod>
</properties>
<debug>${it.debug}</debug>
- <settingsFile>src/it/settings.xml</settingsFile>
+ <settingsFile>src/it/settings.xml</settingsFile>
<pomIncludes>
<pomInclude>${it.pomIncludes}</pomInclude>
</pomIncludes>
@@ -423,7 +461,7 @@ under the License.
<pomExclude>dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml</pomExclude>
<pomExclude>dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml</pomExclude>
-
+
<pomExclude>**/child*/pom.xml</pomExclude>
<pomExclude>**/module*/pom.xml</pomExclude>
<pomExclude>**/descriptor/pom.xml</pomExclude>
@@ -434,7 +472,7 @@ under the License.
<postBuildHookScript>verify</postBuildHookScript>
</configuration>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
Modified: maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java Thu Oct 23 21:01:23 2014
@@ -1248,6 +1248,20 @@ public class AssemblyMojoTest
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
{
@@ -1262,6 +1276,20 @@ public class AssemblyMojoTest
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
{
Modified: maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
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;
@@ -679,4 +699,4 @@ public class BasicAbstractAssemblyMojoFe
{
}
}
-}
\ No newline at end of file
+}
Modified: maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
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.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
Modified: maven/plugins/branches/MASSEMBLY-704/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
@@ -16,4 +36,4 @@
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/it-project-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/it-project-parent/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/it-project-parent/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/it-project-parent/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+-->
+
<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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/child/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/ExecutionRoot/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
import java.net.*;
import java.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/classpath-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/classpath-descriptor/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/classpath-descriptor/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/classpath-descriptor/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
@@ -22,6 +41,7 @@
<descriptorRefs>
<descriptorRef>src</descriptorRef>
</descriptorRefs>
+ <tarLongFileMode>posix</tarLongFileMode>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/descriptorDirectoryScan/src/assemble/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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"
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/a.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/a.properties?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/a.properties (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/a.properties Thu Oct 23 21:01:23 2014
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT 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
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/src/assemble/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/file-sameName/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
import java.net.*;
import java.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,5 +1,24 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/src/main/assembly/src.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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>
@@ -12,4 +32,4 @@
</excludes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/formats-in-pom-win/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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();
\ No newline at end of file
+ new java.io.File( basedir, "target/parent-1-src.zip" ) .exists();
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/local-repo-interp/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
File f = new File( basedir, "target/test-1-bin/unprefixed/maven-assembly-plugin.jar" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
File f = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file/path/some.file" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
File f = new File( basedir, "target/project-1-myassembly/files/project1.file" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-simple/src/assemble/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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"
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+-->
+
<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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/1.3-SNAPSHOT/maven-metadata.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
@@ -9,4 +29,4 @@
</snapshot>
<lastUpdated>20060811151624</lastUpdated>
</versioning>
-</metadata>
\ No newline at end of file
+</metadata>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/repository/org/codehaus/plexus/plexus-utils/maven-metadata.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
@@ -8,4 +28,4 @@
</versions>
<lastUpdated>20060811151624</lastUpdated>
</versioning>
-</metadata>
\ No newline at end of file
+</metadata>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/assemble/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/src/main/java/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
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!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
import java.net.*;
import java.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/basic-features/relative-project-paths/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,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.
+ */
+
import java.io.*;
import java.net.*;
import java.util.jar.*;