Author: thomas.heute(a)jboss.com Date: 2011-03-14 11:51:37 -0400 (Mon, 14 Mar 2011) New Revision: 6016 Modified: components/wci/trunk/exo/pom.xml components/wci/trunk/jboss/jboss6/pom.xml components/wci/trunk/jetty/pom.xml components/wci/trunk/pom.xml components/wci/trunk/test/core/pom.xml components/wci/trunk/test/pom.xml 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/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/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/tomcat7/pom.xml components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml components/wci/trunk/tomcat/tomcat6/pom.xml components/wci/trunk/tomcat/tomcat7/pom.xml components/wci/trunk/wci/pom.xml Log: GTNWCI-24: Update Maven dependencies Modified: components/wci/trunk/exo/pom.xml =================================================================== --- components/wci/trunk/exo/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/exo/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-exo</artifactId> Modified: components/wci/trunk/jboss/jboss6/pom.xml =================================================================== --- components/wci/trunk/jboss/jboss6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/jboss/jboss6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss6</artifactId> Modified: components/wci/trunk/jetty/pom.xml =================================================================== --- components/wci/trunk/jetty/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/jetty/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jetty</artifactId> Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -6,34 +6,35 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> <packaging>pom</packaging> <parent> <groupId>org.gatein</groupId> <artifactId>gatein-parent</artifactId> - <version>1.0.1-GA</version> + <version>1.1.0-Beta01</version> </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wc... - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... - <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</u... + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wc... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... + <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-B... </scm> <properties> - <version.gatein.common>2.0.3-GA</version.gatein.common> + <version.gatein.common>2.0.4-Beta01</version.gatein.common> <version.junit>3.8.2-brew</version.junit> + <version.jboss.unit>1.2.3</version.jboss.unit> <version.jaxb>2.1</version.jaxb> <version.jetty>6.1.21</version.jetty> <version.jaxen>1.0-FCS</version.jaxen> <version.saxpath>1.0-FCS</version.saxpath> <version.discovery>0.4</version.discovery> <!-- used in test module by maven-antrun-extended-plugin --> - <version.jboss.unit>1.2.3</version.jboss.unit> <version.cargo>1.0.3</version.cargo> <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer> + <version.oswego.concurrent>1.3.4</version.oswego.concurrent> </properties> @@ -43,7 +44,7 @@ <dependency> <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.0.2-GA</version> + <version>1.0.3-Beta01</version> <type>pom</type> <scope>import</scope> </dependency> @@ -141,6 +142,11 @@ <artifactId>commons-discovery</artifactId> <version>${version.discovery}</version> </dependency> + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.oswego.concurrent}</version> + </dependency> </dependencies> </dependencyManagement> @@ -154,23 +160,6 @@ <module>test</module> </modules> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <build> <plugins> @@ -208,8 +197,7 @@ </execution> </executions> </plugin> - - </plugins> + </plugins> </build> </project> Modified: components/wci/trunk/test/core/pom.xml =================================================================== --- components/wci/trunk/test/core/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/core/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-core</artifactId> @@ -33,7 +33,30 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.oswego.concurrent}</version> + </dependency> </dependencies> <build> Modified: components/wci/trunk/test/pom.xml =================================================================== --- components/wci/trunk/test/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-parent</artifactId> Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-exo-portlet</artifactId> Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-gatein-portlet</artifactId> Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-portlet</artifactId> Modified: components/wci/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/jboss42/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -156,7 +156,7 @@ </dependency> <!-- OTHER DEPENDENCIES --> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> @@ -329,7 +329,7 @@ <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> - <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" /> + <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" /> <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -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.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss51</artifactId> @@ -89,6 +89,10 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +114,22 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +141,14 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> @@ -146,7 +174,7 @@ </dependency> <!-- OTHER DEPENDENCIES --> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> Modified: components/wci/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -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.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss6</artifactId> @@ -94,6 +94,22 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -115,6 +131,26 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -126,6 +162,14 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> @@ -151,7 +195,7 @@ </dependency> <!-- OTHER DEPENDENCIES --> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -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.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jetty6</artifactId> @@ -99,6 +99,10 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -120,6 +124,22 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -131,6 +151,14 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> @@ -156,7 +184,7 @@ </dependency> <!-- OTHER DEPENDENCIES --> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> @@ -301,30 +329,30 @@ <tasks> <!-- properties to pass to the build.xml --> - <property name="project.build.directory" value="${project.build.directory}"/> - <property name="plugin_classpath" refid="maven.plugin.classpath"/> + <property name="project.build.directory" value="${project.build.directory}" /> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="test_classpath" refid="maven.test.classpath" /> <!-- hack here allows for profiles to effect tasks in the build.xml --> <!-- this should be removed when the antrun plugin properly handles properties --> <condition property="test.generic.enable"> - <istrue value="${test.generic}"/> + <istrue value="${test.generic}" /> </condition> <condition property="test.native.enable"> - <istrue value="${test.native}"/> + <istrue value="${test.native}" /> </condition> <condition property="test.exo.enable"> - <istrue value="${test.exo}"/> + <istrue value="${test.exo}" /> </condition> <condition property="test.endpoint.enable"> - <istrue value="${test.endpoint}"/> + <istrue value="${test.endpoint}" /> </condition> <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug"/> + <isset property="test.cargo.debug" /> </condition> <condition property="cargo.debug" value=""> <not> - <isset property="test.cargo.debug"/> + <isset property="test.cargo.debug" /> </not> </condition> <!-- end profiles hack --> @@ -346,21 +374,21 @@ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" /> <!-- locations of archives to use --> - <property name="test.archives.directory" value="${project.build.directory}/test-archives"/> - <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war"/> - <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war"/> - <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war"/> + <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> + <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" /> + <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" /> + <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" /> - <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war"/> - <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war"/> - <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war"/> + <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" /> + <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" /> + <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" /> - <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.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}"/> + <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.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 --> - <property name="common.xml.file" value="${test.common.xml}"/> + <property name="common.xml.file" value="${test.common.xml}" /> <!-- --> <!-- Cargo Jetty deployer --> @@ -368,7 +396,7 @@ <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> - <target name="tests"/> + <target name="tests" /> </ant> </tasks> </configuration> Modified: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-server-parent</artifactId> Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -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.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat6</artifactId> @@ -99,6 +99,10 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -120,6 +124,22 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -131,6 +151,14 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> @@ -156,7 +184,7 @@ </dependency> <!-- OTHER DEPENDENCIES --> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:resolver</include> <include>apache-xerces:xml-apis</include> Modified: components/wci/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -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.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat7</artifactId> @@ -99,6 +99,14 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -120,6 +128,22 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -131,6 +155,14 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> </exclusion> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <!-- JBOSS MICROCONAINER DEPENDENCIES --> @@ -156,7 +188,7 @@ </dependency> <!-- OTHER DEPENDENCIES --> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:xml-apis</include> <include>concurrent:concurrent</include> Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -35,7 +35,7 @@ <include>javax.xml.bind:jaxb-api</include> <include>org.jboss:jbossxb</include> <!-- others --> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>apache-xerces:xercesImpl</include> <include>apache-xerces:resolver</include> <include>apache-xerces:xml-apis</include> Modified: components/wci/trunk/tomcat/tomcat6/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat6</artifactId> Modified: components/wci/trunk/tomcat/tomcat7/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat7</artifactId> Modified: components/wci/trunk/wci/pom.xml =================================================================== --- components/wci/trunk/wci/pom.xml 2011-03-14 05:43:02 UTC (rev 6015) +++ components/wci/trunk/wci/pom.xml 2011-03-14 15:51:37 UTC (rev 6016) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> + <version>2.1.0-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-wci</artifactId>