[infinispan-commits] Infinispan SVN: r1640 - in trunk/server: core and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-03-30 06:12:04 -0400 (Tue, 30 Mar 2010)
New Revision: 1640

Modified:
   trunk/server/core/pom.xml
   trunk/server/hotrod/pom.xml
   trunk/server/pom.xml
   trunk/server/rest/pom.xml
Log:
Cleanup of server maven pom.xml files.

Modified: trunk/server/core/pom.xml
===================================================================
--- trunk/server/core/pom.xml	2010-03-30 07:19:41 UTC (rev 1639)
+++ trunk/server/core/pom.xml	2010-03-30 10:12:04 UTC (rev 1640)
@@ -18,7 +18,6 @@
       <version.netty>3.2.0.BETA1</version.netty>      
       <version.gnu.getopt>1.0.13</version.gnu.getopt>
       <version.apache.log4j>1.2.15</version.apache.log4j>
-      <version.scala>2.8.0.Beta1</version.scala>
    </properties>
 
    <dependencies>
@@ -40,13 +39,6 @@
          <version>${version.apache.log4j}</version>
          <scope>test</scope>
       </dependency>
-
-      <dependency>
-         <groupId>org.scala-lang</groupId>
-         <artifactId>scala-library</artifactId>
-         <version>${version.scala}</version>
-      </dependency>
-      
    </dependencies>
 
    <build>

Modified: trunk/server/hotrod/pom.xml
===================================================================
--- trunk/server/hotrod/pom.xml	2010-03-30 07:19:41 UTC (rev 1639)
+++ trunk/server/hotrod/pom.xml	2010-03-30 10:12:04 UTC (rev 1640)
@@ -14,22 +14,12 @@
    <name>Infinispan Server Hotrod Module</name>
    <description>Infinispan server hotrod  module</description>
 
-   <properties>
-      <version.scala>2.8.0.Beta1</version.scala>
-   </properties>
-
    <dependencies>
        <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-server-core</artifactId>
          <version>${project.version}</version>
       </dependency>
-
-      <dependency>
-         <groupId>org.scala-lang</groupId>
-         <artifactId>scala-library</artifactId>
-         <version>${version.scala}</version>
-      </dependency>
    </dependencies>
 
    <build>

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2010-03-30 07:19:41 UTC (rev 1639)
+++ trunk/server/pom.xml	2010-03-30 10:12:04 UTC (rev 1640)
@@ -9,10 +9,15 @@
       <version>4.1.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
+   
    <artifactId>infinispan-server-parent</artifactId>
    <name>Parent pom for server modules</name>
    <packaging>pom</packaging>
 
+   <properties>
+      <version.scala>2.8.0.Beta1</version.scala>
+   </properties>
+
    <modules>
       <module>core</module>
       <module>rest</module>
@@ -26,6 +31,12 @@
          <artifactId>infinispan-core</artifactId>
          <version>${project.version}</version>
       </dependency>
+      
+      <dependency>
+         <groupId>org.scala-lang</groupId>
+         <artifactId>scala-library</artifactId>
+         <version>${version.scala}</version>
+      </dependency>
 
       <dependency>
          <groupId>${project.groupId}</groupId>

Modified: trunk/server/rest/pom.xml
===================================================================
--- trunk/server/rest/pom.xml	2010-03-30 07:19:41 UTC (rev 1639)
+++ trunk/server/rest/pom.xml	2010-03-30 10:12:04 UTC (rev 1640)
@@ -4,9 +4,9 @@
 
    <parent>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <artifactId>infinispan-server-parent</artifactId>
       <version>4.1.0-SNAPSHOT</version>
-      <relativePath>../../parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <artifactId>infinispan-server-rest</artifactId>
@@ -63,32 +63,11 @@
       <version.jetty>6.1.15</version.jetty>
       <version.commons.httpclient>3.1</version.commons.httpclient>
       <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>
+      <!-- TODO: Find out why on earth when scala version is set to 2.7.7 here, memcached and hotrod modules that depend on 2.8.0.Beta1, receive 2.7.7 library on assembly!!! -->
    </properties>
 
    <dependencies>
       <dependency>
-         <groupId>org.scala-lang</groupId>
-         <artifactId>scala-library</artifactId>
-         <version>${version.scala}</version>
-      </dependency>
-
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>infinispan-core</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>infinispan-core</artifactId>
-         <version>${project.version}</version>
-         <type>test-jar</type>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
          <version>${version.resteasy}</version>