Merge pull request #231 from squins/framework-updates

Update frameworks and migrate code

Author: MarcGiffing

pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.5</version>
+		<version>3.5.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -53,9 +53,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
-		<apache-shiro.version>2.0.1</apache-shiro.version>
-		<wicket.version>10.2.0</wicket.version>
-		<wicketstuff.version>10.0.0</wicketstuff.version>
+		<apache-shiro.version>2.0.5</apache-shiro.version>
+		<wicket.version>10.6.0</wicket.version>
+		<wicketstuff.version>10.6.0</wicketstuff.version>
 	</properties>
 
 	<dependencyManagement>
@@ -92,11 +92,21 @@
 				<artifactId>wicket-extensions</artifactId>
 				<version>${wicket.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.wicket</groupId>
-				<artifactId>wicket-spring</artifactId>
-				<version>${wicket.version}</version>
-			</dependency>
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-request</artifactId>
+                <version>${wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-spring</artifactId>
+                <version>${wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-util</artifactId>
+                <version>${wicket.version}</version>
+            </dependency>
 			<!-- Wicketstuff dependencies -->
 			<dependency>
 				<groupId>org.wicketstuff</groupId>
@@ -158,7 +168,7 @@
 			<dependency>
 				<groupId>de.agilecoders.wicket.webjars</groupId>
 				<artifactId>wicket-webjars</artifactId>
-				<version>4.0.5</version>
+				<version>4.0.11</version>
 			</dependency>
 			<!-- Wicket datastore dependencies -->
 			<dependency>
@@ -245,7 +255,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.7</version>
+						<version>3.2.8</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -259,6 +269,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
+                        <version>3.3.1</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>
@@ -271,6 +282,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.11.3</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>

wicket-spring-boot-starter-example/pom.xml

@@ -18,8 +18,8 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <wicket-bootstrap.version>7.0.8</wicket-bootstrap.version>
-        <hibernate-processor.version>7.0.0.Beta1</hibernate-processor.version>
+        <wicket-bootstrap.version>7.0.11</wicket-bootstrap.version>
+        <hibernate-processor.version>7.1.0.Final</hibernate-processor.version>
     </properties>
 
     <dependencies>

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

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

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

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();