[gatein-commits] gatein SVN: r966 - in portal/trunk: component/pc and 7 other directories.

Author: julien_viet Date: 2009-12-07 17:46:25 -0500 (Mon, 07 Dec 2009) New Revision: 966 Modified: portal/trunk/component/pc/pom.xml portal/trunk/component/resources/pom.xml portal/trunk/component/scripting/pom.xml portal/trunk/component/test/core/pom.xml portal/trunk/component/wsrp/pom.xml portal/trunk/component/xml-parser/pom.xml portal/trunk/packaging/pkg/pom.xml portal/trunk/pom.xml portal/trunk/webui/portal/pom.xml Log: - exclude slf4j binding for log4j coming from the kernel as we want to use our binding - define the dependency management for the kernel module for the whole build Modified: portal/trunk/component/pc/pom.xml =================================================================== --- portal/trunk/component/pc/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/component/pc/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -101,7 +101,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> </dependencies> Modified: portal/trunk/component/resources/pom.xml =================================================================== --- portal/trunk/component/resources/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/component/resources/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -36,19 +36,16 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> Modified: portal/trunk/component/scripting/pom.xml =================================================================== --- portal/trunk/component/scripting/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/component/scripting/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -35,7 +35,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> Modified: portal/trunk/component/test/core/pom.xml =================================================================== --- portal/trunk/component/test/core/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/component/test/core/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -47,28 +47,19 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.6</version> - </dependency> - - <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> <version>1.2.2</version> Modified: portal/trunk/component/wsrp/pom.xml =================================================================== --- portal/trunk/component/wsrp/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/component/wsrp/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -81,7 +81,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> <scope>provided</scope> </dependency> <dependency> Modified: portal/trunk/component/xml-parser/pom.xml =================================================================== --- portal/trunk/component/xml-parser/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/component/xml-parser/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -39,7 +39,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> Modified: portal/trunk/packaging/pkg/pom.xml =================================================================== --- portal/trunk/packaging/pkg/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/packaging/pkg/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -43,7 +43,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel.packaging.module</artifactId> - <version>${org.exoplatform.kernel.version}</version> <type>js</type> </dependency> <dependency> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -86,6 +86,46 @@ <module>packaging</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.slf4j</groupId> Modified: portal/trunk/webui/portal/pom.xml =================================================================== --- portal/trunk/webui/portal/pom.xml 2009-12-07 20:28:02 UTC (rev 965) +++ portal/trunk/webui/portal/pom.xml 2009-12-07 22:46:25 UTC (rev 966) @@ -35,13 +35,11 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency>