Mercurial > hg > release > thermostat-1.0
changeset 1322:a5241b7a3e64
Merge
author | Elliott Baron <ebaron@redhat.com> |
---|---|
date | Thu, 14 Nov 2013 11:50:48 -0500 |
parents | 33064daddba9 (current diff) 91c6d3747b46 (diff) |
children | 2dea7ac8e42c |
files | distribution/pom.xml |
diffstat | 3 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/pom.xml Thu Nov 14 11:33:46 2013 -0500 +++ b/distribution/pom.xml Thu Nov 14 11:50:48 2013 -0500 @@ -46,7 +46,11 @@ </parent> <artifactId>thermostat-distribution</artifactId> - <packaging>jar</packaging> + <!-- Define packaging type "pom" since this works around an issue + with more than one attached artifacts which seems to confuse + maven. Note that maven-assembly-plugin may confuse maven + itself by replacing the jar artifact with a zip. --> + <packaging>pom</packaging> <name>Thermostat Distribution</name> @@ -57,25 +61,13 @@ <build> <plugins> - <!-- skip unit test run, tests to be executed during integration-test --> + <!-- skip unit test run--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> </configuration> - <executions> - <execution> - <id>run-integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId>
--- a/integration-tests/itest-run/pom.xml Thu Nov 14 11:33:46 2013 -0500 +++ b/integration-tests/itest-run/pom.xml Thu Nov 14 11:50:48 2013 -0500 @@ -189,6 +189,8 @@ <artifactId>thermostat-distribution</artifactId> <version>${project.version}</version> <scope>test</scope> + <!-- thermostat-distribution has packaging type pom --> + <type>pom</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId>
--- a/web/war/pom.xml Thu Nov 14 11:33:46 2013 -0500 +++ b/web/war/pom.xml Thu Nov 14 11:50:48 2013 -0500 @@ -54,6 +54,8 @@ <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-distribution</artifactId> + <!-- distribution is packaged as pom --> + <type>pom</type> <version>${project.version}</version> <!-- exclude conflicting jars. Those cause problems for servlet containers and hence prevent the web archive to deploy