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:59:25 UTC
[sling-org-apache-sling-testing-sling-mock] branch master updated:
SLING-8819 sling-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-sling-mock.git
The following commit(s) were added to refs/heads/master by this push:
new be440cc SLING-8819 sling-mock: Upgrade to parent pom 35
be440cc is described below
commit be440ccf064c4636bbd8ac2a8d719edd1b3c9abc
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Thu Oct 31 16:59:11 2019 +0100
SLING-8819 sling-mock: Upgrade to parent pom 35
---
core/pom.xml | 11 +++++++----
junit4/pom.xml | 11 +++++++----
junit5/pom.xml | 11 +++++++----
parent/pom.xml | 6 +++---
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3391be7..6bb98c1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Sling Testing Sling Mock Core</name>
@@ -279,9 +279,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 6349fdb..ee816f3 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Sling Testing Sling Mock JUnit 4</name>
@@ -88,9 +88,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 931bf12..89bb74e 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock.junit5</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache Sling Testing Sling Mock JUnit 5</name>
@@ -112,9 +112,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>
<plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 93f5022..12f4fb9 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>
@@ -40,7 +40,7 @@
<jcr-mock.version>1.4.4</jcr-mock.version>
<resourceresolver-mock.version>1.1.24</resourceresolver-mock.version>
<logging-mock.version>2.0.0</logging-mock.version>
- <servlet-helpers.version>1.2.1-SNAPSHOT</servlet-helpers.version>
+ <servlet-helpers.version>1.3.0-SNAPSHOT</servlet-helpers.version>
<resourcebuilder.version>1.0.4</resourcebuilder.version>
</properties>