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.git
commit a8082f9bb5e7821e5b05fb81615500a2c4698d4a Author: sseifert <[email protected]> AuthorDate: Mon Aug 6 14:45:13 2018 +0200 SLING-7803 update to latest mockito version --- core/pom.xml | 28 +++++++++++++++------- .../sling/context/NoResourceResolverTypeTest.java | 2 +- .../jcrmock/loader/ContentLoaderBinaryTest.java | 2 +- .../testing/mock/sling/junit/SlingContextTest.java | 2 +- .../loader/AbstractContentLoaderBinaryTest.java | 2 +- .../servlet/MockSlingHttpServletRequestTest.java | 2 +- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 52d3ac8..47701f2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,12 +35,22 @@ <description>Mock implementation of selected Sling APIs.</description> <dependencies> - + <dependency> <groupId>org.osgi</groupId> <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> @@ -236,8 +246,8 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> + <artifactId>mockito-core</artifactId> + <version>2.19.1</version> <scope>test</scope> </dependency> <dependency> @@ -248,10 +258,10 @@ </dependency> </dependencies> - + <build> <plugins> - + <!-- Publish test artifact --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -264,13 +274,13 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> </plugin> - + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -283,7 +293,7 @@ </plugins> </build> - + <profiles> <profile> <id>latest-resource-bundles</id> @@ -321,5 +331,5 @@ </dependencies> </profile> </profiles> - + </project> diff --git a/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java index 5906a0b..7898d89 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java @@ -29,7 +29,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @SuppressWarnings("null") diff --git a/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java index 76c85c4..f424d50 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java @@ -21,7 +21,7 @@ package org.apache.sling.testing.mock.sling.jcrmock.loader; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderBinaryTest; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ContentLoaderBinaryTest extends AbstractContentLoaderBinaryTest { diff --git a/core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java index 8e45452..358bfcc 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; diff --git a/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java index 3e624b2..36558ab 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @SuppressWarnings("null") diff --git a/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java index d46bc7e..6a17feb 100644 --- a/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java +++ b/core/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java @@ -44,7 +44,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.osgi.framework.BundleContext; @RunWith(MockitoJUnitRunner.class)
