Author: radu
Date: Thu Apr 13 11:19:07 2017
New Revision: 1791227

URL: http://svn.apache.org/viewvc?rev=1791227&view=rev
Log:
SLING-6780 - org.apache.sling.scripting.sightly.js.provider does not declare a 
version range for the org.mozilla.javascript import

* switched to depending on the org.apache.servicemix.bundles.rhino bundle, so 
that bnd defines the correct imports

Modified:
    sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1791227&r1=1791226&r2=1791227&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Thu Apr 13 
11:19:07 2017
@@ -68,7 +68,6 @@
                 <configuration>
                     <exportScr>true</exportScr>
                     <instructions>
-                        
<Import-Package>org.mozilla.javascript;version="[1.1,2)",*</Import-Package>
                         
<Sling-Bundle-Resources>/libs/sling/sightly/js;path:=/SLING-INF/libs/sling/sightly/js</Sling-Bundle-Resources>
                         <Require-Capability>io.sightly; 
filter:="(&amp;(version&gt;=1.0)(!(version&gt;=2.0)))"</Require-Capability>
                     </instructions>
@@ -178,9 +177,9 @@
 
         <!-- Rhino -->
         <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-            <version>1.7R4</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
+            <version>1.7.7.1_1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>


Reply via email to