commit 34d7dadb561effa6e64163d715b58ecdbcf3b75b
author Radu Cotescu <radu@apache.org> Wed Jun 05 18:32:13 2019 +0200
committer Radu Cotescu <radu@apache.org> Wed Jun 05 18:32:13 2019 +0200
tree 3d4c5434f4e4dfce92f11c823dfd7aac5f8388f4
parent 25284b22ce36e9aa8b40d0c00e40718c292b4e1b

SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35

bnd.bnd

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..6e83fd4
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Require-Capability: io.sightly.runtime; filter:="(&(version>=1.0)(!(version>=2.0)))", 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)))"
+Sling-Bundle-Resources: /libs/sling/sightly/js;path:=/SLING-INF/libs/sling/sightly/js

pom.xml

diff --git a/pom.xml b/pom.xml
index 1f9fdae..8756cc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
     <!-- ======================================================================= -->
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>35</version>
         <relativePath />
     </parent>
 
@@ -34,7 +34,6 @@
     <!-- ======================================================================= -->
     <artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId>
     <version>1.0.29-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Scripting HTL JavaScript Use Provider</name>
 
@@ -55,30 +54,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>scr-metadata</id>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <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.runtime; filter:="(&amp;(version&gt;=1.0)(!(version&gt;=2.0)))"
-                            io.sightly; filter:="(&amp;(version&gt;=1.0)(!(version&gt;=2.0)))",
-                            osgi.implementation;filter:="(&amp;(osgi.implementation=org.apache.sling.scripting.javascript.rhinoscriptengine)(version&gt;=1.7.7.1)(!(version&gt;=2.0.0)))"
-                        </Require-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>