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/06 16:11:45 UTC
[sling-org-apache-sling-testing-sling-mock-oak] branch
feature/SLING-7803-junit5 created (now 64869a8)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-7803-junit5
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git.
at 64869a8 SLING-7803 update to latest sling-mock and mockito version
This branch includes the following new commits:
new 64869a8 SLING-7803 update to latest sling-mock and mockito version
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-testing-sling-mock-oak] 01/01: SLING-7803
update to latest sling-mock and mockito version
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-7803-junit5
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git
commit 64869a82bbfd16cb75416fe22bcb8fee2a976dd0
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Aug 6 17:55:52 2018 +0200
SLING-7803 update to latest sling-mock and mockito version
---
pom.xml | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 10c9310..23c1385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing Sling Mock Jackrabbit Oak-based Resource Resolver</name>
@@ -37,7 +37,7 @@
<properties>
<oak.version>1.4.1</oak.version>
<jackrabbit.version>2.12.1</jackrabbit.version>
- <sling-mock.version>2.2.12</sling-mock.version>
+ <sling-mock.version>2.3.0-SNAPSHOT</sling-mock.version>
</properties>
<scm>
@@ -53,21 +53,38 @@
<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>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.sling-mock</artifactId>
+ <artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
<version>${sling-mock.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.sling-mock</artifactId>
+ <artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
<version>${sling-mock.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
+ <version>${sling-mock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Depend on oak-jcr, which pulls in all needed Oak artifacts -->
<dependency>
@@ -103,8 +120,8 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <artifactId>mockito-core</artifactId>
+ <version>2.21.0</version>
<scope>test</scope>
</dependency>
<dependency>