Author: alessio.soldano(a)jboss.com Date: 2012-06-15 13:07:34 -0400 (Fri, 15 Jun 2012) New Revision: 420 Modified: core/trunk/core-cxf/pom.xml core/trunk/core/pom.xml core/trunk/distribution/pom.xml core/trunk/integration-testsuite/common/pom.xml core/trunk/integration-testsuite/cxf/pom.xml core/trunk/integration-testsuite/pom.xml core/trunk/pom.xml Log: [WISE-175][WISE-174] Maven 3 support + initial pruning of jbossws-native related maven project modules Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/core/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.wise</groupId> <artifactId>wise-core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>Wise Core</name> <url>http://www.jboss.org/wise</url> @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.wise</groupId> <artifactId>wise</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/core-cxf/pom.xml =================================================================== --- core/trunk/core-cxf/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/core-cxf/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -17,7 +17,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.wise</groupId> <artifactId>wise-core-cxf</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>Wise Core - CXF</name> <url>http://www.jboss.org/wise</url> @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.wise</groupId> <artifactId>wise</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/distribution/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.wise</groupId> <artifactId>wise-distribution</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>Wise Distribution</name> <url>http://www.jboss.org/wise</url> @@ -11,7 +11,7 @@ <parent> <groupId>org.jboss.wise</groupId> <artifactId>wise</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/integration-testsuite/common/pom.xml =================================================================== --- core/trunk/integration-testsuite/common/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/integration-testsuite/common/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.wise</groupId> <artifactId>wise-integration-testsuite</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/integration-testsuite/cxf/pom.xml =================================================================== --- core/trunk/integration-testsuite/cxf/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/integration-testsuite/cxf/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.wise</groupId> <artifactId>wise-integration-testsuite</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/integration-testsuite/pom.xml =================================================================== --- core/trunk/integration-testsuite/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/integration-testsuite/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.wise</groupId> <artifactId>wise</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -39,11 +39,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <scope>test</scope> @@ -51,7 +46,7 @@ <dependency> <groupId>org.jboss.wise</groupId> <artifactId>wise-core</artifactId> - <version>${version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> @@ -119,32 +114,11 @@ </build> <profiles> - <!-- - Enable submodules depending on the ws stack and add test dependency on the proper client stack artifact - --> <profile> - <id>native</id> - <activation> - <property> - <name>!cxf.stack</name> - </property> - </activation> - <modules> - <module>native</module> - </modules> - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <scope>runtime</scope> <!-- runtime scope to avoid having the dependency while compiling --> - </dependency> - </dependencies> - </profile> - <profile> <id>cxf</id> <activation> <property> - <name>cxf.stack</name> + <name>!no-cxf.stack</name> </property> </activation> <modules> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2012-06-15 16:27:58 UTC (rev 419) +++ core/trunk/pom.xml 2012-06-15 17:07:34 UTC (rev 420) @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.wise</groupId> <artifactId>wise</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>Wise</name> <url>http://www.jboss.org/wise</url> @@ -31,16 +31,16 @@ <developerConnection>scm:svn:https://svn.jboss.org/repos/wise/core/trun... <url>http://fisheye.jboss.org/viewrep/Wise/core/trunk</url> </scm> + + <prerequisites> + <maven>3.0.0</maven> + </prerequisites> <issueManagement> <system>jira</system> <url>https://jira.jboss.org/jira/browse/WISE</url> </issueManagement> - <!-- - <prerequisites> <maven>2.1.0</maven> </prerequisites> - --> - <properties> <surefire.fork.mode>once</surefire.fork.mode> <surefire.format>brief</surefire.format> @@ -84,6 +84,7 @@ <modules> <module>core</module> + <module>core-cxf</module> </modules> <dependencyManagement> @@ -348,9 +349,21 @@ </configuration> </plugin> <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> + <version>2.11</version> <configuration> <includes> <include>**/*Test.java</include> @@ -385,7 +398,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>2.4</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -397,16 +410,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> + <version>1.7</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>2.3.1</version> <configuration> <archive> <manifestEntries> - <Specification-Title>${name}</Specification-Title> + <Specification-Title>${project.name}</Specification-Title> </manifestEntries> </archive> </configuration> @@ -414,24 +427,24 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>2.4.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> + <version>2.2-beta-5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> + <version>2.1.1</version> </plugin> <plugin> @@ -454,11 +467,13 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.4</version> <reportSets> <reportSet> <reports> @@ -477,6 +492,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.12</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -519,36 +535,6 @@ </profile> <!-- - Enable core-native module - --> - <profile> - <id>native</id> - <activation> - <property> - <name>!cxf.stack</name> - </property> - </activation> - <modules> - <module>core-native</module> - </modules> - </profile> - - <!-- - Enable core-cxf module - --> - <profile> - <id>cxf</id> - <activation> - <property> - <name>cxf.stack</name> - </property> - </activation> - <modules> - <module>core-cxf</module> - </modules> - </profile> - - <!-- Enable integration-testsuite module --> <profile>