You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2010/01/25 20:32:13 UTC
svn commit: r902945 - in /sling/trunk: bundles/scripting/api/pom.xml
bundles/scripting/core/pom.xml launchpad/builder/src/main/bundles/list.xml
Author: justin
Date: Mon Jan 25 19:32:13 2010
New Revision: 902945
URL: http://svn.apache.org/viewvc?rev=902945&view=rev
Log:
SLING-1318 - switching out BSF for Livetribe
Modified:
sling/trunk/bundles/scripting/api/pom.xml
sling/trunk/bundles/scripting/core/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/bundles/scripting/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=902945&r1=902944&r2=902945&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Mon Jan 25 19:32:13 2010
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -74,10 +74,10 @@
</dependency>
<dependency>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>3.0-beta2</version>
- <scope>compile</scope>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <version>2.0.6</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -98,6 +98,5 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: sling/trunk/bundles/scripting/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=902945&r1=902944&r2=902945&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Mon Jan 25 19:32:13 2010
@@ -69,38 +69,6 @@
</instructions>
</configuration>
</plugin>
-
- <!-- SLING-217: Ensure compilation with BSF API in bootclasspath -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>get-bsf3-api</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>3.0-beta2</version>
- </artifactItem>
- </artifactItems>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- Reported to work on Linux, Windows, Mac OSX -->
- <compilerArgument>-Xbootclasspath/p:${project.build.directory}/dependency/bsf-api.jar</compilerArgument>
- </configuration>
- </plugin>
</plugins>
</build>
<reporting>
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=902945&r1=902944&r2=902945&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Jan 25 19:32:13 2010
@@ -125,7 +125,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.0.2-incubator</version>
+ <version>2.0.3-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>