Mercurial > hg > release > thermostat-1.0

changeset 1315:91c6d3747b46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Package thermostat-distribution as pom. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008723.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Wed, 13 Nov 2013 13:22:22 +0100
parents 0a4e551bef62
children a5241b7a3e64
files distribution/pom.xml integration-tests/itest-run/pom.xml web/war/pom.xml
diffstat 3 files changed, 10 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/pom.xml	Mon Nov 11 11:06:04 2013 +0100
+++ b/distribution/pom.xml	Wed Nov 13 13:22:22 2013 +0100
@@ -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	Mon Nov 11 11:06:04 2013 +0100
+++ b/integration-tests/itest-run/pom.xml	Wed Nov 13 13:22:22 2013 +0100
@@ -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	Mon Nov 11 11:06:04 2013 +0100
+++ b/web/war/pom.xml	Wed Nov 13 13:22:22 2013 +0100
@@ -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