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 [10/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-ar...
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/setup.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/setup.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 srcSvnDir = new File( basedir, "src/main/assembly/.svn" );
@@ -10,4 +29,4 @@ writer.write( "Test, Test" );
writer.flush();
writer.close();
-return true;
\ No newline at end of file
+return true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/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 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/file-sets/dont-use-default-excludes/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/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/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/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/file-sets/dont-use-default-excludes/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/verify.groovy?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/verify.groovy (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/dont-use-default-excludes/verify.groovy 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.
+ */
+
File assemblyDir = new File( basedir, "target/dont-use-default-excludes-1.0-SNAPSHOT-src/src/main/assembly" );
assert new File( assemblyDir, "src.xml" ).exists();
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/child/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/file-sets/excludes-using-regex/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/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/file-sets/excludes-using-regex/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/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/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.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.
+
Test
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excludes-using-regex/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/file-sets/excluding-svn-dirs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/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/file-sets/excluding-svn-dirs/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/setup.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 srcSvnDir = new File( basedir, "src/main/assembly/.svn" );
@@ -10,4 +29,4 @@ writer.write( "Test, Test" );
writer.flush();
writer.close();
-return true;
\ No newline at end of file
+return true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/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 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/file-sets/excluding-svn-dirs/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/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/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/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/file-sets/excluding-svn-dirs/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy 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.
+ */
+
assert new File( basedir, "src/main/assembly/.svn" ).exists();
File assemblyDir = new File( basedir, "target/excluding-svn-dirs-1.0-SNAPSHOT-src/src/main/assembly" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/child/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/file-sets/filtered-module-sources/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/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/file-sets/filtered-module-sources/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/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 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/file-sets/filtered-module-sources/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-module-sources/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/parent-1-src/child/test.txt" );
@@ -16,4 +35,4 @@ reader.close();
System.out.println( "First line of test.txt: '" + line + "' should equal the project version: '1'." );
-return "1".equals( line.trim() );
\ No newline at end of file
+return "1".equals( line.trim() );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/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/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/child/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 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/file-sets/filtered-multimodule/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/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/file-sets/filtered-multimodule/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/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/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/filtered-multimodule/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-src/test.txt" );
@@ -16,4 +35,4 @@ reader.close();
System.out.println( "First line of test.txt: '" + line + "' should equal the project version: '1'." );
-return "1".equals( line.trim() );
\ No newline at end of file
+return "1".equals( line.trim() );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/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/file-sets/include-base-directory/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/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 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/file-sets/include-base-directory/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/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/file-sets/include-base-directory/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/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/file-sets/include-base-directory/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-base-directory/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/file-sets/include-parent-dir/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/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>include-parent-dir</artifactId>
<groupId>test</groupId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/assemble/parent.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/file-sets/include-parent-dir/child/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/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/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/child/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/file-sets/include-parent-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/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>
@@ -24,4 +44,4 @@
<modules>
<module>child</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/include-parent-dir/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.*;
return new File( basedir, "child/target/child-1.0-SNAPSHOT-parent/child/pom.xml" ).exists();
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,10 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>it-project-parent</artifactId>
<version>1</version>
+ <relativePath>../../../../it-project-parent/pom.xml</relativePath>
</parent>
<artifactId>child</artifactId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/child/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 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/file-sets/multimodule-unix-lineEndings/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,10 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>it-project-parent</artifactId>
<version>1</version>
+ <relativePath>../../../it-project-parent/pom.xml</relativePath>
</parent>
<artifactId>filtered-multimodule-parent</artifactId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/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/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-unix-lineEndings/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-src/test.txt" );
@@ -32,4 +51,4 @@ if ( sb.toString().indexOf( "child\n" )
System.out.println( "test.txt has an extra line ending at the end of the file" );
return false;
}
-return true;
\ No newline at end of file
+return true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/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/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/child/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 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/file-sets/multimodule-win-lineEndings/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,10 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>it-project-parent</artifactId>
<version>1</version>
+ <relativePath>../../../it-project-parent/pom.xml</relativePath>
</parent>
<artifactId>filtered-multimodule-parent</artifactId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/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/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/src/main/java/org/apache/maven/plugin/assembly/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/multimodule-win-lineEndings/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-src/test.txt" );
@@ -32,4 +51,4 @@ if ( sb.toString().indexOf( "child\r\n"
System.out.println( "test.txt has an extra line ending at the end of the file" );
return false;
}
-return true;
\ No newline at end of file
+return true;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/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/file-sets/use-default-excludes/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/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 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/file-sets/use-default-excludes/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/file-sets/use-default-excludes/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!
*