Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/assembly/src.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/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/bugs/massembly-462/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/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/components/component-dependencySet/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/pom.xml Sat Sep 6 20:10:51 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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/bin.xml Sat Sep 6 20:10:51 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>bin</id> <formats> @@ -6,4 +26,4 @@ <componentDescriptors> <componentDescriptor>src/main/assembly/depset.xml</componentDescriptor> </componentDescriptors> -</assembly> \ No newline at end of file +</assembly> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/assembly/depset.xml Sat Sep 6 20:10:51 2014 @@ -1,7 +1,27 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <component> <dependencySets> <dependencySet> <scope>test</scope> </dependencySet> </dependencySets> -</component> \ No newline at end of file +</component> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/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/components/component-dependencySet/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-dependencySet/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/components/component-moduleSet/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0"?><project> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <parent> <artifactId>parent</artifactId> <groupId>test</groupId> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/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/components/component-moduleSet/child1/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/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/components/component-moduleSet/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version='1.0'?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <project> <parent> <artifactId>parent</artifactId> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/bin.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/child2/src/assemble/modset.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <component> <moduleSets> <moduleSet> @@ -16,4 +36,4 @@ </binaries> </moduleSet> </moduleSets> -</component> \ No newline at end of file +</component> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/components/component-moduleSet/pom.xml Sat Sep 6 20:10:51 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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml Sat Sep 6 20:10:51 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>bin</id> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/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/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/a.properties Sat Sep 6 20:10:51 2014 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + testProp=boo Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/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/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus/components.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <component-set> <components> <component> @@ -11,4 +31,4 @@ </configuration> </component> </components> -</component-set> \ No newline at end of file +</component-set> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/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/container-descriptors/custom-handler-withFileEntries/assembly/a.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/a.properties?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/a.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/a.properties Sat Sep 6 20:10:51 2014 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + testProp=boo Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/src/assemble/bin.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/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/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus/components.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <component-set> <components> <component> @@ -11,4 +31,4 @@ </configuration> </component> </components> -</component-set> \ No newline at end of file +</component-set> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/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/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/a.properties Sat Sep 6 20:10:51 2014 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + testProp=boo Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/src/assemble/bin.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/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/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus/components.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <component-set> <components> <component> @@ -11,4 +31,4 @@ </configuration> </component> </components> -</component-set> \ No newline at end of file +</component-set> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml Sat Sep 6 20:10:51 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/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/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/container-descriptors/metaInf-services-aggregation/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0"?><project> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <parent> <artifactId>parent</artifactId> <groupId>test</groupId> @@ -14,4 +34,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/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/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/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/container-descriptors/metaInf-services-aggregation/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version='1.0'?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <project> <parent> <artifactId>parent</artifactId> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/assemble/bin.xml Sat Sep 6 20:10:51 2014 @@ -1,3 +1,23 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> @@ -21,4 +41,4 @@ </excludes> </dependencySet> </dependencySets> -</assembly> \ No newline at end of file +</assembly> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/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/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/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/container-descriptors/metaInf-services-aggregation/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -16,4 +36,4 @@ <module>child1</module> <module>child2</module> </modules> -</project> \ No newline at end of file +</project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-services-aggregation/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.util.jar.*; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml Sat Sep 6 20:10:51 2014 @@ -1,4 +1,24 @@ <?xml version="1.0"?><project> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <parent> <artifactId>parent</artifactId> <groupId>test</groupId> @@ -14,4 +34,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/main/java/test/App.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/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/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java?rev=1622923&r1=1622922&r2=1622923&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/metaInf-spring-aggregation/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;
