incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r835913 - in /sling/trunk/contrib/scripting/scala: engine/pom.xml interpreter/pom.xml
Date Fri, 13 Nov 2009 16:48:54 GMT
Author: cziegeler
Date: Fri Nov 13 16:48:54 2009
New Revision: 835913

URL: http://svn.apache.org/viewvc?rev=835913&view=rev
Log:
Update Scala support to latest parent pom and latest scala version 2.7.7

Modified:
    sling/trunk/contrib/scripting/scala/engine/pom.xml
    sling/trunk/contrib/scripting/scala/interpreter/pom.xml

Modified: sling/trunk/contrib/scripting/scala/engine/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/engine/pom.xml?rev=835913&r1=835912&r2=835913&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/engine/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/engine/pom.xml Fri Nov 13 16:48:54 2009
@@ -24,8 +24,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>6</version>
-        <relativePath>../../../../parent/pom.xml</relativePath>
+        <version>7</version>
     </parent>
 
     <artifactId>org.apache.sling.scripting.scala</artifactId>
@@ -83,7 +82,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
                 <configuration>
                     <systemProperties>
                         <property>
@@ -124,21 +122,21 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.7.3</version> 
+            <version>2.7.7</version> 
             <scope>provided</scope>
         </dependency>         
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-compiler</artifactId> 
-            <version>2.7.3</version> 
+            <version>2.7.7</version> 
             <scope>provided</scope>
         </dependency>        
         <dependency>
-            <groupId>org.apache.felix</groupId> 
+            <groupId>org.osgi</groupId> 
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId> 
+            <groupId>org.osgi</groupId> 
             <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>

Modified: sling/trunk/contrib/scripting/scala/interpreter/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/interpreter/pom.xml?rev=835913&r1=835912&r2=835913&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/interpreter/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/interpreter/pom.xml Fri Nov 13 16:48:54 2009
@@ -23,8 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>6</version>
-        <relativePath>../../../../parent/pom.xml</relativePath>
+        <version>7</version>
     </parent>
 
     <artifactId>org.apache.sling.scripting.scala.interpreter</artifactId>
@@ -82,7 +81,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
                 <configuration>
                     <systemProperties>
                         <property>
@@ -107,16 +105,16 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.7.3</version>
+            <version>2.7.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-compiler</artifactId>
-            <version>2.7.3</version>
+            <version>2.7.7</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
@@ -128,7 +126,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>



Mime
View raw message