[infinispan-commits] Infinispan SVN: r1835 - trunk/server/rest.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-05-25 05:17:52 -0400 (Tue, 25 May 2010)
New Revision: 1835

Modified:
   trunk/server/rest/pom.xml
Log:
[ISPN-451] (Deploying infinispan-rest-server.war in Tomcat 6.0.26 fails) Removed exclusion and removed test dependency on slf4j. RESTEasy already brings in.
[ISPN-452] (Deploying infinispan-rest-server.war in AS trunk fails) Upgraded to RESTEasy 2.0-beta-2 to get around issue.

Modified: trunk/server/rest/pom.xml
===================================================================
--- trunk/server/rest/pom.xml	2010-05-24 15:21:38 UTC (rev 1834)
+++ trunk/server/rest/pom.xml	2010-05-25 09:17:52 UTC (rev 1835)
@@ -56,7 +56,7 @@
    </build>
 
    <properties>
-      <version.resteasy>1.2.1.GA</version.resteasy>
+      <version.resteasy>2.0-beta-2</version.resteasy>
       <version.jackson>1.4.1</version.jackson>
       <version.xtream>1.3.1</version.xtream>
       <version.javax.servlet>2.5</version.javax.servlet>
@@ -70,12 +70,6 @@
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
          <version>${version.resteasy}</version>
-         <exclusions>
-            <exclusion>
-               <groupId>org.slf4j</groupId>
-               <artifactId>slf4j-simple</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
 
       <dependency>
@@ -114,18 +108,6 @@
 
       <dependency>
          <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-simple</artifactId>
-         <version>${version.slf4j}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <version>${version.slf4j}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
          <artifactId>slf4j-log4j12</artifactId>
          <version>${version.slf4j}</version>
          <scope>test</scope>