Author: dkuleshov Date: 2010-11-18 08:19:15 -0500 (Thu, 18 Nov 2010) New Revision: 3484 Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml jcr/trunk/applications/product-exo-jcr-as-descriptor.xml Log: EXOJCR-1018: assembly file was modified to correspond dependency scope of slf4j-log4j12 Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-11-18 13:16:05 UTC (rev 3483) +++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-11-18 13:19:15 UTC (rev 3484) @@ -37,17 +37,6 @@ <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> Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-11-18 13:16:05 UTC (rev 3483) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-11-18 13:19:15 UTC (rev 3484) @@ -33,20 +33,6 @@ <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> Modified: jcr/trunk/applications/product-exo-jcr-as-descriptor.xml =================================================================== --- jcr/trunk/applications/product-exo-jcr-as-descriptor.xml 2010-11-18 13:16:05 UTC (rev 3483) +++ jcr/trunk/applications/product-exo-jcr-as-descriptor.xml 2010-11-18 13:19:15 UTC (rev 3484) @@ -139,5 +139,13 @@ <exclude>javax.servlet:servlet-api</exclude> </excludes> </dependencySet> + <dependencySet> + <outputDirectory>/</outputDirectory> + <unpack>false</unpack> + <scope>test</scope> + <includes> + <include>org.slf4j:slf4j-log4j12</include> + </includes> + </dependencySet> </dependencySets> </assembly>