Author: thomas.heute(a)jboss.com Date: 2009-11-24 03:37:03 -0500 (Tue, 24 Nov 2009) New Revision: 777 Modified: components/pc/trunk/bridge/pom.xml components/pc/trunk/controller/pom.xml components/pc/trunk/federation/pom.xml components/pc/trunk/mc/pom.xml components/pc/trunk/pom.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/test/pom.xml components/pc/trunk/test/src/test/build.xml Log: Upgrade to Common 2.0.0-CR02 WCI 2.0.0-CR01 Dep 1.0.0-Beta03 Modified: components/pc/trunk/bridge/pom.xml =================================================================== --- components/pc/trunk/bridge/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/bridge/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -18,6 +18,10 @@ <groupId>org.apache.portals.bridges</groupId> <artifactId>portals-bridges-common</artifactId> </dependency> + <dependency> + <groupId>org.apache.portals.bridges</groupId> + <artifactId>portals-bridges-common</artifactId> + <version>${version.apache.portals.bridges}</version> + </dependency> </dependencies> - </project> Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/controller/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -35,6 +35,12 @@ <!--TEST SCOPE--> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>apache-xerces</groupId> <artifactId>resolver</artifactId> </dependency> Modified: components/pc/trunk/federation/pom.xml =================================================================== --- components/pc/trunk/federation/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/federation/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -15,7 +15,6 @@ <artifactId>pc-portlet</artifactId> </dependency> - <!--TEST SCOPE--> <dependency> <groupId>org.jboss.unit</groupId> @@ -28,6 +27,13 @@ <type>test-jar</type> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> <plugins> Modified: components/pc/trunk/mc/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/mc/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -23,6 +23,13 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -22,9 +22,11 @@ </scm> <properties> - <version.gatein.common>2.0.0-Beta03</version.gatein.common> - <version.gatein.wci>2.0.0-Beta02</version.gatein.wci> - + <version.gatein.common>2.0.0-CR02</version.gatein.common> + <version.gatein.wci>2.0.0-CR01</version.gatein.wci> + <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> + <version.apache.taglibs>1.1.2</version.apache.taglibs> + <!-- used in test module by maven-antrun-extended-plugin --> <version.jboss.unit>1.2.3</version.jboss.unit> <version.cargo>1.0.1-alpha-1</version.cargo> @@ -36,11 +38,11 @@ <dependency> <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.0.0-Beta02</version> + <version>1.0.0-Beta03</version> <type>pom</type> <scope>import</scope> </dependency> - + <!-- Internal dependencies --> <dependency> <groupId>org.gatein.common</groupId> @@ -50,10 +52,16 @@ <dependency> <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <version>${version.gatein.common}</version> + </dependency> + + <dependency> + <groupId>org.gatein.common</groupId> <artifactId>common-mc</artifactId> <version>${version.gatein.common}</version> </dependency> - + <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> @@ -99,6 +107,18 @@ <artifactId>wci-tomcat</artifactId> <version>${version.gatein.wci}</version> </dependency> + + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>jstl</artifactId> + <version>${version.apache.taglibs}</version> + </dependency> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>standard</artifactId> + <version>${version.apache.taglibs}</version> + </dependency> + </dependencies> </dependencyManagement> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/portlet/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -42,6 +42,13 @@ <artifactId>jboss-unit-remote</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + </dependencies> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/test/pom.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -16,7 +16,13 @@ <artifactId>common-mc</artifactId> </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + </dependency> + + <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> @@ -89,7 +95,13 @@ <artifactId>jboss-remoting</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + + <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> <scope>test</scope> @@ -343,6 +355,9 @@ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}" /> + <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> + <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> + <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" /> Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2009-11-24 08:31:03 UTC (rev 776) +++ components/pc/trunk/test/src/test/build.xml 2009-11-24 08:37:03 UTC (rev 777) @@ -69,6 +69,9 @@ <path id="portal-common-shared"> <pathelement path="${dependency.portal-common-common.jar}"/> + <pathelement path="${dependency.portal-common-logging.jar}"/> + <pathelement path="${dependency.slf4j-simple.jar}"/> + <pathelement path="${dependency.slf4j-api.jar}"/> </path> <path id="portal-web">