Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C10331128C for ; Sat, 6 Sep 2014 20:12:23 +0000 (UTC) Received: (qmail 33585 invoked by uid 500); 6 Sep 2014 20:12:23 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 33438 invoked by uid 500); 6 Sep 2014 20:12:23 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 33226 invoked by uid 99); 6 Sep 2014 20:12:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Sep 2014 20:12:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Sep 2014 20:12:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 423632388BFF; Sat, 6 Sep 2014 20:11:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1622923 [8/15] - in /maven/plugins/trunk/maven-assembly-plugin: integration-test-archetype/src/main/resources/META-INF/maven/ integration-test-archetype/src/main/resources/archetype-resources/ integration-test-archetype/src/main/resources/... Date: Sat, 06 Sep 2014 20:11:02 -0000 To: commits@maven.apache.org From: khmarbaise@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140906201131.423632388BFF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java Sat Sep 6 20:10:51 2014 @@ -1,5 +1,25 @@ package com.nf.ass; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + test using-moduleSet-implied-depSet Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/java/com/nf/ass/App.java Sat Sep 6 20:10:51 2014 @@ -1,5 +1,25 @@ package com.nf.ass; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + /** * Hello world! * Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java Sat Sep 6 20:10:51 2014 @@ -1,5 +1,25 @@ package com.nf.ass; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh Sat Sep 6 20:10:51 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.zip.*; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + component-descriptors-merged test Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/java/test/AppChild1.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/src/main/resources/META-INF/plexus/components.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + component-descriptors-merged Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/assemble/bin.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + @@ -19,4 +39,4 @@ - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/main/resources/META-INF/plexus/components.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + jar-with-dependencies-unpacked-to-root-dir test Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + jar-with-dependencies-unpacked-to-root-dir Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + @@ -19,4 +39,4 @@ - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + bin @@ -17,4 +37,4 @@ - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + multimodule-sources-copied test @@ -17,4 +37,4 @@ test - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + multimodule-sources-copied test @@ -17,4 +37,4 @@ test - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh Sat Sep 6 20:10:51 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.zip.*; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + multimodule-sources-copied test @@ -16,4 +36,4 @@ test - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + multimodule-sources-copied test @@ -16,4 +36,4 @@ test - \ No newline at end of file + Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh Sat Sep 6 20:10:51 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.zip.*; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ + + + 4.0.0 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java Sat Sep 6 20:10:51 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! *