7:41 p.m.
Author: lincolnthree
Date: 2010-05-18 13:41:18 -0400 (Tue, 18 May 2010)
New Revision: 12751
Modified:
modules/faces/trunk/pom.xml
modules/international/trunk/pom.xml
modules/servlet/trunk/pom.xml
Log:
Removed SLF4J dependencies and bindings, since WELDX now includes a JBossAS compatible
version of SLF4J
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-05-18 17:37:36 UTC (rev 12750)
+++ modules/faces/trunk/pom.xml 2010-05-18 17:41:18 UTC (rev 12751)
@@ -36,7 +36,6 @@
<weldx.version>1.0.0-SNAPSHOT</weldx.version>
<weld.api.version>1.0-SP1</weld.api.version>
<junit.version>4.8.1</junit.version>
- <slf4j.version>1.5.9.RC1</slf4j.version>
<emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version>
<emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version>
</properties>
@@ -54,25 +53,7 @@
</dependencyManagement>
<dependencies>
- <!--
- The reason slf4j-jdk14 is included at runtime scope is because
- slf4j-api is compile scope and, without the JDK 1.4 bridge, JBoss AS
- will barf. This should be included by weld-extensions to make it easy
- to exclude if necessary.
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
<!-- Environment Dependencies -->
<dependency>
<!-- This is necessary until a new JSF-API is published to central -->
@@ -121,21 +102,28 @@
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency> <groupId>org.jboss.jsfunit</groupId>
- <artifactId>jboss-jsfunit-core</artifactId>
- <version>${jsfunit.version}</version> <scope>test</scope>
- </dependency>
- -->
<dependency>
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-mock</artifactId>
<version>${jsfmock.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>arquillian-glassfish-embedded-30</id>
@@ -252,19 +240,5 @@
</developerConnection>
<url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url>
</scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: modules/international/trunk/pom.xml
===================================================================
--- modules/international/trunk/pom.xml 2010-05-18 17:37:36 UTC (rev 12750)
+++ modules/international/trunk/pom.xml 2010-05-18 17:41:18 UTC (rev 12751)
@@ -31,7 +31,6 @@
<weld.extensions.version>1.0.0.Alpha1</weld.extensions.version>
<weld.api.version>1.0-SP1</weld.api.version>
<junit.version>4.8.1</junit.version>
- <slf4j.version>1.5.9.RC1</slf4j.version>
<joda-time.version>1.6</joda-time.version>
<pretty-time.version>1.0.6</pretty-time.version>
<emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version>
@@ -51,25 +50,7 @@
</dependencyManagement>
<dependencies>
- <!--
- The reason slf4j-jdk14 is included at runtime scope is because
- slf4j-api is compile scope and, without the JDK 1.4 bridge, JBoss AS
- will barf. This should be included by weld-extensions to make it easy
- to exclude if necessary.
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
<!-- Environment Dependencies -->
<dependency>
<groupId>javax.el</groupId>
Modified: modules/servlet/trunk/pom.xml
===================================================================
--- modules/servlet/trunk/pom.xml 2010-05-18 17:37:36 UTC (rev 12750)
+++ modules/servlet/trunk/pom.xml 2010-05-18 17:41:18 UTC (rev 12751)
@@ -54,30 +54,11 @@
<arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
<weld.api.version>1.0-SP1</weld.api.version>
<weldx.version>1.0.0-SNAPSHOT</weldx.version>
- <slf4j.version>1.5.9.RC1</slf4j.version>
</properties>
<dependencies>
- <!--
- The reason slf4j-jdk14 is included at runtime scope is because
- slf4j-api is compile scope and, without the JDK 1.4 bridge, JBoss AS
- will barf. This should be included by weld-extensions to make it easy
- to exclude if necessary.
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
<!-- Implementation Specific, until Spec'd -->
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>