You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/10/31 15:56:54 UTC
[sling-org-apache-sling-testing-osgi-mock] branch master updated:
SLING-8821 osgi-mock: Upgrade to parent pom 35
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
The following commit(s) were added to refs/heads/master by this push:
new 7a157ef SLING-8821 osgi-mock: Upgrade to parent pom 35
7a157ef is described below
commit 7a157ef7fa12fecbb877cd22a5cdc1bacd9bbdcd
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Thu Oct 31 16:56:21 2019 +0100
SLING-8821 osgi-mock: Upgrade to parent pom 35
---
core/pom.xml | 11 +++++++----
junit4/pom.xml | 11 +++++++----
junit5/pom.xml | 11 +++++++----
parent/pom.xml | 4 ++--
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 03de3ce..4b2a2ef 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Sling Testing OSGi Mock Core</name>
@@ -164,9 +164,12 @@
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
<plugin>
diff --git a/junit4/pom.xml b/junit4/pom.xml
index 4d37495..df396fc 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.junit4</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Sling Testing OSGi Mock JUnit 4</name>
@@ -70,9 +70,12 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
</plugins>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index 0e39083..4fba015 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.junit5</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Sling Testing OSGi Mock JUnit 5</name>
@@ -101,9 +101,12 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
</plugins>
diff --git a/parent/pom.xml b/parent/pom.xml
index dfa1d84..57a2198 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>