[overlord-commits] Overlord SVN: r995 - bpm-console/trunk/gui/war.

Author: heiko.braun(a)jboss.com Date: 2010-03-09 09:01:15 -0500 (Tue, 09 Mar 2010) New Revision: 995 Modified: bpm-console/trunk/gui/war/pom.xml Log: Fix BPMC-55: remove slf4j from war files Modified: bpm-console/trunk/gui/war/pom.xml =================================================================== --- bpm-console/trunk/gui/war/pom.xml 2010-03-09 12:53:50 UTC (rev 994) +++ bpm-console/trunk/gui/war/pom.xml 2010-03-09 14:01:15 UTC (rev 995) @@ -15,9 +15,10 @@ </parent> <properties> - <gwt-maven.version>2.0-RC1</gwt-maven.version> + <gwt-maven.version>2.0-RC1</gwt-maven.version> <mvel.version>2.0.16</mvel.version> <guice.version>2.0</guice.version> + <slf4j.version>1.5.2</slf4j.version> </properties> <!-- Dependencies --> @@ -27,6 +28,20 @@ <groupId>org.jboss.errai</groupId> <artifactId>errai-bus</artifactId> <version>${errai.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -92,7 +107,7 @@ <dependency> <groupId>org.mvel</groupId> <artifactId>mvel2</artifactId> - <version>${mvel.version}</version> + <version>${mvel.version}</version> </dependency> <dependency> @@ -188,6 +203,31 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + <scope>provided</scope> + </dependency> </dependencies> <!-- Plugins --> @@ -348,22 +388,7 @@ <artifactId>gwt-console-profile-jbpm</artifactId> <version>${version}</version> <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - <version>1.5.10</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - <version>1.5.10</version> - </dependency> - + </dependency> </dependencies> <properties> <console.app.webcontext>jbpm-console</console.app.webcontext>