You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/03/30 08:27:39 UTC
svn commit: r1789454 - in /sling/trunk/bundles/scripting/javascript: pom.xml
src/main/java/org/apache/sling/scripting/javascript/package-info.java
Author: olli
Date: Thu Mar 30 08:27:39 2017
New Revision: 1789454
URL: http://svn.apache.org/viewvc?rev=1789454&view=rev
Log:
SLING-6668 Remove embedded Rhino from bundle
Modified:
sling/trunk/bundles/scripting/javascript/pom.xml
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/package-info.java
Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1789454&r1=1789453&r2=1789454&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Mar 30 08:27:39 2017
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>30</version>
<relativePath />
</parent>
@@ -45,12 +45,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -59,16 +54,10 @@
*
</Import-Package>
<Export-Package>
- org.apache.sling.scripting.javascript,
- org.mozilla.javascript;version=1.1.0,
- org.mozilla.javascript.ast;version=1.1.0,
- org.mozilla.classfile;version=0.0.1,
- org.mozilla.javascript.debug;version=0.0.1
+ org.apache.sling.scripting.javascript
</Export-Package>
<Private-Package>
- org.apache.sling.scripting.javascript.*,
- !org.mozilla.javascript.xml.impl.xmlbeans,
- org.mozilla.javascript.*
+ org.apache.sling.scripting.javascript.*
</Private-Package>
<Embed-Dependency>
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
@@ -80,8 +69,16 @@
</_removeheaders>
<ScriptEngine-Name>${project.name}</ScriptEngine-Name>
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
+ <_plugin>org.apache.felix.scrplugin.bnd.SCRDescriptorBndPlugin;destdir=${project.build.outputDirectory};</_plugin>
</instructions>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.bnd</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
@@ -133,12 +130,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -149,7 +146,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -160,7 +157,8 @@
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
- <version>1.7.7</version>
+ <version>1.7.7.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -189,19 +187,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.16</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.6.2</version>
+ <version>2.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.2</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/package-info.java?rev=1789454&r1=1789453&r2=1789454&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/package-info.java (original)
+++ sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/package-info.java Thu Mar 30 08:27:39 2017
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("0.1.0")
+@Version("1.0.0")
package org.apache.sling.scripting.javascript;
-import aQute.bnd.annotation.Version;
-
+import org.osgi.annotation.versioning.Version;