Merge pull request #278 from europeana/EA-3648_upgrade_toJdk17

EA-3648 upgrade SR to jdk 17, fix errors , fix hibernate error
europeana · Dec 13, 2023 · c38e67a · c38e67a
2 parents a9797b7 + 36623ba
commit c38e67a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/corelib-record/pom.xml b/corelib-record/pom.xml
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/corelib-search/pom.xml b/corelib-search/pom.xml
@@ -97,7 +97,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/corelib-storage/pom.xml b/corelib-storage/pom.xml
@@ -114,7 +114,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/corelib-web/pom.xml b/corelib-web/pom.xml
@@ -113,7 +113,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <!-- set to compile instead of test to avoid error messages in bean .xml definitions -->
             <scope>compile</scope>

diff --git a/pom.xml b/pom.xml
@@ -49,17 +49,17 @@
         <commonsIO.version>2.4</commonsIO.version>
         <commonsLang3.version>3.12.0</commonsLang3.version>
         <httpclient.version>4.5.13</httpclient.version>
-        <jackson.version>2.14.1</jackson.version>
+        <jackson.version>2.16.0</jackson.version>
         <jibx.version>1.3.3</jibx.version>
         <jodatime.version>2.9.2</jodatime.version>
         <junit.version>4.13.1</junit.version>
         <log4j2.version>2.19.0</log4j2.version>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>3.2.0</mockito.version>
 
         <springBoot.version>1.3.8.RELEASE</springBoot.version>
         <springCore.version>4.3.23.RELEASE</springCore.version>
 
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <dependencyManagement>