Author: jdcasey
Date: Fri Sep 7 19:56:40 2007
New Revision: 573775
URL: http://svn.apache.org/viewvc?rev=573775&view=rev
Log:
[MASSEMBLY-233] Fixing by splitting the IT builds to separate the handle-def
build from the assembly build using two executions of the invoker plugin fired
from the IT parent pom.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=573775&r1=573774&r2=573775&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Sep 7 19:56:40 2007
@@ -319,22 +319,20 @@
</goals>
<configuration>
<projectsDirectory>${project.build.testOutputDirectory}/projects</projectsDirectory>
- <!--
<debug>true</debug>
- -->
<!-- Useful config for debugging one IT -->
+ <!--
<pomIncludes>
-
<pomInclude>dependency-sets/dependencySet-unpacked/pom.xml</pomInclude>
+
<pomInclude>**/container-descriptors/**/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
+ -->
<!-- END single-IT debugging block. -->
- <!--
<pomIncludes>
<pomInclude>**/pom.xml</pomInclude>
</pomIncludes>
- -->
<pomExcludes>
<pomExclude>repositories/repo-with-snapshot-parents/pom.xml</pomExclude>
@@ -345,8 +343,9 @@
<pomExclude>**/assembly/pom.xml</pomExclude>
<!-- MASSEMBLY-233 -->
+<!--
<pomExclude>**/container-descriptors/**</pomExclude>
-
+ -->
</pomExcludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>custom-containerDescriptorHandler</artifactId>
- <version>1</version>
- </parent>
+ <groupId>org.test</groupId>
<artifactId>assembly</artifactId>
+ <version>1</version>
<build>
<plugins>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>custom-containerDescriptorHandler</artifactId>
- <version>1</version>
- </parent>
+ <groupId>org.test</groupId>
+ <version>1</version>
<artifactId>handler-def</artifactId>
<dependencies>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -13,8 +13,62 @@
<version>1</version>
<name>custom-containerDescriptorHandler</name>
- <modules>
- <module>handler-def</module>
- <module>assembly</module>
- </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-component-it-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <executions>
+ <execution>
+ <id>inject-localrepo-path</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>inject-local-repository-path</goal>
+ </goals>
+ <configuration>
+ <property>local.repo.path</property>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.0</version>
+
+ <configuration>
+ <suppressSummaries>true</suppressSummaries>
+ <localRepositoryPath>${local.repo.path}</localRepositoryPath>
+ <streamLogs>true</streamLogs>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>handler-build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>handler-def/pom.xml</pom>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assembly-build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <debug>true</debug>
+ <pom>assembly/pom.xml</pom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>custom-handler-withFileEntries</artifactId>
- <version>1</version>
- </parent>
+ <groupId>org.test</groupId>
+ <version>1</version>
<artifactId>assembly</artifactId>
<build>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>custom-handler-withFileEntries</artifactId>
- <version>1</version>
- </parent>
+ <groupId>org.test</groupId>
+ <version>1</version>
<artifactId>handler-def</artifactId>
<dependencies>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -13,8 +13,62 @@
<version>1</version>
<name>custom-handler-withFileEntries</name>
- <modules>
- <module>handler-def</module>
- <module>assembly</module>
- </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-component-it-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <executions>
+ <execution>
+ <id>inject-localrepo-path</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>inject-local-repository-path</goal>
+ </goals>
+ <configuration>
+ <property>local.repo.path</property>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.0</version>
+
+ <configuration>
+ <suppressSummaries>true</suppressSummaries>
+ <localRepositoryPath>${local.repo.path}</localRepositoryPath>
+ <streamLogs>true</streamLogs>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>handler-build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>handler-def/pom.xml</pom>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assembly-build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <debug>true</debug>
+ <pom>assembly/pom.xml</pom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>custom-handler-withMixedEntries</artifactId>
- <version>1</version>
- </parent>
+ <groupId>org.test</groupId>
+ <version>1</version>
<artifactId>assembly</artifactId>
<build>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.test</groupId>
- <artifactId>custom-handler-withMixedEntries</artifactId>
- <version>1</version>
- </parent>
+ <groupId>org.test</groupId>
+ <version>1</version>
<artifactId>handler-def</artifactId>
<dependencies>
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=573775&r1=573774&r2=573775&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
Fri Sep 7 19:56:40 2007
@@ -13,8 +13,62 @@
<version>1</version>
<name>custom-handler-withMixedEntries</name>
- <modules>
- <module>handler-def</module>
- <module>assembly</module>
- </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-component-it-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <executions>
+ <execution>
+ <id>inject-localrepo-path</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>inject-local-repository-path</goal>
+ </goals>
+ <configuration>
+ <property>local.repo.path</property>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.0</version>
+
+ <configuration>
+ <suppressSummaries>true</suppressSummaries>
+ <localRepositoryPath>${local.repo.path}</localRepositoryPath>
+ <streamLogs>true</streamLogs>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>handler-build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>handler-def/pom.xml</pom>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assembly-build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <debug>true</debug>
+ <pom>assembly/pom.xml</pom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=573775&r1=573774&r2=573775&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
Fri Sep 7 19:56:40 2007
@@ -152,6 +152,11 @@
String hint = config.getHandlerName();
ContainerDescriptorHandler handler =
(ContainerDescriptorHandler) containerDescriptorHandlers.get( hint );
+ if ( handler == null )
+ {
+ throw new InvalidAssemblerConfigurationException( "Cannot
find ContainerDescriptorHandler with hint: " + hint );
+ }
+
System.out.println( "Found container descriptor handler with
hint: " + hint + " (component: " + handler + ")" );
handlers.add( handler );
