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/12/06 13:03:15 UTC
[sling-org-apache-sling-scripting-javascript] branch master
updated: SLING-8894 - Upgrade to 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-javascript.git
The following commit(s) were added to refs/heads/master by this push:
new 05af2ad SLING-8894 - Upgrade to parent pom 35
05af2ad is described below
commit 05af2addd29325a4bff2bc402dd11cc36dac60ee
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Dec 6 14:02:58 2019 +0100
SLING-8894 - Upgrade to parent pom 35
---
bnd.bnd | 4 +++
pom.xml | 91 +++++++++++++++++++++++++++++------------------------------------
2 files changed, 45 insertions(+), 50 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..964767d
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,4 @@
+ScriptEngine-Name: ${project.name}
+ScriptEngine-Version: ${project.version}
+Rhino-Version: ${rhino.version}
+Provide-Capability: osgi.implementation;osgi.implementation="org.apache.sling.scripting.javascript.rhinoscriptengine";version:Version="${rhino.version}"
diff --git a/pom.xml b/pom.xml
index 645af68..e6e936c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,13 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.scripting.javascript</artifactId>
<version>3.1.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting JavaScript</name>
<description>Support for JavaScript scripting</description>
@@ -47,43 +46,6 @@
<sling.java.version>8</sling.java.version>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- javax.jcr.*;version=2.0,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sling.scripting.javascript
- </Export-Package>
- <Private-Package>
- org.apache.sling.scripting.javascript.*
- </Private-Package>
- <Embed-Dependency>
- org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
- </Embed-Dependency>
- <Provide-Capability>
- osgi.implementation;osgi.implementation="org.apache.sling.scripting.javascript.rhinoscriptengine";version:Version="${rhino.version}"
- </Provide-Capability>
- <_removeheaders>
- Embed-Dependency,
- Private-Package,
- Include-Resource
- </_removeheaders>
- <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
- <ScriptEngine-Version>${project.version}</ScriptEngine-Version>
- <Rhino-Version>${rhino.version}</Rhino-Version>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<reporting>
<plugins>
<plugin>
@@ -101,6 +63,21 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.21.0</version>
@@ -131,16 +108,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>2.0</version>
@@ -186,6 +153,12 @@
<artifactId>org.apache.sling.commons.testing</artifactId>
<version>2.1.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -199,5 +172,23 @@
<version>1.10.19</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>2.19.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.19.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.19.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>