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 16:20:23 UTC
[sling-org-apache-sling-scripting-sightly-compiler-java] 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-compiler-java.git
The following commit(s) were added to refs/heads/master by this push:
new 391c3c1 SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
391c3c1 is described below
commit 391c3c127deceb55705b04ab972d2595fa0040fa
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Jun 5 18:19:44 2019 +0200
SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
---
bnd.bnd | 2 ++
pom.xml | 75 +++--------------------------------------------------------------
2 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..4d34ede
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Provide-Capability: io.sightly.compiler.java; version:Version="1.0", io.sightly.compiler.java; version:Version="1.1", io.sightly.compiler.java; version:Version="1.2", io.sightly.compiler.java; version:Version="1.3", io.sightly.compiler.java; version:Version="1.3.1", io.sightly.compiler.java; version:Version="1.4",
+Require-Capability: io.sightly.runtime; filter:="(&(version>=1.0)(!(version>=2.0)))", io.sightly.compiler; filter:="(&(version>=1.0)(version<=1.4))"
diff --git a/pom.xml b/pom.xml
index d3e98ad..1d2e700 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.3-1.4.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Java Compiler</name>
@@ -53,7 +52,6 @@
</scm>
<properties>
- <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
<sling.java.version>8</sling.java.version>
</properties>
@@ -63,36 +61,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>
- <Provide-Capability>
- io.sightly.compiler.java; version:Version=1.0,
- io.sightly.compiler.java; version:Version=1.1,
- io.sightly.compiler.java; version:Version=1.2,
- io.sightly.compiler.java; version:Version=1.3,
- io.sightly.compiler.java; version:Version=1.3.1,
- io.sightly.compiler.java; version:Version=1.4
- </Provide-Capability>
- <Require-Capability>
- io.sightly.runtime; filter:="(&(version>=1.0)(!(version>=2.0)))"
- io.sightly.compiler; filter:="(&(version>=1.0)(version<=1.4))",
- </Require-Capability>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.5</version>
@@ -123,43 +91,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>coverage-report</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.maven.plugin.version}</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <includes>
- <include>org/apache/sling/scripting/sightly/**/*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<!-- ======================================================================= -->
<!-- D E P E N D E N C I E S -->
<!-- ======================================================================= -->
@@ -168,7 +99,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler</artifactId>
- <version>1.1.3-1.4.0-SNAPSHOT</version>
+ <version>1.2.0-1.4.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>