incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r905392 - in /sling/trunk: contrib/launchpad/testing/pom.xml contrib/pom.xml pom.xml samples/pom.xml
Date Mon, 01 Feb 2010 19:51:51 GMT
Author: cziegeler
Date: Mon Feb  1 19:51:50 2010
New Revision: 905392

URL: http://svn.apache.org/viewvc?rev=905392&view=rev
Log:
SLING-1259 : Require Maven 2.2.1

Modified:
    sling/trunk/contrib/launchpad/testing/pom.xml
    sling/trunk/contrib/pom.xml
    sling/trunk/pom.xml
    sling/trunk/samples/pom.xml

Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=905392&r1=905391&r2=905392&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Mon Feb  1 19:51:50 2010
@@ -42,6 +42,11 @@
             <id>aQute</id>
             <url>http://www.aQute.biz/repo</url>
         </repository>
+        <repository>
+            <id>scala-tools.org</id>
+            <name>Scala-Tools Maven2 Repository</name>
+            <url>http://scala-tools.org/repo-releases</url>
+        </repository>
     </repositories>
 
     <scm>
@@ -215,7 +220,7 @@
                             </outputDirectory>
                             <excludeTransitive>true</excludeTransitive>
                             <includeArtifactIds>
-                                org.apache.sling.scripting.python,org.apache.sling.scripting.xproc,org.apache.sling.extensions.apt.parser,org.apache.sling.extensions.apt.servlet,org.apache.sling.samples.path-based.rtp,org.apache.sling.scripting.scala
+                                org.apache.sling.scripting.python,org.apache.sling.scripting.xproc,org.apache.sling.extensions.apt.parser,org.apache.sling.extensions.apt.servlet,org.apache.sling.samples.path-based.rtp,org.apache.sling.scripting.scala.script,org.apache.sling.scripting.scala.config,scala-library,scala-compiler
                             </includeArtifactIds>
                             <includeScope>
                                 provided
@@ -495,10 +500,28 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.scala</artifactId>
+            <artifactId>org.apache.sling.scripting.scala.script</artifactId>
             <version>0.9.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.scripting.scala.config</artifactId>
+            <version>0.9.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang-osgi</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.7.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang-osgi</groupId>
+            <artifactId>scala-compiler</artifactId>
+            <version>2.7.7</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- JCR Install - needs to be in a profile -->
         <dependency>
@@ -570,4 +593,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
 </project>

Modified: sling/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=905392&r1=905391&r2=905392&view=diff
==============================================================================
--- sling/trunk/contrib/pom.xml (original)
+++ sling/trunk/contrib/pom.xml Mon Feb  1 19:51:50 2010
@@ -34,7 +34,7 @@
     <inceptionYear>2007</inceptionYear>
 
     <prerequisites>
-        <maven>2.0.7</maven>
+        <maven>2.2.1</maven>
     </prerequisites>
 
 
@@ -100,8 +100,8 @@
           <module>scripting/jst</module>
           <module>scripting/python</module>
           <module>scripting/ruby</module>
-          <module>scripting/scala/engine</module>
-          <module>scripting/scala/interpreter</module>
+          <module>scripting/scala/script</module>
+          <module>scripting/scala/config</module>
           <module>scripting/scala/samples/hello-world</module>
           <module>scripting/scala/samples/forum</module>
           <module>scripting/velocity</module>

Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=905392&r1=905391&r2=905392&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Mon Feb  1 19:51:50 2010
@@ -40,7 +40,7 @@
     <inceptionYear>2007</inceptionYear>
 
     <prerequisites>
-        <maven>2.0.7</maven>
+        <maven>2.2.1</maven>
     </prerequisites>
 
 

Modified: sling/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/pom.xml?rev=905392&r1=905391&r2=905392&view=diff
==============================================================================
--- sling/trunk/samples/pom.xml (original)
+++ sling/trunk/samples/pom.xml Mon Feb  1 19:51:50 2010
@@ -34,7 +34,7 @@
     <inceptionYear>2007</inceptionYear>
 
     <prerequisites>
-        <maven>2.0.7</maven>
+        <maven>2.2.1</maven>
     </prerequisites>
 
 



Mime
View raw message