Author: thomas.heute(a)jboss.com Date: 2011-03-14 16:04:06 -0400 (Mon, 14 Mar 2011) New Revision: 6020 Modified: components/pc/trunk/controller/pom.xml components/pc/trunk/distrib/distrib.xml components/pc/trunk/pom.xml components/pc/trunk/portal/pom.xml components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/test/core/pom.xml components/pc/trunk/test/servers/jboss42/pom.xml components/pc/trunk/test/servers/jboss51/pom.xml components/pc/trunk/test/servers/jboss6/pom.xml components/pc/trunk/test/servers/jetty6/pom.xml components/pc/trunk/test/servers/tomcat6/pom.xml components/pc/trunk/test/servers/tomcat7/pom.xml Log: GTNPC-57: Update Maven dependencies Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/controller/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -23,6 +23,24 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> + <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> Modified: components/pc/trunk/distrib/distrib.xml =================================================================== --- components/pc/trunk/distrib/distrib.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/distrib/distrib.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -2,9 +2,9 @@ <property name="source.dir" value="../"/> <property name="src.docs.dir" value="${source.dir}/docs"/> - <property name="pc.release.version" value="2.1.1-GA"/> - <property name="demo.release.version" value="2.1.1-GA"/> - <property name="maven.version" value="2.1.1-GA"/> + <property name="pc.release.version" value="2.3.0-Beta01"/> + <property name="demo.release.version" value="2.3.0-Beta01"/> + <property name="maven.version" value="2.3.0-Beta01"/> <!-- --> <property name="pc.release.name" value="gatein-portletcontainer-${pc.release.version}"/> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -35,7 +35,7 @@ <parent> <groupId>org.gatein</groupId> <artifactId>gatein-parent</artifactId> - <version>1.0.2-GA</version> + <version>1.1.0-Beta01</version> </parent> <scm> @@ -45,8 +45,8 @@ </scm> <properties> - <version.gatein.common>2.0.3-GA</version.gatein.common> - <version.gatein.wci>2.1.0-Alpha03</version.gatein.wci> + <version.gatein.common>2.0.4-Beta01</version.gatein.common> + <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> <version.apache.taglibs>1.1.2</version.apache.taglibs> <version.apache.log4j>1.2.14</version.apache.log4j> @@ -67,7 +67,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> @@ -125,7 +125,13 @@ <artifactId>pc-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-test-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> @@ -153,12 +159,12 @@ </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>${version.apache.taglibs}</version> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> <version>${version.apache.taglibs}</version> </dependency> @@ -301,43 +307,4 @@ </profile> </profiles> - <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> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshots Repository</name> - <layout>default</layout> - <url>http://snapshots.jboss.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - </project> Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/portal/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -57,7 +57,6 @@ <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> </dependency> - <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> @@ -71,6 +70,16 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-common-logging-jdk</artifactId> + <exclusions> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>jboss</groupId> @@ -97,16 +106,16 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -115,7 +124,6 @@ <artifactId>slf4j-log4j12</artifactId> <version>1.5.6</version> </dependency> - </dependencies> <build> Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -43,12 +43,6 @@ </includes> </dependencySet> - <dependencySet> - <outputDirectory></outputDirectory> - <includes> - <include></include> - </includes> - </dependencySet> </dependencySets> </assembly> Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -43,12 +43,6 @@ </includes> </dependencySet> - <dependencySet> - <outputDirectory></outputDirectory> - <includes> - <include></include> - </includes> - </dependencySet> </dependencySets> </assembly> Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -23,7 +23,7 @@ <include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-log4j12</include> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>javax.ccpp:ccpp</include> <include>javax.activation:activation</include> <include>javax.portlet:portlet-api</include> @@ -33,8 +33,8 @@ <include>apache-xerces:resolver</include> <include>apache-xerces:xml-apis</include> - <include>apache-taglibs:jstl</include> - <include>apache-taglibs:standard</include> + <include>javax.servlet:jstl</include> + <include>taglibs:standard</include> </includes> </dependencySet> Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -23,7 +23,7 @@ <include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-log4j12</include> - <include>apache-log4j:log4j</include> + <include>log4j:log4j</include> <include>javax.ccpp:ccpp</include> <include>javax.activation:activation</include> <include>javax.portlet:portlet-api</include> @@ -33,8 +33,8 @@ <include>apache-xerces:resolver</include> <include>apache-xerces:xml-apis</include> - <include>apache-taglibs:jstl</include> - <include>apache-taglibs:standard</include> + <include>javax.servlet:jstl</include> + <include>taglibs:standard</include> </includes> </dependencySet> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/portlet/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -41,6 +41,24 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> + <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> Modified: components/pc/trunk/test/core/pom.xml =================================================================== --- components/pc/trunk/test/core/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/core/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -45,7 +45,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -67,6 +67,22 @@ <groupId>cargo</groupId> <artifactId>core</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> @@ -76,10 +92,42 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <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> <dependency> Modified: components/pc/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -40,7 +40,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -62,6 +62,10 @@ <groupId>cargo</groupId> <artifactId>core</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -71,10 +75,38 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -141,11 +173,11 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> @@ -378,4 +410,4 @@ <!-- Fix 1.0.3 deployment problems with jboss42 --> <version.cargo>1.0.2</version.cargo> </properties> -</project> \ No newline at end of file +</project> Modified: components/pc/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -61,6 +61,10 @@ <groupId>cargo</groupId> <artifactId>core</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -70,10 +74,38 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -140,11 +172,11 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> @@ -382,4 +414,4 @@ <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> <version.cargo>1.0.2</version.cargo> </properties> -</project> \ No newline at end of file +</project> Modified: components/pc/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss6/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -61,6 +61,10 @@ <groupId>cargo</groupId> <artifactId>core</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -70,10 +74,38 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -140,11 +172,11 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> Modified: components/pc/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -61,6 +61,10 @@ <groupId>cargo</groupId> <artifactId>core</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -70,10 +74,38 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -146,11 +178,11 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> @@ -379,4 +411,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: components/pc/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -61,6 +61,10 @@ <groupId>cargo</groupId> <artifactId>core</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -70,10 +74,38 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -140,11 +172,11 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> @@ -373,4 +405,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: components/pc/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-03-14 20:03:16 UTC (rev 6019) +++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-03-14 20:04:06 UTC (rev 6020) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -61,6 +61,10 @@ <groupId>cargo</groupId> <artifactId>core</artifactId> </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -70,10 +74,39 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>portal-test</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>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -140,11 +173,11 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>apache-taglibs</groupId> + <groupId>taglibs</groupId> <artifactId>standard</artifactId> </dependency> @@ -373,4 +406,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project>