Upgrade hamcrest to 2.1

https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md#version-21-21st-december-2018

Change-Id: I6a1bfc069aeb7444cec0e24115ca8a6f4a9fbb18
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bundles-test-lib/pom.xml b/bundles-test-lib/pom.xml
index f5b83ba52c9fe8bbfb337b1f41faa1f3f13c302a..baec2517ae346aa8a604c8ae090f936218015e74 100644 (file)
--- a/bundles-test-lib/pom.xml
+++ b/bundles-test-lib/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <artifactId>hamcrest</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/bundles4-test/pom.xml b/bundles4-test/pom.xml
index 634804b806e9df2efa59060174fa0e36955fcba8..5fa96a2a1a681c217fc4227431200e5c53ae6cb3 100644 (file)
--- a/bundles4-test/pom.xml
+++ b/bundles4-test/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <artifactId>hamcrest</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index 51859191127cfee7aec77b410cd4ad5795c6e52d..a13855b78b443db55bf2bacf68128e9163b8e779 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -132,7 +132,7 @@
              have to be repeated here so that the Embed-Dependency below for maven-bundle-plugin works: -->
         <dependency>
           <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
+          <artifactId>hamcrest</artifactId>
           <scope>provided</scope>
         </dependency>
         <dependency>
@@ -171,7 +171,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                   <instructions>
-                    <Embed-Dependency>bundles4-test;inline=true,awaitility;inline=true,hamcrest-core;inline=true</Embed-Dependency>
+                    <Embed-Dependency>bundles4-test;inline=true,awaitility;inline=true,hamcrest;inline=true</Embed-Dependency>
                     <!-- same as in bundles4-test/pom.xml: -->
                     <Import-Package>!net.sf.cglib.proxy,!org.objenesis,*</Import-Package>
                   </instructions>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 6599f715ff0f4faddae9a25a410d718bc5e7b4e3..813d31c18170834e0d4ce05e77f4629a4f05954c 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -456,6 +456,10 @@
             <type>pom</type>
             <version>2.25.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 65669455a6758a3d2e2b03a140d87d9d259e1538..4867b3710a7cd684fdbc1b550e82f2424104a3f4 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -498,7 +498,7 @@
               <links>
                 <link>https://junit.org/junit4/javadoc/4.11</link>
                 <link>http://www.atetric.com/atetric/javadoc/junit/junit/4.11</link>
-                <link>http://hamcrest.org/JavaHamcrest/javadoc/1.3</link>
+                <link>http://hamcrest.org/JavaHamcrest/javadoc/2.1</link>
                 <link>http://google.github.io/truth/api/0.43</link>
                 <link>https://www.slf4j.org/apidocs</link>
                 <link>https://xerces.apache.org/xerces2-j/javadocs/api</link>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 12cfc7fbb666e6ab86a9a6fa68ce759d773b85d9..0aaf4189699c9adb18e7c4875a114ef1df941b33 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -143,15 +143,21 @@
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
+        <artifactId>hamcrest</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>1.3</version>
+        <version>2.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>2.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-library</artifactId>
-        <version>1.3</version>
+        <version>2.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1130,6 +1136,17 @@
     <!--
           Unit tests can use JUnit + Mockito + Hamcrest by default.
     -->
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- This dependency needs to come before junit until we upgrade to JUnit 5. -->
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>