Update springboot 4

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.giffing.wicket.spring.boot.starter</groupId>
 	<artifactId>wicket-spring-boot-starter-parent</artifactId>
-	<version>4.1.1</version>
+	<version>5.0.0</version>
 	<packaging>pom</packaging>
 
 	<name>Wicket Spring Boot Starter Parent</name>
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.5</version>
+		<version>4.0.6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -36,7 +36,7 @@
 	<scm>
 		<url>https://github.com/MarcGiffing/wicket-spring-boot/</url>
 		<connection>scm:git:https://github.com/MarcGiffing/wicket-spring-boot.git</connection>
-		<tag>wicket-spring-boot-starter-parent-3.1.2</tag>
+		<tag>wicket-spring-boot-starter-parent-5.0.0</tag>
 	</scm>
 
 	<developers>
@@ -53,9 +53,10 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
-		<apache-shiro.version>2.0.5</apache-shiro.version>
-		<wicket.version>10.6.0</wicket.version>
-		<wicketstuff.version>10.6.0</wicketstuff.version>
+		<apache-shiro.version>2.1.0</apache-shiro.version>
+		<wicket.version>10.8.0</wicket.version>
+		<wicketstuff.version>10.8.0</wicketstuff.version>
+		<wicket-webjars.version>4.0.14</wicket-webjars.version>
 	</properties>
 
 	<dependencyManagement>
@@ -168,7 +169,7 @@
 			<dependency>
 				<groupId>de.agilecoders.wicket.webjars</groupId>
 				<artifactId>wicket-webjars</artifactId>
-				<version>4.0.11</version>
+				<version>${wicket-webjars.version}</version>
 			</dependency>
 			<!-- Wicket datastore dependencies -->
 			<dependency>

wicket-spring-boot-context/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.giffing.wicket.spring.boot.starter</groupId>
 		<artifactId>wicket-spring-boot-starter-parent</artifactId>
-		<version>4.1.1</version>
+		<version>5.0.0</version>
 	</parent>
 
 	<artifactId>wicket-spring-boot-context</artifactId>

wicket-spring-boot-context/src/main/java/com/giffing/wicket/spring/boot/context/extensions/types/TypeParser.java

@@ -4,7 +4,6 @@
 import lombok.NoArgsConstructor;
 import org.apache.wicket.util.lang.Bytes;
 
-import com.giffing.wicket.spring.boot.context.exceptions.WicketSpringBootException;
 import java.time.Duration;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

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

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.giffing.wicket.spring.boot.starter</groupId>
         <artifactId>wicket-spring-boot-starter-parent</artifactId>
-        <version>4.1.1</version>
+        <version>5.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -18,8 +18,9 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <wicket-bootstrap.version>7.0.11</wicket-bootstrap.version>
-        <hibernate-processor.version>7.1.0.Final</hibernate-processor.version>
+        <wicket-bootstrap.version>7.0.14</wicket-bootstrap.version>
+        <hibernate-processor.version>7.3.2.Final</hibernate-processor.version>
+        <jquery-selectors.version>4.0.14</jquery-selectors.version>
     </properties>
 
     <dependencies>
@@ -109,11 +110,11 @@
         <dependency>
             <groupId>de.agilecoders.wicket</groupId>
             <artifactId>jquery-selectors</artifactId>
-            <version>4.0.6</version>
+            <version>${jquery-selectors.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-liquibase</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -214,7 +215,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.14.1</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/repository/services/customer/CustomerRepositoryServiceImpl.java

@@ -71,16 +71,9 @@ private Specification<Customer> filter(CustomerFilter filter) {
             specs.add(CustomerSpecs.hasActive(filter.isActive()));
         }
 
-        Specification<Customer> spec = null;
-        for (Specification<Customer> specification : specs) {
-            if (spec == null) {
-                spec = Specification.where(specification);
-            } else {
-                spec = spec.and(specification);
-            }
-        }
-
-        return spec;
+        return specs.stream()
+        		.reduce(Specification::and)
+        		.orElse(Specification.unrestricted());
     }
 
     boolean isNotEmpty(String toCheck) {

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/html/modal/YesNoModal.html

@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.apache.org">
+<html xmlns:wicket="http://wicket.apache.org" lang="en">
 <head>
     <title>TextContentModal</title>
 </head>

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/html/modal/YesNoPanel.html

@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.apache.org">
+<html xmlns:wicket="http://wicket.apache.org" lang="en">
 <head>
         <title>TextContentModal</title>
 </head>

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/html/panel/FeedbackPanel.html

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<html xmlns:wicket="http://wicket.apache.org">
+<html xmlns:wicket="http://wicket.apache.org" lang="en">
 <body>
 <wicket:panel>
   <div wicket:id="feedbackul" class="feedbackPanel">

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/pages/BaseAuthenticatedPage.java

@@ -11,7 +11,7 @@
 import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.*;
 import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
 import de.agilecoders.wicket.core.settings.ITheme;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.link.AbstractLink;
@@ -39,12 +39,12 @@ protected Navbar newNavbar(String markupId) {
         navbar.setBrandName(Model.of("Wicket"));
         navbar.addComponents(NavbarComponents.transform(
                 Navbar.ComponentPosition.LEFT,
-                new NavbarButton<Void>(CustomerListPage.class, Model.of("Customers")).setIconType(FontAwesome6IconType.person_s),
-                new NavbarButton<Void>(ChatPage.class, Model.of("Chat")).setIconType(FontAwesome6IconType.rocketchat),
+                new NavbarButton<Void>(CustomerListPage.class, Model.of("Customers")).setIconType(FontAwesome7IconType.person_s),
+                new NavbarButton<Void>(ChatPage.class, Model.of("Chat")).setIconType(FontAwesome7IconType.rocketchat),
                 new NavbarExternalLink(Model.of("https://github.com/MarcGiffing/wicket-spring-boot"))
                         .setLabel(Model.of("Github"))
                         .setTarget(BootstrapExternalLink.Target.blank)
-                        .setIconType(FontAwesome6IconType.upload_s))
+                        .setIconType(FontAwesome7IconType.upload_s))
         );
         var dropdown = new NavbarDropDownButton(Model.of("Themes")) {
 
@@ -70,7 +70,7 @@ protected List<AbstractLink> newSubMenuButtons(final String buttonMarkupId) {
 
                 return subMenu;
             }
-        }.setIconType(FontAwesome6IconType.book_s);
+        }.setIconType(FontAwesome7IconType.book_s);
 
         navbar.addComponents(new ImmutableNavbarComponent(dropdown, Navbar.ComponentPosition.RIGHT));
         return navbar;

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/pages/BasePage.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
+<html xmlns:wicket="http://wicket.apache.org" lang="en">
     <head>
         <meta charset="utf-8">
         <title>Apache Wicket &amp; Spring Bootstrap</title>

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/pages/BasePage.java

@@ -10,7 +10,7 @@
 import de.agilecoders.wicket.core.markup.html.bootstrap.html.MetaTag;
 import de.agilecoders.wicket.core.markup.html.bootstrap.html.MobileViewportMetaTag;
 import de.agilecoders.wicket.core.markup.html.references.BootlintHeaderItem;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6CssReference;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7CssReference;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.head.CssHeaderItem;
@@ -51,7 +51,7 @@ public void renderHead(IHeaderResponse response) {
         super.renderHead(response);
 
         response.render(CssHeaderItem.forReference(CustomStylesCssRessourceReference.INSTANCE));
-        response.render(CssHeaderItem.forReference(FontAwesome6CssReference.instance()));
+        response.render(CssHeaderItem.forReference(FontAwesome7CssReference.instance()));
         response.render(JavaScriptHeaderItem.forReference(NotyJSReference.INSTANCE));
         response.render(JavaScriptHeaderItem.forReference(NotyPackagedJSReference.INSTANCE));
         response.render(JavaScriptHeaderItem.forReference(NotyThemeBootstrapJSReference.INSTANCE));

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/pages/customers/CustomerListPage.html

@@ -1,51 +1,74 @@
-<html xmlns:wicket="http://wicket.apache.org">
+<html xmlns:wicket="http://wicket.apache.org" lang="en">
 <body>
 <wicket:extend>
-    <header class="jumbotron subhead" id="content">
-        <div class="container">
-            <h1>Customers
-                <a wicket:id="create"></a>
-            </h1>
-        </div>
-    </header>
-
-    <div class="container">
-        <div wicket:id="feedback"></div>
-
-        <form wicket:id="form">
-            <div class="row">
-                <div class="col-xs-4 col-md-4">
-                    <div wicket:id="idBorder">
-                        <input type="text" wicket:id="id" class="form-control"/>
-                    </div>
-                    <div wicket:id="usernameLikeBorder">
-                        <input type="text" wicket:id="usernameLike" class="form-control"/>
-                    </div>
-                </div>
-                <div class="col-xs-4 col-md-4">
-                    <div wicket:id="firstnameLikeBorder">
-                        <input type="text" wicket:id="firstnameLike" class="form-control"/>
-                    </div>
-                    <div wicket:id="lastnameLikeBorder">
-                        <input type="text" wicket:id="lastnameLike" class="form-control"/>
-                    </div>
-                </div>
-                <div class="col-xs-4 col-md-4">
-                    <div wicket:id="activeBorder">
-                        <input type="checkbox" wicket:id="active" class="form-check-input"/>
-                    </div>
-                </div>
-            </div>
-            <button type="submit" class="btn btn-primary">Search</button>
-            <button type="submit" class="btn btn-secondary" wicket:id="cancel">Cancel</button>
-
-        </form>
-        <hr/>
-        <form wicket:id="filterForm">
-            <table wicket:id="table" class="table table-striped table-condensed table-hover"></table>
-        </form>
-    </div>
+
+<header class="py-4 bg-light border-bottom mb-4">
+	<div class="container">
+		<h1 class="h3 mb-0">
+			Customers
+			<a wicket:id="create" class="btn btn-primary btn-sm ms-3"></a>
+		</h1>
+	</div>
+</header>
+
+<div class="container">
+
+	<div wicket:id="feedback"></div>
+
+	<form wicket:id="form">
+
+		<div class="row mb-3">
+
+			<div class="col-md-4">
+				<div wicket:id="idBorder" class="mb-2">
+					<input type="text" wicket:id="id" class="form-control"/>
+				</div>
+
+				<div wicket:id="usernameLikeBorder" class="mb-2">
+					<input type="text" wicket:id="usernameLike" class="form-control"/>
+				</div>
+			</div>
+
+			<div class="col-md-4">
+
+				<div wicket:id="firstnameLikeBorder" class="mb-2">
+					<input type="text" wicket:id="firstnameLike" class="form-control"/>
+				</div>
+
+				<div wicket:id="lastnameLikeBorder" class="mb-2">
+					<input type="text" wicket:id="lastnameLike" class="form-control"/>
+				</div>
+
+			</div>
+
+			<div class="col-md-4">
+
+				<div wicket:id="activeBorder">
+					<div class="form-check">
+						<input type="checkbox" wicket:id="active" class="form-check-input"/>
+						<label wicket:for="active" class="form-check-label">Active</label>
+					</div>
+				</div>
+
+			</div>
+
+		</div>
+
+		<div class="d-flex gap-2 mb-3">
+			<button type="submit" class="btn btn-primary">Search</button>
+			<button type="submit" class="btn btn-outline-secondary" wicket:id="cancel">Cancel</button>
+		</div>
+
+	</form>
+
+	<hr/>
+
+	<form wicket:id="filterForm">
+		<table wicket:id="table" class="table table-striped table-hover"></table>
+	</form>
+
+</div>
+
 </wicket:extend>
 </body>
-
-</html>
+</html>