You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/02/18 08:15:55 UTC
[sling-org-apache-sling-scripting-sightly-repl] branch master
updated: SLING-9079 - [HTL] HTL/Sightly REPL not building with Java > 8
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
The following commit(s) were added to refs/heads/master by this push:
new 3a3c7f7 SLING-9079 - [HTL] HTL/Sightly REPL not building with Java > 8
3a3c7f7 is described below
commit 3a3c7f77c84320c69b1966fd17e271ece94a224f
Author: Vlad Băilescu <ba...@adobe.com>
AuthorDate: Mon Feb 17 19:13:36 2020 +0200
SLING-9079 - [HTL] HTL/Sightly REPL not building with Java > 8
* Updated parent
* Removed maven-bundle-plugin and moved configuration to bnd-maven-plugin
---
bnd.bnd | 2 ++
pom.xml | 17 ++---------------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..8d2f5a7
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Sling-Initial-Content: SLING-INF;overwrite=true
+Require-Capability: io.sightly; filter:="(&(version>=1.0)(!(version>=2.0)))"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0dcd712..9ffbd91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.sling.scripting.sightly.repl</artifactId>
<version>1.0.7-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Read-Eval-Print Loop Environment</name>
<description>REPL for Apache Sling Scripting HTL engine</description>
@@ -69,18 +68,6 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <exportScr>true</exportScr>
- <instructions>
- <Sling-Initial-Content>SLING-INF;overwrite=true</Sling-Initial-Content>
- <Require-Capability>io.sightly; filter:="(&(version>=1.0)(!(version>=2.0)))"</Require-Capability>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>