Port tests to mockito 2.x This change moves test suites to mockito 2 and harmonises on a single version of hamcrest as well as updating maven plug-ins where necessary and harmonising on a single version of JDT annotations (some bundles moved to the newer Java 8+ annotations since all bundles have a BREE of Java 8+). Orbit dep updates: * Mockito 1.9.5 -> 2.23.0 * Hamcrest 1.1 & 1.3 -> 1.3 Only * Objenesis 1.0.0 -> 2.6.0 Maven updates: * animal-sniffer-maven-plugin 1.15 -> 1.16 Bug: 546373 Change-Id: I9d24ffff5769631ad70c443d24056212ea8eb5ba Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF index 0666c69..086174b 100644 --- a/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ org.eclipse.e4.core.services, org.eclipse.e4.core.contexts, org.eclipse.e4.core.di, - org.eclipse.jdt.annotation;bundle-version="[1.0.0,2.0.0)";resolution:=optional, + org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)";resolution:=optional, org.eclipse.emf.ecore Import-Package: com.google.common.annotations;version="[21.0.0,22.0.0)";resolution:=optional, com.google.common.base;version="[21.0.0,22.0.0)",
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF index b9af602..4181714 100644 --- a/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ org.eclipse.e4.ui.services, org.eclipse.emf.databinding, org.eclipse.jface.databinding, - org.eclipse.jdt.annotation;bundle-version="[1.0.0,2.0.0)";resolution:=optional, + org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)";resolution:=optional, org.eclipse.ui, org.eclipse.ui.forms, org.eclipse.mylyn.commons.workbench,
diff --git a/features/org.eclipse.epp.logging.sdk.feature/feature.xml b/features/org.eclipse.epp.logging.sdk.feature/feature.xml index e49964a..b0e939a 100644 --- a/features/org.eclipse.epp.logging.sdk.feature/feature.xml +++ b/features/org.eclipse.epp.logging.sdk.feature/feature.xml
@@ -20,20 +20,6 @@ </license> <plugin - id="org.hamcrest" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.hamcrest.library" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.hamcrest.core" download-size="0" install-size="0" @@ -41,14 +27,7 @@ unpack="false"/> <plugin - id="org.hamcrest.text" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.hamcrest.integration" + id="org.hamcrest.library" download-size="0" install-size="0" version="0.0.0"
diff --git a/pom.xml b/pom.xml index 223f42a..4873073 100644 --- a/pom.xml +++ b/pom.xml
@@ -355,7 +355,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <configuration> <signature> <groupId>org.codehaus.mojo.signature</groupId>
diff --git a/releng/targets/2018-12/2018-12.target b/releng/targets/2018-12/2018-12.target index c14cdf7..bb6b5c3 100644 --- a/releng/targets/2018-12/2018-12.target +++ b/releng/targets/2018-12/2018-12.target
@@ -34,13 +34,13 @@ <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/> <unit id="org.apache.lucene.core" version="7.5.0.v20181003-1532"/> <unit id="org.apache.lucene.analyzers-common" version="7.5.0.v20181003-1532"/> -<unit id="org.hamcrest" version="1.1.0.v20090501071000"/> -<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> +<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> -<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> <unit id="org.junit" version="4.12.0.v201504281640"/> -<unit id="org.mockito" version="1.9.5.v201605172210"/> -<unit id="org.objenesis" version="1.0.0.v201505121915"/> +<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> +<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> +<unit id="org.mockito" version="2.23.0.v20181106-1534"/> +<unit id="org.objenesis" version="2.6.0.v20180420-1519"/> <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/> <unit id="org.yaml.snakeyaml" version="1.14.0.v201604211500"/> <!-- Recommended Orbit build for 2018-12 -->
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF index de80701..36fb731 100644 --- a/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF
@@ -7,19 +7,18 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Fragment-Host: org.eclipse.epp.logging.aeri.core -Require-Bundle: org.hamcrest;bundle-version="1.1.0", - org.hamcrest.core;bundle-version="1.3.0", - org.junit;bundle-version="4.11.0", - org.mockito;bundle-version="1.9.5", +Require-Bundle: org.hamcrest.core;bundle-version="1.3.0", + org.hamcrest.library;bundle-version="1.3.0", + org.junit;bundle-version="4.12.0", + org.mockito;bundle-version="2.23.0", org.eclipse.e4.ui.workbench, org.eclipse.e4.core.di, org.eclipse.e4.ui.model.workbench, org.eclipse.osgi.services, - org.objenesis, org.eclipse.equinox.p2.core, org.apache.commons.logging, org.eclipse.equinox.event, - org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)", + org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)", org.eclipse.ui, org.apache.httpcomponents.httpclient, org.apache.httpcomponents.httpcore,
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/ReportsTest.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/ReportsTest.java index deb63ed..b8e65ac 100644 --- a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/ReportsTest.java +++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/ReportsTest.java
@@ -13,7 +13,6 @@ import static org.eclipse.emf.ecore.util.EcoreUtil.getAllContents; import static org.eclipse.epp.logging.aeri.core.util.Reports.newStatus; import static org.eclipse.epp.logging.aeri.tests.util.TestReports.*; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat;
diff --git a/tests/org.eclipse.epp.logging.aeri.ide.manual/META-INF/MANIFEST.MF b/tests/org.eclipse.epp.logging.aeri.ide.manual/META-INF/MANIFEST.MF index a1eecc8..d17f6fa 100644 --- a/tests/org.eclipse.epp.logging.aeri.ide.manual/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.epp.logging.aeri.ide.manual/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)", +Require-Bundle: org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)", org.eclipse.ui, org.eclipse.epp.logging.aeri.tests, org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.epp.logging.aeri.ide.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.epp.logging.aeri.ide.tests/META-INF/MANIFEST.MF index a2003a0..7aa20ef 100644 --- a/tests/org.eclipse.epp.logging.aeri.ide.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.epp.logging.aeri.ide.tests/META-INF/MANIFEST.MF
@@ -7,11 +7,10 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Fragment-Host: org.eclipse.epp.logging.aeri.ide -Require-Bundle: org.hamcrest;bundle-version="1.1.0", - org.hamcrest.core;bundle-version="1.3.0", - org.junit;bundle-version="4.11.0", - org.mockito;bundle-version="1.9.5", - org.objenesis, - org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)", +Require-Bundle: org.hamcrest.core;bundle-version="1.3.0", + org.hamcrest.library;bundle-version="1.3.0", + org.junit;bundle-version="4.12.0", + org.mockito;bundle-version="2.23.0", + org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)", org.eclipse.epp.logging.aeri.tests Import-Package: org.apache.commons.lang3.builder
diff --git a/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/logging/aeri/ide/processors/CachingStringProcessorTest.java b/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/logging/aeri/ide/processors/CachingStringProcessorTest.java index 7248492..35d1557 100644 --- a/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/logging/aeri/ide/processors/CachingStringProcessorTest.java +++ b/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/logging/aeri/ide/processors/CachingStringProcessorTest.java
@@ -24,7 +24,7 @@ public class CachingStringProcessorTest { - protected class TestCachingStringProcessor extends AbstractCachingStringProcessor { + public class TestCachingStringProcessor extends AbstractCachingStringProcessor { private TestCachingStringProcessor(IProcessorDescriptor descriptor) { super(descriptor); }
diff --git a/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF index 36d8933..6ddeb6a 100644 --- a/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.epp.logging.aeri.core, org.eclipse.core.runtime, org.yaml.snakeyaml, - org.eclipse.jdt.annotation;bundle-version="2.0.0", + org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)", org.eclipse.emf.ecore Export-Package: org.eclipse.epp.logging.aeri.tests, org.eclipse.epp.logging.aeri.tests.scenarios,