You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2017/08/31 08:54:11 UTC
svn commit: r1806768 - in /sling/trunk/bundles/scripting: javascript/pom.xml
sightly/js-use-provider/pom.xml
sightly/testing/src/main/provisioning/model.txt
Author: radu
Date: Thu Aug 31 08:54:10 2017
New Revision: 1806768
URL: http://svn.apache.org/viewvc?rev=1806768&view=rev
Log:
SLING-7093 - The JavaScript Use Provider should define an explicit dependency to the o.a.s.scripting.javascript bundle
* defined capabilities headers in both bundles
Modified:
sling/trunk/bundles/scripting/javascript/pom.xml
sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1806768&r1=1806767&r2=1806768&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Aug 31 08:54:10 2017
@@ -62,6 +62,9 @@
<Embed-Dependency>
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
</Embed-Dependency>
+ <Provide-Capability>
+ osgi.implementation;osgi.implementation="org.apache.sling.scripting.javascript.rhinoscriptengine";version:Version="1.7.7.1"
+ </Provide-Capability>
<_removeheaders>
Embed-Dependency,
Private-Package,
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=1806768&r1=1806767&r2=1806768&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Thu Aug 31 08:54:10 2017
@@ -69,7 +69,10 @@
<exportScr>true</exportScr>
<instructions>
<Sling-Bundle-Resources>/libs/sling/sightly/js;path:=/SLING-INF/libs/sling/sightly/js</Sling-Bundle-Resources>
- <Require-Capability>io.sightly; filter:="(&(version>=1.0)(!(version>=2.0)))"</Require-Capability>
+ <Require-Capability>
+ io.sightly; filter:="(&(version>=1.0)(!(version>=2.0)))",
+ osgi.implementation;filter:="(&(osgi.implementation=org.apache.sling.scripting.javascript.rhinoscriptengine)(version>=1.7.7.1)(!(version>=2.0.0)))"
+ </Require-Capability>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1806768&r1=1806767&r2=1806768&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Thu Aug 31 08:54:10 2017
@@ -24,6 +24,7 @@
org.apache.sling/org.apache.sling.scripting.sightly.compiler
org.apache.sling/org.apache.sling.scripting.sightly.compiler.java
org.apache.sling/org.apache.sling.scripting.sightly
+ org.apache.sling/org.apache.sling.scripting.javascript/3.0.1-SNAPSHOT
org.apache.sling/org.apache.sling.scripting.sightly.js.provider
org.apache.sling/org.apache.sling.scripting.sightly.models.provider
org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.5-SNAPSHOT