[richfaces-svn-commits] JBoss Rich Faces SVN: r22573 - modules/tests/metamer/trunk/application.
Author: ppitonak(a)redhat.com
Date: 2011-07-29 08:43:45 -0400 (Fri, 29 Jul 2011)
New Revision: 22573
Modified:
modules/tests/metamer/trunk/application/pom.xml
Log:
SLF4J dependency fixed so that it works correctly on JBoss AS 6&7 and Tomcat 6&7
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-07-28 21:48:39 UTC (rev 22572)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-07-29 12:43:45 UTC (rev 22573)
@@ -184,6 +184,8 @@
<manifestEntries>
<SCM-Revision>${buildNumber}</SCM-Revision>
<SCM-Timestamp>${timestamp}</SCM-Timestamp>
+ <!-- define SLF4J dependency in JBoss AS 7 -->
+ <Dependencies>org.slf4j</Dependencies>
</manifestEntries>
</archive>
</configuration>
@@ -319,7 +321,7 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<classifier>jee6</classifier>
-
<packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+
<packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
<executions>
<execution>
@@ -350,7 +352,7 @@
</goals>
<configuration>
<classifier>jee6-bundled-mojarra</classifier>
-
<packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+
<packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
</execution>
</executions>
@@ -374,7 +376,7 @@
</goals>
<configuration>
<classifier>jee6-bundled-myfaces</classifier>
-
<packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+
<packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
</execution>
</executions>