Author: alessio.soldano(a)jboss.com Date: 2011-09-08 03:42:13 -0400 (Thu, 08 Sep 2011) New Revision: 14953 Modified: stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3215] Reverting the changes related to jbossXYZ profiles, as having multiple jbossXYZ.home props defined in settings.xml causes multiple clashing profiles to be on w/ Maven 3 and the proper way of preventing this (http://jira.codehaus.org/browse/MNG-3328) is still not available. Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-08 05:34:08 UTC (rev 14952) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-08 07:42:13 UTC (rev 14953) @@ -575,11 +575,6 @@ --> <profile> <id>jboss600</id> - <activation> - <property> - <name>jboss600.home</name> - </property> - </activation> <properties> <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> @@ -757,11 +752,6 @@ --> <profile> <id>jboss610</id> - <activation> - <property> - <name>jboss610.home</name> - </property> - </activation> <properties> <jboss.version>6.1.0.Final</jboss.version> <jbossws.integration.target>jboss610</jbossws.integration.target> @@ -939,11 +929,6 @@ --> <profile> <id>jboss700</id> - <activation> - <property> - <name>jboss700.home</name> - </property> - </activation> <properties> <jboss.version>7.0.0.Final</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> @@ -1135,11 +1120,6 @@ --> <profile> <id>jboss710</id> - <activation> - <property> - <name>jboss710.home</name> - </property> - </activation> <properties> <jboss.version>7.1.0.Alpha1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss710</jbossws.integration.target> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-09-08 05:34:08 UTC (rev 14952) +++ stack/cxf/trunk/pom.xml 2011-09-08 07:42:13 UTC (rev 14953) @@ -1273,11 +1273,6 @@ --> <profile> <id>jboss600</id> - <activation> - <property> - <name>jboss600.home</name> - </property> - </activation> <properties> <jbossws.integration.target>jboss600</jbossws.integration.target> <jboss.home>${jboss600.home}</jboss.home> @@ -1290,11 +1285,6 @@ --> <profile> <id>jboss610</id> - <activation> - <property> - <name>jboss610.home</name> - </property> - </activation> <properties> <jbossws.integration.target>jboss610</jbossws.integration.target> <jboss.home>${jboss610.home}</jboss.home> @@ -1307,11 +1297,6 @@ --> <profile> <id>jboss700</id> - <activation> - <property> - <name>jboss700.home</name> - </property> - </activation> <properties> <jbossws.integration.target>jboss700</jbossws.integration.target> <jboss.home>${jboss700.home}</jboss.home> @@ -1324,11 +1309,6 @@ --> <profile> <id>jboss710</id> - <activation> - <property> - <name>jboss710.home</name> - </property> - </activation> <properties> <jbossws.integration.target>jboss710</jbossws.integration.target> <jboss.home>${jboss710.home}</jboss.home>