Author: mwringe Date: 2012-02-24 15:33:42 -0500 (Fri, 24 Feb 2012) New Revision: 8459 Modified: components/wci/trunk/jboss/jboss6/pom.xml components/wci/trunk/test/core/pom.xml components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java components/wci/trunk/test/portlets/exo-portlet/pom.xml components/wci/trunk/test/portlets/gatein-portlet/pom.xml components/wci/trunk/test/portlets/native-portlet/pom.xml components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml components/wci/trunk/test/servers/jboss42/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jboss6/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat7/pom.xml components/wci/trunk/tomcat/tomcat6/pom.xml components/wci/trunk/tomcat/tomcat7/pom.xml Log: Minor build issue fixes. Removed unneeded project versions (inherit from parent), update some dependency issues which cause wci to fail when building with a clean maven repo (maven build reproducibility needs some improvements...) Modified: components/wci/trunk/jboss/jboss6/pom.xml =================================================================== --- components/wci/trunk/jboss/jboss6/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/jboss/jboss6/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss6</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI JBoss 6 compatibility component</name> Modified: components/wci/trunk/test/core/pom.xml =================================================================== --- components/wci/trunk/test/core/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/core/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -52,6 +52,10 @@ <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java =================================================================== --- components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java 2012-02-24 20:33:42 UTC (rev 8459) @@ -73,7 +73,6 @@ public DriverResponse service(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException, IOException { - System.out.println("SERVICE GETREQUESTCOUNT : " + getRequestCount()); if (getRequestCount() == 2) { // Check that this web app is here @@ -132,7 +131,6 @@ @Override public DriverResponse invoke(TestServlet testServlet, DriverCommand driverCommand) { - System.out.println("INVOKE GETREQUESTCOUNT : " + getRequestCount()); if (getRequestCount() == -1) { container = DefaultServletContainerFactory.getInstance().getServletContainer(); Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-exo-portlet</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-gatein-portlet</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Gatein Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-portlet</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-skipped-portlet</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Skip Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Skip Test Portlet With GateInServlet Registration</name> </project> Modified: components/wci/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/servers/jboss42/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.1-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss42</artifactId> @@ -38,6 +38,18 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <scope>test</scope> <type>war</type> @@ -99,6 +111,10 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -349,6 +365,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" /> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> <!-- location of common.xml shared between the different server's build.xml --> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -105,6 +105,10 @@ <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> Modified: components/wci/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/servers/jboss6/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -128,6 +128,10 @@ <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -117,6 +117,10 @@ <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -117,6 +117,10 @@ <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> Modified: components/wci/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/test/servers/tomcat7/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -119,6 +119,10 @@ <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + </exclusion> </exclusions> </dependency> <dependency> Modified: components/wci/trunk/tomcat/tomcat6/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat6/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/tomcat/tomcat6/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat6</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 6 compatibility component</name> Modified: components/wci/trunk/tomcat/tomcat7/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat7/pom.xml 2012-02-24 16:08:19 UTC (rev 8458) +++ components/wci/trunk/tomcat/tomcat7/pom.xml 2012-02-24 20:33:42 UTC (rev 8459) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat7</artifactId> - <version>2.1.1-Beta04-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 7 compatibility component</name>