Author: dkuleshov Date: 2010-11-11 09:31:11 -0500 (Thu, 11 Nov 2010) New Revision: 3450 Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml Log: JCR-1495: some changes to tomcat and jetty pom.xml's to correct dependencies for slf4j-log4j Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-11-11 14:09:35 UTC (rev 3449) +++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-11-11 14:31:11 UTC (rev 3450) @@ -37,6 +37,17 @@ <enforcer.skip>true</enforcer.skip> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>hsqldb</groupId> @@ -46,7 +57,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <scope>runtime</scope> </dependency> </dependencies> Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-11-11 14:09:35 UTC (rev 3449) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-11-11 14:31:11 UTC (rev 3450) @@ -33,19 +33,33 @@ <url>http://www.exoplatform.org</url> <description>eXo JCR Tomcat Applications Server</description> + + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + <type>jar</type> + <scope>runtime</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>runtime</scope> - </dependency> </dependencies> - + <properties> <enforcer.skip>true</enforcer.skip> </properties>