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/08/28 08:45:54 UTC

[sling-org-apache-sling-scripting-sightly-runtime] 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-runtime.git


The following commit(s) were added to refs/heads/master by this push:
     new b9e9612  SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
b9e9612 is described below

commit b9e9612a9780088476c8ba5fd226be9edcd197e3
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Aug 28 10:45:34 2019 +0200

    SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
---
 bnd.bnd |  6 ++++++
 pom.xml | 39 ++++++---------------------------------
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..69e5bba
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,6 @@
+Provide-Capability: io.sightly.runtime; version:Version=1.0, \\
+                    io.sightly.runtime; version:Version=1.1, \\
+                    io.sightly.runtime; version:Version=1.2, \\
+                    io.sightly.runtime; version:Version=1.3, \\
+                    io.sightly.runtime; version:Version=1.3.1, \\
+                    io.sightly.runtime; version:Version=1.4
diff --git a/pom.xml b/pom.xml
index ece6e1d..e3528eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@
     <!-- ======================================================================= -->
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>35</version>
         <relativePath />
     </parent>
 
@@ -36,7 +36,6 @@
         releasing to only increase the first part, unless the module provides support for a newer version of the HTL specification.
     -->
     <version>1.1.1-1.4.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Scripting HTL Runtime</name>
 
@@ -52,7 +51,7 @@
   </scm>
 
     <properties>
-        <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.8.2</jacoco.maven.plugin.version>
         <sling.java.version>8</sling.java.version>
     </properties>
 
@@ -62,35 +61,9 @@
     <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>
-                        <Provide-Capability>
-                            io.sightly.runtime; version:Version=1.0,
-                            io.sightly.runtime; version:Version=1.1,
-                            io.sightly.runtime; version:Version=1.2,
-                            io.sightly.runtime; version:Version=1.3,
-                            io.sightly.runtime; version:Version=1.3.1,
-                            io.sightly.runtime; version:Version=1.4
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.5</version>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>3.1.11</version>
                 <configuration>
                     <effort>Max</effort>
                     <xmlOutput>true</xmlOutput>