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 2018/08/23 21:14:50 UTC
[sling-org-apache-sling-testing-sling-mock] 02/02: make sure osgi
framework deps have highest priority update "latest-resource-bundles"
versions
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
commit 9ecc9cd55e9a50331db03d6722e54e2db9d3a280
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Thu Aug 23 23:14:38 2018 +0200
make sure osgi framework deps have highest priority
update "latest-resource-bundles" versions
---
core/pom.xml | 31 ++++++++++++++++++++++++-------
junit4/pom.xml | 11 +++++++++++
junit5/pom.xml | 11 +++++++++++
parent/pom.xml | 10 ----------
4 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 8e80233..1bb198d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,6 +35,17 @@
<dependencies>
<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>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
<version>${osgi-mock.version}</version>
@@ -281,32 +292,38 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.16.2</version>
+ <version>2.16.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.5.22</version>
+ <version>1.5.34</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>3.0.0</version>
+ <version>3.0.8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>2.13.4</version>
- <scope>provided</scope>
+ <version>2.16.0</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
- <version>1.5.15</version>
- <scope>provided</scope>
+ <version>1.8.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
diff --git a/junit4/pom.xml b/junit4/pom.xml
index 1ede740..dd732c9 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -35,6 +35,17 @@
<dependencies>
<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>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
<version>2.3.1-SNAPSHOT</version>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index 4c7b85c..3c653da 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -35,6 +35,17 @@
<dependencies>
<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>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
<version>2.3.1-SNAPSHOT</version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0807e26..51be8e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,16 +52,6 @@
<artifactId>org.osgi.annotation.versioning</artifactId>
<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>
<!-- Nullability annotations -->
<dependency>