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 [4/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...
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.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.
+-->
+
<component-set>
<components>
<component>
@@ -11,4 +31,4 @@
</configuration>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.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.
+-->
+
<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/container-descriptors/custom-handler-withFileEntries/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withFileEntries/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.*;
boolean result = true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/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/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/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/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/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/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.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.
+-->
+
<component-set>
<components>
<component>
@@ -11,4 +31,4 @@
</configuration>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.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.
+-->
+
<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/container-descriptors/custom-handler-withMixedEntries/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/custom-handler-withMixedEntries/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.*;
boolean result = true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
@@ -14,4 +34,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/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/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.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.
+ */
+
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/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">
@@ -21,4 +41,4 @@
</excludes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/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/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.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.
+ */
+
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/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>
@@ -16,4 +36,4 @@
<module>child1</module>
<module>child2</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-services-aggregation/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.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
@@ -14,4 +34,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/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/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.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.
+ */
+
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/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">
@@ -21,4 +41,4 @@
</excludes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/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/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.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.
+ */
+
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/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>
@@ -16,4 +36,4 @@
<module>child1</module>
<module>child2</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/container-descriptors/metaInf-spring-aggregation/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.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.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.
+-->
+
<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/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/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">
@@ -19,4 +39,4 @@
</includes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/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/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.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.
+ */
+
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/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 dir = new File( basedir, "target/dep-transfilter-wildcard-massembly544-1-bin/maven-libs" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.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.
+-->
+
<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/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/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">
@@ -19,4 +39,4 @@
</includes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/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/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.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.
+ */
+
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/dep-with-transitive-filter/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 wagonJackrabbitJar = new File( basedir, "target/project-1-bin/maven-libs/wagon-webdav-jackrabbit-1.0-beta-4.jar" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,46 +1,66 @@
-<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>
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml Thu Oct 23 21:01:23 2014
@@ -1,19 +1,39 @@
-<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>
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,35 +1,55 @@
-<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>
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depMgmt-override/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, "child/target/child-1.0-bundle/maven-plugin-api-2.2.1.jar" );
@@ -15,4 +34,4 @@ if ( f2.exists() )
return false;
}
-return true;
\ No newline at end of file
+return true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
@@ -11,4 +31,4 @@
<properties>
<foo>bar</foo>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/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.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">
@@ -14,4 +34,4 @@
<outputDirectory>${artifact.properties.foo}</outputDirectory>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/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>
@@ -16,4 +36,4 @@
<module>child1</module>
<module>child2</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,4 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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();
\ No newline at end of file
+return f.exists() && f.isFile();
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/dependency-sets/depSet-byDepVersion/child1/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!
*