Author: asoldano Date: 2014-12-11 09:34:45 -0500 (Thu, 11 Dec 2014) New Revision: 19134 Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml stack/cxf/branches/arquillian/pom.xml Log: Automatically enable dist profile, unless the testsuite is disabled Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-09 15:25:49 UTC (rev 19133) +++ stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-11 14:34:45 UTC (rev 19134) @@ -208,13 +208,7 @@ <profile> <id>download</id> <activation> -<!-- <file> - <missing>${jboss.home}/bin/standalone.sh</missing> - </file> <property> - <name>!wildfly900.home</name> - </property> --> - <property> <name>!server.home</name> </property> </activation> @@ -244,6 +238,26 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>dist-test-server</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-test-server.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <properties> @@ -287,43 +301,6 @@ </profile> <!-- - Name: zip-test-server - Descr: Deploy stack on WildFly instance - --> - <profile> - <id>zip-test-server</id> - <activation> - <property> - <name>!no-zip-test-server</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>dist-test-server</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-test-server.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: bindist Descr: Build the binary distribution --> Modified: stack/cxf/branches/arquillian/pom.xml =================================================================== --- stack/cxf/branches/arquillian/pom.xml 2014-12-09 15:25:49 UTC (rev 19133) +++ stack/cxf/branches/arquillian/pom.xml 2014-12-11 14:34:45 UTC (rev 19134) @@ -1369,13 +1369,6 @@ <!-- Profiles --> <profiles> - <profile> - <id>dist</id> - <modules> - <module>modules/dist</module> - </modules> - </profile> - <!-- Name: wildfly800 Descr: WildFly-8.0.0 specific options @@ -1397,25 +1390,10 @@ <id>wildfly810</id> <properties> <jbossws.integration.target>wildfly810</jbossws.integration.target> - <jboss.home>${wildfly810.home}</jboss.home> + <jboss.home>${server.home}</jboss.home> <jboss.version>${wildfly810.version}</jboss.version> </properties> </profile> -<!-- <profile> - <id>wildfly810-download</id> - <activation> - <file> - <missing>${jboss.home}/bin/standalone.sh</missing> - </file> - <property> - <name>jbossws.integration.target</name> - <value>wildfly810</value> - </property> - </activation> - <properties> - <wildfly810.home>${project.build.directory}/wildfly-${jboss.version}</wildfly810.home> - </properties> - </profile> --> <!-- Name: wildfly900 @@ -1425,7 +1403,7 @@ <id>wildfly900</id> <properties> <jbossws.integration.target>wildfly900</jbossws.integration.target> - <jboss.home>${wildfly900.home}</jboss.home> + <jboss.home>${server.home}</jboss.home> <jboss.version>${wildfly900.version}</jboss.version> </properties> </profile> @@ -1465,6 +1443,7 @@ </property> </activation> <modules> + <module>modules/dist</module> <module>modules/testsuite</module> </modules> </profile>