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

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-03-23 14:05:33 -0400 (Tue, 23 Mar 2010)
New Revision: 1616

Modified:
   trunk/server/rest/pom.xml
Log:
Upgrade rest server to use Scala 2.8.0.Beta1 because otherwise at assembly time, rest server's dependency on 2.7.7 "somehow" ends up in the memcached module even though there's no link between the two. Memcached module needs 2.8.0.Beta1.

Modified: trunk/server/rest/pom.xml
===================================================================
--- trunk/server/rest/pom.xml	2010-03-23 18:03:40 UTC (rev 1615)
+++ trunk/server/rest/pom.xml	2010-03-23 18:05:33 UTC (rev 1616)
@@ -62,14 +62,16 @@
       <version.javax.servlet>2.5</version.javax.servlet>
       <version.jetty>6.1.15</version.jetty>
       <version.commons.httpclient>3.1</version.commons.httpclient>
-      <version.slf4j>1.5.8</version.slf4j>      
+      <version.slf4j>1.5.8</version.slf4j>
+      <!-- TODO: Find out why on earth when this is set to 2.7.7, memcached and hotrod modules that depend on 2.8.0.Beta1, receive 2.7.7 library on assembly!!! -->
+      <version.scala>2.8.0.Beta1</version.scala>
    </properties>
 
    <dependencies>
       <dependency>
          <groupId>org.scala-lang</groupId>
          <artifactId>scala-library</artifactId>
-         <version>${scala.version}</version>
+         <version>${version.scala}</version>
       </dependency>
 
       <dependency>