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 2019/09/20 09:25:57 UTC
[sling-org-apache-sling-jcr-repoinit] branch master updated:
SLING-8724 - Upgrade to parent pom 35
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-repoinit.git
The following commit(s) were added to refs/heads/master by this push:
new a4f3890 SLING-8724 - Upgrade to parent pom 35
a4f3890 is described below
commit a4f38905084a09325d3e1f5f6b8f00cdb18070a7
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 20 11:25:32 2019 +0200
SLING-8724 - Upgrade to parent pom 35
---
bnd.bnd | 1 +
pom.xml | 36 ++++++------------------------------
2 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..004be90
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+Provide-Capability: osgi.implementation;osgi.implementation="org.apache.sling.jcr.repoinit";version:Version="1.0"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2e83a88..cfd7bb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
<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.jcr.repoinit</artifactId>
- <packaging>bundle</packaging>
<version>1.1.13-SNAPSHOT</version>
<name>Apache Sling JCR RepoInit module</name>
<description>
@@ -53,32 +52,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <!-- Configure extra execution of 'manifest' in process-classes phase to make sure SCR metadata is generated before unit test runs -->
- <execution>
- <id>scr-metadata</id>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <!-- Export SCR metadata to classpath to have them available in unit tests -->
- <exportScr>true</exportScr>
- <instructions>
- <Provide-Capability>
- osgi.implementation;osgi.implementation="org.apache.sling.jcr.repoinit";version:Version="1.0"
- </Provide-Capability>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -110,7 +83,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.16</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -213,6 +185,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>