Author: julien_viet Date: 2009-12-18 06:08:23 -0500 (Fri, 18 Dec 2009) New Revision: 1061 Modified: portal/trunk/component/application-registry/pom.xml portal/trunk/component/pc/pom.xml portal/trunk/component/test/core/pom.xml portal/trunk/component/web/pom.xml portal/trunk/component/wsrp/pom.xml portal/trunk/pom.xml Log: - remove unnecessary maven exclusions that used to filter wci ambiguity - cleanup dependencies of component.web pom Modified: portal/trunk/component/application-registry/pom.xml =================================================================== --- portal/trunk/component/application-registry/pom.xml 2009-12-18 08:14:07 UTC (rev 1060) +++ portal/trunk/component/application-registry/pom.xml 2009-12-18 11:08:23 UTC (rev 1061) @@ -106,12 +106,6 @@ <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> Modified: portal/trunk/component/pc/pom.xml =================================================================== --- portal/trunk/component/pc/pom.xml 2009-12-18 08:14:07 UTC (rev 1060) +++ portal/trunk/component/pc/pom.xml 2009-12-18 11:08:23 UTC (rev 1061) @@ -48,45 +48,21 @@ <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-mc</artifactId> <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-federation</artifactId> <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.pc</groupId> Modified: portal/trunk/component/test/core/pom.xml =================================================================== --- portal/trunk/component/test/core/pom.xml 2009-12-18 08:14:07 UTC (rev 1060) +++ portal/trunk/component/test/core/pom.xml 2009-12-18 11:08:23 UTC (rev 1061) @@ -62,13 +62,6 @@ <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.2.2</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> Modified: portal/trunk/component/web/pom.xml =================================================================== --- portal/trunk/component/web/pom.xml 2009-12-18 08:14:07 UTC (rev 1060) +++ portal/trunk/component/web/pom.xml 2009-12-18 11:08:23 UTC (rev 1061) @@ -67,76 +67,12 @@ </dependency> <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>compile</scope> </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- just to get those deps into the repo --> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-controller</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portal</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- end --> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> Modified: portal/trunk/component/wsrp/pom.xml =================================================================== --- portal/trunk/component/wsrp/pom.xml 2009-12-18 08:14:07 UTC (rev 1060) +++ portal/trunk/component/wsrp/pom.xml 2009-12-18 11:08:23 UTC (rev 1061) @@ -59,24 +59,12 @@ <artifactId>pc-api</artifactId> <version>${org.gatein.pc.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> <version>${org.gatein.pc.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> @@ -95,7 +83,4 @@ <version>${version.chromattic}</version> </dependency> </dependencies> - - <build> - </build> </project> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2009-12-18 08:14:07 UTC (rev 1060) +++ portal/trunk/pom.xml 2009-12-18 11:08:23 UTC (rev 1061) @@ -123,6 +123,17 @@ <artifactId>exo.kernel.container</artifactId> <version>${org.exoplatform.kernel.version}</version> </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.2</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement>