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-jcr-base.git
The following commit(s) were added to refs/heads/master by this push:
new 0f0898a SLING-9627 - jcr.base: update to parent pom 39 or newer
0f0898a is described below
commit 0f0898a2843eef5f9c871d29cfae5acd9af7a097
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Aug 4 16:15:34 2020 +0200
SLING-9627 - jcr.base: update to parent pom 39 or newer
---
pom.xml | 29 +++--------------------------
1 file changed, 3 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index a673f91..a0a598c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>39</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <packaging>bundle</packaging>
<version>3.1.1-SNAPSHOT</version>
<name>Apache Sling JCR Base Bundle</name>
@@ -46,21 +45,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Category>
- sling,jcr,jackrabbit
- </Bundle-Category>
- <Provide-Capability><![CDATA[
-
osgi.service;objectClass:List<String>="javax.jcr.Repository,org.apache.sling.jcr.api.SlingRepository"
- ]]></Provide-Capability>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -68,12 +52,7 @@
org.apache.sling.jcr.base.internal
</excludePackageNames>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M3</version>
- </plugin>
+ </plugin>
</plugins>
</build>
@@ -81,13 +60,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
