You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/07/20 05:39:01 UTC

[syncope] branch master updated: Upgrading Mockito and Wicket-Spring Boot

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 92b0b4a  Upgrading Mockito and Wicket-Spring Boot
92b0b4a is described below

commit 92b0b4a79bfcb9ad7691c566a99c8c2a17823d5e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Jul 20 06:46:06 2020 +0200

    Upgrading Mockito and Wicket-Spring Boot
---
 .../java/org/apache/syncope/core/provisioning/api/AbstractTest.java   | 2 +-
 .../java/org/apache/syncope/core/provisioning/java/AbstractTest.java  | 2 +-
 pom.xml                                                               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
index 9993be0..deccfdd 100644
--- a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
+++ b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
@@ -32,6 +32,6 @@ public class AbstractTest {
 
     @BeforeEach
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 }
diff --git a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
index 1f5cac7..b409c10 100644
--- a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
+++ b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
@@ -57,6 +57,6 @@ public abstract class AbstractTest {
 
     @BeforeEach
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 }
diff --git a/pom.xml b/pom.xml
index e6fbb23..1ccd38e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -451,7 +451,7 @@ under the License.
     <h2.version>1.4.200</h2.version>
 
     <junit.version>5.6.2</junit.version>
-    <mockito.version>3.4.2</mockito.version>
+    <mockito.version>3.4.4</mockito.version>
 
     <swagger-core.version>2.1.3</swagger-core.version>
     <swagger-ui.version>3.28.0</swagger-ui.version>
@@ -471,7 +471,7 @@ under the License.
     <wicket.version>9.0.0</wicket.version>
     <wicket-jqueryui.version>9.0.0-M5.1</wicket-jqueryui.version>
     <wicket-bootstrap.version>5.0.0-M2</wicket-bootstrap.version>
-    <wicket-spring-boot.version>3.0.3-RC</wicket-spring-boot.version>
+    <wicket-spring-boot.version>3.0.4</wicket-spring-boot.version>
 
     <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>