fix build with java17 (#9850) (#9851)

geosolutions-it · Jul 15, 2024 · 9b44b96 · 9b44b96
1 parent 05de4ba
commit 9b44b96
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/binary/bin-war/pom.xml b/binary/bin-war/pom.xml
@@ -29,7 +29,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.4.0</version>
  <configuration>
  <overlays>
  <overlay>

diff --git a/java/services/pom.xml b/java/services/pom.xml
@@ -78,7 +78,7 @@
  <!-- mockito -->
  <dependency>
  <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
  <scope>test</scope>
  </dependency>
  <!-- servlet -->

diff --git a/java/web/pom.xml b/java/web/pom.xml
@@ -47,7 +47,7 @@
  <!-- mockito -->
  <dependency>
  <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
  </dependency>
  <!-- servlet -->
  <dependency>
@@ -76,7 +76,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.4.0</version>
  <configuration>
  <packagingExcludes>WEB-INF/lib/commons-codec-1.2.jar,
  WEB-INF/lib/commons-io-1.1.jar,

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
  <spring.version>5.3.18</spring.version>
  <httpclient.version>4.5.13</httpclient.version>
  <junit.version>4.13.1</junit.version>
- <mockito-all.version>1.9.5</mockito-all.version>
+ <mockito-core.version>4.0.0</mockito-core.version>
  <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
  <ehcache-web.version>2.0.4</ehcache-web.version>
  <commons-pool.version>1.5.4</commons-pool.version>
@@ -144,8 +144,8 @@
  <!-- mockito -->
  <dependency>
  <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
  <scope>test</scope>
  </dependency>
  <!-- servlet -->

diff --git a/product/pom.xml b/product/pom.xml
@@ -255,7 +255,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.4.0</version>
  <configuration>
  <overlays>
  <overlay>

diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml
@@ -21,7 +21,7 @@
  <print-lib.version>2.4-SNAPSHOT</print-lib.version>
  <httpclient.version>4.5.13</httpclient.version>
  <junit.version>4.13.1</junit.version>
- <mockito-all.version>1.9.5</mockito-all.version>
+ <mockito-core.version>4.0.0</mockito-core.version>
  <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
  <ehcache-web.version>2.0.4</ehcache-web.version>
  <commons-pool.version>1.5.4</commons-pool.version>
@@ -64,7 +64,7 @@
  <!-- mockito -->
  <dependency>
  <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
  <version>1.9.5</version>
  <scope>test</scope>
  </dependency>
@@ -373,7 +373,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.4.0</version>
  <configuration>
  <packagingExcludes>WEB-INF/lib/commons-codec-1.2.jar,
  WEB-INF/lib/commons-io-1.1.jar,
@@ -488,8 +488,8 @@
  <!-- mockito -->
  <dependency>
  <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
  </dependency>
  <!-- servlet -->
  <dependency>