diff --git a/pom.xml b/pom.xml index a5c57143..aa44ef9f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.5 + 3.5.5 @@ -53,9 +53,9 @@ UTF-8 17 - 2.0.1 - 10.2.0 - 10.0.0 + 2.0.5 + 10.6.0 + 10.6.0 @@ -92,11 +92,21 @@ wicket-extensions ${wicket.version} - - org.apache.wicket - wicket-spring - ${wicket.version} - + + org.apache.wicket + wicket-request + ${wicket.version} + + + org.apache.wicket + wicket-spring + ${wicket.version} + + + org.apache.wicket + wicket-util + ${wicket.version} + org.wicketstuff @@ -158,7 +168,7 @@ de.agilecoders.wicket.webjars wicket-webjars - 4.0.5 + 4.0.11 @@ -245,7 +255,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts @@ -259,6 +269,7 @@ org.apache.maven.plugins maven-source-plugin + 3.3.1 attach-sources @@ -271,6 +282,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.11.3 attach-javadocs diff --git a/wicket-spring-boot-starter-example/pom.xml b/wicket-spring-boot-starter-example/pom.xml index bb4eaa77..3fcc9b2c 100644 --- a/wicket-spring-boot-starter-example/pom.xml +++ b/wicket-spring-boot-starter-example/pom.xml @@ -18,8 +18,8 @@ true true - 7.0.8 - 7.0.0.Beta1 + 7.0.11 + 7.1.0.Final diff --git a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/WicketBaseTest.java b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/WicketBaseTest.java index 57e9e2ef..32e6e650 100644 --- a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/WicketBaseTest.java +++ b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/WicketBaseTest.java @@ -11,12 +11,12 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.context.ApplicationContext; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.util.ReflectionTestUtils; import test.com.giffing.wicket.spring.boot.example.web.WicketWebApplicationConfig; @@ -44,7 +44,7 @@ public class WicketBaseTest { @Autowired private ApplicationContext applicationContextMock; - @SpyBean + @MockitoBean private CustomAuthenticationManager customAuthenticationManager; @BeforeEach diff --git a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/CustomerListPageTest.java b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/CustomerListPageTest.java index 3d5c9393..0b6764e7 100644 --- a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/CustomerListPageTest.java +++ b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/CustomerListPageTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import com.giffing.wicket.spring.boot.example.model.Customer; import com.giffing.wicket.spring.boot.example.repository.services.customer.CustomerRepositoryService; @@ -26,7 +26,7 @@ public class CustomerListPageTest extends WicketBaseTest { private static final long CUSTOMERS_COUNT = 5; - @MockBean + @MockitoBean private CustomerRepositoryService repository; @Override diff --git a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/create/CustomerCreatePageTest.java b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/create/CustomerCreatePageTest.java index a199d7ff..65bb512c 100644 --- a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/create/CustomerCreatePageTest.java +++ b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/create/CustomerCreatePageTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -18,7 +18,7 @@ public class CustomerCreatePageTest extends WicketBaseTest { - @MockBean + @MockitoBean private CustomerRepositoryService repository; @Override diff --git a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/edit/CustomerEditPageTest.java b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/edit/CustomerEditPageTest.java index 2e5b46bb..85eeef87 100644 --- a/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/edit/CustomerEditPageTest.java +++ b/wicket-spring-boot-starter-example/src/test/java/com/giffing/wicket/spring/boot/example/web/pages/customers/edit/CustomerEditPageTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import com.giffing.wicket.spring.boot.example.model.Customer; import com.giffing.wicket.spring.boot.example.repository.services.customer.CustomerRepositoryService; @@ -24,7 +24,7 @@ public class CustomerEditPageTest extends WicketBaseTest { private static final Long CUSTOMERS_COUNT = 5L; - @MockBean + @MockitoBean private CustomerRepositoryService repository; @Override @@ -39,7 +39,6 @@ public void setUp(){ } - @Test public void assert_customer_not_exists(){ PageParameters params = new PageParameters();