Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml Sat Jul 18 18:59:37 2015 @@ -1,23 +1,24 @@ -<?xml version="1.0"?><project> +<?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 + <!-- + 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 + 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. ---> + 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>assembly-attached-with-module-binaries</artifactId> @@ -30,6 +31,7 @@ under the License. <name>Maven Quick Start Archetype</name> <version>1.0-SNAPSHOT</version> <url>http://maven.apache.org</url> + <dependencies> <dependency> <groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml Sat Jul 18 18:59:37 2015 @@ -1,23 +1,24 @@ -<?xml version="1.0"?><project> +<?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. ---> + <!-- + 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>assembly-attached-with-module-binaries</artifactId> @@ -30,6 +31,29 @@ under the License. <name>Maven Quick Start Archetype</name> <version>1.0-SNAPSHOT</version> <url>http://maven.apache.org</url> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + + <configuration> + <descriptors> + <descriptor>src/assemble/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>junit</groupId> Copied: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/bin.xml (from r1691728, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/bin.xml Sat Jul 18 18:59:37 2015 @@ -28,6 +28,7 @@ under the License. <includeBaseDirectory>true</includeBaseDirectory> <moduleSets> <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> <binaries> <outputDirectory>modules</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties Sat Jul 18 18:59:37 2015 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.goals=install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached +invoker.goals=install Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml Sat Jul 18 18:59:37 2015 @@ -38,17 +38,4 @@ under the License. <module>child1</module> <module>child2</module> </modules> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh Sat Jul 18 18:59:37 2015 @@ -25,7 +25,7 @@ boolean result = true; try { - File zipFile = new File( basedir, "target/assembly-attached-with-module-binaries-1.0-bin.zip" ); + File zipFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.zip" ); if ( !zipFile.exists() || zipFile.isDirectory() ) { @@ -35,13 +35,13 @@ try ZipFile zf = new ZipFile( zipFile ); - if ( zf.getEntry( "assembly-attached-with-module-binaries-1.0/modules/child1.jar" ) == null ) + if ( zf.getEntry( "child2-1.0-SNAPSHOT/modules/child1.jar" ) == null ) { System.err.println( "child1 entry is missing." ); result = false; } - if ( zf.getEntry( "assembly-attached-with-module-binaries-1.0/modules/child2.jar" ) == null ) + if ( zf.getEntry( "child2-1.0-SNAPSHOT/modules/child2.jar" ) == null ) { System.err.println( "child2 entry is missing." ); result = false; Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/pom.xml?rev=1691766&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/pom.xml Sat Jul 18 18:59:37 2015 @@ -0,0 +1,69 @@ +<?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> + <artifactId>massembly-298</artifactId> + <groupId>org.test</groupId> + <version>1</version> + </parent> + <artifactId>assembly</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.test</groupId> + <artifactId>child1</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.test</groupId> + <artifactId>child2</artifactId> + <version>1.0</version> + </dependency> + </dependencies> +</project> Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/bin.xml?rev=1691766&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/bin.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/bin.xml Sat Jul 18 18:59:37 2015 @@ -0,0 +1,66 @@ +<?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";> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <moduleSets> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.test:child1</include> + </includes> + <binaries> + <outputDirectory>${artifact.artifactId}</outputDirectory> + <includeDependencies>false</includeDependencies> + <unpack>true</unpack> + <unpackOptions> + <includes> + <include>org/test/child1/App2*</include> + </includes> + </unpackOptions> + </binaries> + </moduleSet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.test:child2</include> + </includes> + <binaries> + <outputDirectory>${artifact.artifactId}</outputDirectory> + <includeDependencies>false</includeDependencies> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>org/test/other/*</exclude> + </excludes> + </unpackOptions> + </binaries> + </moduleSet> + </moduleSets> +</assembly> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml Sat Jul 18 18:59:37 2015 @@ -1,23 +1,24 @@ -<?xml version="1.0"?><project> +<?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 + <!-- + 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 + 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. ---> + 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>massembly-298</artifactId> @@ -25,7 +26,7 @@ under the License. <version>1</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>child1</artifactId> + <artifactId>child1</artifactId> <name>Child 1</name> <version>1.0</version> <url>http://maven.apache.org</url> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml Sat Jul 18 18:59:37 2015 @@ -1,23 +1,24 @@ -<?xml version="1.0"?><project> +<?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 + <!-- + 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 + 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. ---> + 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>massembly-298</artifactId> @@ -25,7 +26,7 @@ under the License. <version>1</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>child2</artifactId> + <artifactId>child2</artifactId> <name>Child 2</name> <version>1.0</version> <url>http://maven.apache.org</url> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties Sat Jul 18 18:59:37 2015 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.goals=install org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly +invoker.goals=install Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/pom.xml Sat Jul 18 18:59:37 2015 @@ -37,19 +37,7 @@ under the License. <modules> <module>child1</module> <module>child2</module> + <module>assembly</module> </modules> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/verify.bsh Sat Jul 18 18:59:37 2015 @@ -20,7 +20,7 @@ import java.io.*; import java.util.zip.*; -ZipFile zf = new ZipFile( new File( basedir, "target/massembly-298-1-bin.zip" ) ); +ZipFile zf = new ZipFile( new File( basedir, "assembly/target/assembly-1-bin.zip" ) ); ZipEntry child1InclEntry = zf.getEntry( "child1/org/test/child1/App2.class" ); Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-317/pom.xml Sat Jul 18 18:59:37 2015 @@ -59,7 +59,7 @@ under the License. <id>make-assembly</id> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/pom.xml?rev=1691766&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/pom.xml Sat Jul 18 18:59:37 2015 @@ -0,0 +1,74 @@ +<?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> + <artifactId>parent</artifactId> + <groupId>org.test</groupId> + <version>1.0</version> + </parent> + <artifactId>assembly</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.test</groupId> + <artifactId>child1</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.test</groupId> + <artifactId>child2</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.test</groupId> + <artifactId>child3</artifactId> + <version>1.0</version> + </dependency> + </dependencies> +</project> Copied: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/bin.xml (from r1691728, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/bin.xml Sat Jul 18 18:59:37 2015 @@ -29,6 +29,7 @@ under the License. <includeBaseDirectory>false</includeBaseDirectory> <moduleSets> <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.test:child1</include> <include>org.test:child3</include> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties Sat Jul 18 18:59:37 2015 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.goals=clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline +invoker.goals=clean package Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/pom.xml Sat Jul 18 18:59:37 2015 @@ -38,20 +38,6 @@ under the License. <module>child1</module> <module>child2</module> <module>child3</module> + <module>assembly</module> </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/verify.bsh Sat Jul 18 18:59:37 2015 @@ -21,9 +21,9 @@ import java.io.*; boolean result = true; -result = result && new File( basedir, "target/parent-1.0-bin/lib/child1.jar" ).exists(); -result = result && new File( basedir, "target/parent-1.0-bin/lib/child3.jar" ).exists(); +result = result && new File( basedir, "assembly/target/assembly-1.0-bin/lib/child1.jar" ).exists(); +result = result && new File( basedir, "assembly/target/assembly-1.0-bin/lib/child3.jar" ).exists(); -result = result && !new File( basedir, "target/parent-1.0-bin/lib/child2.jar" ).exists(); +result = result && !new File( basedir, "assembly/target/assembly-1.0-bin/lib/child2.jar" ).exists(); return result; Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/pom.xml Sat Jul 18 18:59:37 2015 @@ -56,7 +56,7 @@ under the License. <id>package</id> <phase>package</phase> <goals> - <goal>directory-inline</goal> + <goal>single</goal> </goals> </execution> </executions> Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/pom.xml?rev=1691766&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/pom.xml Sat Jul 18 18:59:37 2015 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ /* + ~ * Licensed to the Apache Software Foundation (ASF) under one + ~ * or more contributor license agreements. See the NOTICE file + ~ * distributed with this work for additional information + ~ * regarding copyright ownership. The ASF licenses this file + ~ * to you under the Apache License, Version 2.0 (the + ~ * "License"); you may not use this file except in compliance + ~ * with the License. You may obtain a copy of the License at + ~ * + ~ * http://www.apache.org/licenses/LICENSE-2.0 + ~ * + ~ * Unless required by applicable law or agreed to in writing, + ~ * software distributed under the License is distributed on an + ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ * KIND, either express or implied. See the License for the + ~ * specific language governing permissions and limitations + ~ * under the License. + ~ */ + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>two-level-multimodule</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>assembly</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>child-level1-project1</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <!-- dependency> + <groupId>test</groupId> + <artifactId>child-level2-project1</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency --> + </dependencies> +</project> Copied: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/bin.xml (from r1691728, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/bin.xml Sat Jul 18 18:59:37 2015 @@ -29,7 +29,7 @@ under the License. <includeBaseDirectory>false</includeBaseDirectory> <moduleSets> <moduleSet> - <includeSubModules>false</includeSubModules> + <useAllReactorProjects>true</useAllReactorProjects> <binaries> <outputDirectory>modules</outputDirectory> <unpack>false</unpack> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml Sat Jul 18 18:59:37 2015 @@ -1,23 +1,24 @@ -<?xml version="1.0"?><project> +<?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 + <!-- + 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 + 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. ---> + 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>child-level1-project2</artifactId> @@ -25,7 +26,7 @@ under the License. <version>1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>child-level2-project1</artifactId> + <artifactId>child-level2-project1</artifactId> <version>1.0-SNAPSHOT</version> <dependencies> <dependency> @@ -35,4 +36,17 @@ under the License. <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../../src/assemble/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml Sat Jul 18 18:59:37 2015 @@ -34,4 +34,5 @@ under the License. <modules> <module>child-level2-project1</module> </modules> + </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties Sat Jul 18 18:59:37 2015 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.goals=package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory +invoker.goals=package Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml Sat Jul 18 18:59:37 2015 @@ -36,18 +36,7 @@ under the License. <modules> <module>child-level1-project1</module> <module>child-level1-project2</module> + <module>assembly</module> </modules> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh Sat Jul 18 18:59:37 2015 @@ -25,8 +25,8 @@ boolean result = true; try { - result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists(); - result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists(); + result = new File( basedir, "assembly/target/assembly-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists(); + result = result && new File( basedir, "assembly/target/assembly-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists(); } catch( IOException e ) { Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/pom.xml?rev=1691766&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/pom.xml Sat Jul 18 18:59:37 2015 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ /* + ~ * Licensed to the Apache Software Foundation (ASF) under one + ~ * or more contributor license agreements. See the NOTICE file + ~ * distributed with this work for additional information + ~ * regarding copyright ownership. The ASF licenses this file + ~ * to you under the Apache License, Version 2.0 (the + ~ * "License"); you may not use this file except in compliance + ~ * with the License. You may obtain a copy of the License at + ~ * + ~ * http://www.apache.org/licenses/LICENSE-2.0 + ~ * + ~ * Unless required by applicable law or agreed to in writing, + ~ * software distributed under the License is distributed on an + ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ * KIND, either express or implied. See the License for the + ~ * specific language governing permissions and limitations + ~ * under the License. + ~ */ + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>two-levels-includeBaseDir-withBin</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>assembly</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>child-level1-project1</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>child-level1-project2</artifactId> + <version>1.0-SNAPSHOT</version> + <type>pom</type> + </dependency> + </dependencies> +</project> Copied: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/assembly/bin.xml (from r1691728, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/assembly/bin.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/assembly/bin.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml&r1=1691728&r2=1691766&rev=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/src/assemble/bin.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/assembly/src/main/assembly/bin.xml Sat Jul 18 18:59:37 2015 @@ -29,6 +29,7 @@ under the License. <includeBaseDirectory>true</includeBaseDirectory> <moduleSets> <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> <binaries> <outputDirectory>modules</outputDirectory> <unpack>false</unpack> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml Sat Jul 18 18:59:37 2015 @@ -35,4 +35,17 @@ under the License. <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../src/assemble/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml Sat Jul 18 18:59:37 2015 @@ -35,4 +35,17 @@ under the License. <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../../src/assemble/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties Sat Jul 18 18:59:37 2015 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.goals=clean package org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline +invoker.goals=clean package Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml Sat Jul 18 18:59:37 2015 @@ -36,18 +36,7 @@ under the License. <modules> <module>child-level1-project1</module> <module>child-level1-project2</module> + <module>assembly</module> </modules> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh Sat Jul 18 18:59:37 2015 @@ -21,8 +21,8 @@ import java.io.*; boolean result = true; -String finalName = "two-levels-includeBaseDir-withBin-1.0-SNAPSHOT"; -String rootDir = "target/" + finalName + "-bin/" + finalName + "/modules/"; +String finalName = "assembly/target/assembly-1.0-SNAPSHOT-bin/assembly-1.0-SNAPSHOT"; +String rootDir = finalName + "/modules/"; result = result && new File( basedir, rootDir + "child-level1-project1-1.0-SNAPSHOT.jar" ).exists(); Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/pom.xml?rev=1691766&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/pom.xml Sat Jul 18 18:59:37 2015 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ /* + ~ * Licensed to the Apache Software Foundation (ASF) under one + ~ * or more contributor license agreements. See the NOTICE file + ~ * distributed with this work for additional information + ~ * regarding copyright ownership. The ASF licenses this file + ~ * to you under the Apache License, Version 2.0 (the + ~ * "License"); you may not use this file except in compliance + ~ * with the License. You may obtain a copy of the License at + ~ * + ~ * http://www.apache.org/licenses/LICENSE-2.0 + ~ * + ~ * Unless required by applicable law or agreed to in writing, + ~ * software distributed under the License is distributed on an + ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ * KIND, either express or implied. See the License for the + ~ * specific language governing permissions and limitations + ~ * under the License. + ~ */ + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>two-levels-includeBaseDir-withSrc</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>assembly</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>child-level1-project1</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>child-level1-project2</artifactId> + <version>1.0-SNAPSHOT</version> + <type>pom</type> + </dependency> + </dependencies> +</project> Copied: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml (from r1691728, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml&r1=1691728&r2=1691766&rev=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml Sat Jul 18 18:59:37 2015 @@ -18,6 +18,7 @@ specific language governing permissions 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";> @@ -25,17 +26,22 @@ under the License. <formats> <format>dir</format> </formats> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <moduleSets> <moduleSet> - <includeSubModules>false</includeSubModules> + <useAllReactorProjects>true</useAllReactorProjects> + <includeSubModules>true</includeSubModules> + <sources> - <excludeSubModuleDirectories>false</excludeSubModuleDirectories> + <excludeSubModuleDirectories>true</excludeSubModuleDirectories> + <includeModuleDirectory>true</includeModuleDirectory> + <outputDirectoryMapping>modules/${module.artifactId}</outputDirectoryMapping> + <fileSets> <fileSet> <excludes> - <exclude>**/.svn</exclude> - <exclude>**/target</exclude> + <exclude>**/target/**</exclude> + <exclude>**/.svn/**</exclude> </excludes> </fileSet> </fileSets> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml Sat Jul 18 18:59:37 2015 @@ -35,4 +35,17 @@ under the License. <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../../src/assemble/src.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties Sat Jul 18 18:59:37 2015 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline +invoker.goals=clean package Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml Sat Jul 18 18:59:37 2015 @@ -36,18 +36,7 @@ under the License. <modules> <module>child-level1-project1</module> <module>child-level1-project2</module> + <module>assembly</module> </modules> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assemble/src.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/src/assemble/src.xml Sat Jul 18 18:59:37 2015 @@ -29,6 +29,7 @@ under the License. <includeBaseDirectory>true</includeBaseDirectory> <moduleSets> <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> <includeSubModules>true</includeSubModules> <sources> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh Sat Jul 18 18:59:37 2015 @@ -23,8 +23,8 @@ import java.util.jar.*; boolean result = true; -String finalName = "two-levels-includeBaseDir-withSrc-1.0-SNAPSHOT"; -String rootDir = "target/" + finalName + "-src/" + finalName + "/modules/"; +String finalName = "assembly/target/assembly-1.0-SNAPSHOT-src/assembly-1.0-SNAPSHOT"; +String rootDir = finalName + "/modules/"; result = result && new File( basedir, rootDir + "child-level1-project1/pom.xml" ).exists(); Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java?rev=1691766&r1=1691765&r2=1691766&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java Sat Jul 18 18:59:37 2015 @@ -72,7 +72,6 @@ public class ProjectBuildingRequestCreat } public static Object invoke( Object object, String method ) - throws RuntimeException { try { @@ -93,7 +92,6 @@ public class ProjectBuildingRequestCreat } public static Method getMethod( Class<?> objectClazz, String method, Class<?>... params ) - throws RuntimeException { try { @@ -106,7 +104,6 @@ public class ProjectBuildingRequestCreat } public static Object invoke( Method method, Object object, Object... args ) - throws RuntimeException { try {
