You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/09/06 13:51:12 UTC
svn commit: r1520551 - in /sling/trunk: bundles/scripting/api/pom.xml
launchpad/builder/src/main/bundles/list.xml
Author: bdelacretaz
Date: Fri Sep 6 11:51:11 2013
New Revision: 1520551
URL: http://svn.apache.org/r1520551
Log:
SLING-3042 - do not export javax.script from org.apache.sling.scripting.api anymore
Modified:
sling/trunk/bundles/scripting/api/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=1520551&r1=1520550&r2=1520551&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Fri Sep 6 11:51:11 2013
@@ -43,6 +43,10 @@
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api</url>
</scm>
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -55,9 +59,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.sling.scripting.api;version=2.1.0,
+ <Import-Package>
javax.script
+ </Import-Package>
+ <Export-Package>
+ org.apache.sling.scripting.api;version=2.1.0
</Export-Package>
</instructions>
</configuration>
@@ -74,14 +80,6 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.livetribe</groupId>
- <artifactId>livetribe-jsr223</artifactId>
- <version>2.0.6</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
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=1520551&r1=1520550&r2=1520551&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Fri Sep 6 11:51:11 2013
@@ -190,7 +190,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>