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 2019/06/05 15:25:27 UTC
[sling-org-apache-sling-scripting-sightly] branch master updated:
SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git
The following commit(s) were added to refs/heads/master by this push:
new 00fd864 SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
00fd864 is described below
commit 00fd864c9b2ca9e5e820b41e7ceaa718f53a2888
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Jun 5 17:19:54 2019 +0200
SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
---
bnd.bnd | 3 +++
pom.xml | 43 ++-----------------------------------------
2 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..8482428
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,3 @@
+Provide-Capability: io.sightly;version:Version="1.0", io.sightly; version:Version="1.1", io.sightly;version:Version="1.2", io.sightly;version:Version="1.3", io.sightly;version:Version="1.3.1", io.sightly;version:Version="1.4"
+Require-Capability: io.sightly.runtime; filter:="(&(version<=1.0)(!(version>=2.0)))"
+Import-Package: org.apache.sling.scripting.sightly.compiler.*;resolution:=optional, org.apache.sling.scripting.sightly.java.compiler.*;resolution:=optional, org.apache.sling.commons.compiler.*;resolution:=optional, org.apache.sling.commons.classloader.*;resolution:=optional,*
diff --git a/pom.xml b/pom.xml
index a9ff97f..8b9a5d3 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>
@@ -38,7 +38,6 @@
releasing to only increase the first part, unless the module provides support for a newer version of the HTL specification.
-->
<version>1.2.0-1.4.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Engine</name>
@@ -64,44 +63,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>
- <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
- <ScriptEngine-Version>${project.version}</ScriptEngine-Version>
- <Provide-Capability>
- io.sightly; version:Version=1.0,
- io.sightly; version:Version=1.1,
- io.sightly; version:Version=1.2,
- io.sightly; version:Version=1.3,
- io.sightly; version:Version=1.3.1,
- io.sightly; version:Version=1.4
- </Provide-Capability>
- <Require-Capability>
- io.sightly.runtime; filter:="(&(version>=1.0)(!(version>=2.0)))"
- </Require-Capability>
- <Import-Package>
- org.apache.sling.scripting.sightly.compiler.*;resolution:=optional,
- org.apache.sling.scripting.sightly.java.compiler.*;resolution:=optional,
- org.apache.sling.commons.compiler.*;resolution:=optional,
- org.apache.sling.commons.classloader.*;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.11</version>