Skip to content

Commit 1531777

Browse files
newgronewgro
committed
Update to springboot 4.0.6
1 parent de8037d commit 1531777

19 files changed

Lines changed: 537 additions & 472 deletions

File tree

‎pom.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.giffing.wicket.spring.boot.starter</groupId>
66
<artifactId>wicket-spring-boot-starter-parent</artifactId>
7-
<version>4.1.1</version>
7+
<version>5.0.0</version>
88
<packaging>pom</packaging>
99

1010
<name>Wicket Spring Boot Starter Parent</name>
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.boot</groupId>
2424
<artifactId>spring-boot-starter-parent</artifactId>
25-
<version>3.5.5</version>
25+
<version>4.0.6</version>
2626
<relativePath /> <!-- lookup parent from repository -->
2727
</parent>
2828

@@ -36,7 +36,7 @@
3636
<scm>
3737
<url>https://github.com/MarcGiffing/wicket-spring-boot/</url>
3838
<connection>scm:git:https://github.com/MarcGiffing/wicket-spring-boot.git</connection>
39-
<tag>wicket-spring-boot-starter-parent-3.1.2</tag>
39+
<tag>wicket-spring-boot-starter-parent-5.0.0</tag>
4040
</scm>
4141

4242
<developers>
@@ -52,10 +52,11 @@
5252

5353
<properties>
5454
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
55-
<java.version>17</java.version>
56-
<apache-shiro.version>2.0.5</apache-shiro.version>
57-
<wicket.version>10.6.0</wicket.version>
58-
<wicketstuff.version>10.6.0</wicketstuff.version>
55+
<java.version>21</java.version>
56+
<apache-shiro.version>2.1.0</apache-shiro.version>
57+
<wicket.version>10.8.0</wicket.version>
58+
<wicketstuff.version>10.8.0</wicketstuff.version>
59+
<wicket-webjars.version>4.0.14</wicket-webjars.version>
5960
</properties>
6061

6162
<dependencyManagement>
@@ -168,7 +169,7 @@
168169
<dependency>
169170
<groupId>de.agilecoders.wicket.webjars</groupId>
170171
<artifactId>wicket-webjars</artifactId>
171-
<version>4.0.11</version>
172+
<version>${wicket-webjars.version}</version>
172173
</dependency>
173174
<!-- Wicket datastore dependencies -->
174175
<dependency>

‎wicket-spring-boot-context/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.giffing.wicket.spring.boot.starter</groupId>
66
<artifactId>wicket-spring-boot-starter-parent</artifactId>
7-
<version>4.1.1</version>
7+
<version>5.0.0</version>
88
</parent>
99

1010
<artifactId>wicket-spring-boot-context</artifactId>

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.giffing.wicket.spring.boot.starter</groupId>
88
<artifactId>wicket-spring-boot-starter-parent</artifactId>
9-
<version>4.1.1</version>
9+
<version>5.0.0</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

@@ -18,8 +18,9 @@
1818
<properties>
1919
<maven.deploy.skip>true</maven.deploy.skip>
2020
<maven.javadoc.skip>true</maven.javadoc.skip>
21-
<wicket-bootstrap.version>7.0.11</wicket-bootstrap.version>
22-
<hibernate-processor.version>7.1.0.Final</hibernate-processor.version>
21+
<wicket-bootstrap.version>7.0.14</wicket-bootstrap.version>
22+
<hibernate-processor.version>7.3.2.Final</hibernate-processor.version>
23+
<jquery-selectors.version>4.0.14</jquery-selectors.version>
2324
</properties>
2425

2526
<dependencies>
@@ -109,11 +110,11 @@
109110
<dependency>
110111
<groupId>de.agilecoders.wicket</groupId>
111112
<artifactId>jquery-selectors</artifactId>
112-
<version>4.0.6</version>
113+
<version>${jquery-selectors.version}</version>
113114
</dependency>
114115
<dependency>
115-
<groupId>org.liquibase</groupId>
116-
<artifactId>liquibase-core</artifactId>
116+
<groupId>org.springframework.boot</groupId>
117+
<artifactId>spring-boot-liquibase</artifactId>
117118
</dependency>
118119
<dependency>
119120
<groupId>org.apache.commons</groupId>
@@ -214,7 +215,7 @@
214215
<plugin>
215216
<groupId>org.apache.maven.plugins</groupId>
216217
<artifactId>maven-compiler-plugin</artifactId>
217-
<version>3.13.0</version>
218+
<version>3.14.1</version>
218219
<configuration>
219220
<source>17</source>
220221
<target>17</target>

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,9 @@ private Specification<Customer> filter(CustomerFilter filter) {
7171
specs.add(CustomerSpecs.hasActive(filter.isActive()));
7272
}
7373

74-
Specification<Customer> spec = null;
75-
for (Specification<Customer> specification : specs) {
76-
if (spec == null) {
77-
spec = Specification.where(specification);
78-
} else {
79-
spec = spec.and(specification);
80-
}
81-
}
82-
83-
return spec;
74+
return specs.stream()
75+
.reduce(Specification::and)
76+
.orElse(Specification.unrestricted());
8477
}
8578

8679
boolean isNotEmpty(String toCheck) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.*;
1212
import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
1313
import de.agilecoders.wicket.core.settings.ITheme;
14-
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
14+
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
1515
import org.apache.wicket.Component;
1616
import org.apache.wicket.markup.html.WebMarkupContainer;
1717
import org.apache.wicket.markup.html.link.AbstractLink;
@@ -39,12 +39,12 @@ protected Navbar newNavbar(String markupId) {
3939
navbar.setBrandName(Model.of("Wicket"));
4040
navbar.addComponents(NavbarComponents.transform(
4141
Navbar.ComponentPosition.LEFT,
42-
new NavbarButton<Void>(CustomerListPage.class, Model.of("Customers")).setIconType(FontAwesome6IconType.person_s),
43-
new NavbarButton<Void>(ChatPage.class, Model.of("Chat")).setIconType(FontAwesome6IconType.rocketchat),
42+
new NavbarButton<Void>(CustomerListPage.class, Model.of("Customers")).setIconType(FontAwesome7IconType.person_s),
43+
new NavbarButton<Void>(ChatPage.class, Model.of("Chat")).setIconType(FontAwesome7IconType.rocketchat),
4444
new NavbarExternalLink(Model.of("https://github.com/MarcGiffing/wicket-spring-boot"))
4545
.setLabel(Model.of("Github"))
4646
.setTarget(BootstrapExternalLink.Target.blank)
47-
.setIconType(FontAwesome6IconType.upload_s))
47+
.setIconType(FontAwesome7IconType.upload_s))
4848
);
4949
var dropdown = new NavbarDropDownButton(Model.of("Themes")) {
5050

@@ -70,7 +70,7 @@ protected List<AbstractLink> newSubMenuButtons(final String buttonMarkupId) {
7070

7171
return subMenu;
7272
}
73-
}.setIconType(FontAwesome6IconType.book_s);
73+
}.setIconType(FontAwesome7IconType.book_s);
7474

7575
navbar.addComponents(new ImmutableNavbarComponent(dropdown, Navbar.ComponentPosition.RIGHT));
7676
return navbar;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import de.agilecoders.wicket.core.markup.html.bootstrap.html.MetaTag;
1111
import de.agilecoders.wicket.core.markup.html.bootstrap.html.MobileViewportMetaTag;
1212
import de.agilecoders.wicket.core.markup.html.references.BootlintHeaderItem;
13-
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6CssReference;
13+
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7CssReference;
1414
import org.apache.wicket.MarkupContainer;
1515
import org.apache.wicket.ajax.AjaxRequestTarget;
1616
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -51,7 +51,7 @@ public void renderHead(IHeaderResponse response) {
5151
super.renderHead(response);
5252

5353
response.render(CssHeaderItem.forReference(CustomStylesCssRessourceReference.INSTANCE));
54-
response.render(CssHeaderItem.forReference(FontAwesome6CssReference.instance()));
54+
response.render(CssHeaderItem.forReference(FontAwesome7CssReference.instance()));
5555
response.render(JavaScriptHeaderItem.forReference(NotyJSReference.INSTANCE));
5656
response.render(JavaScriptHeaderItem.forReference(NotyPackagedJSReference.INSTANCE));
5757
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‎

Lines changed: 69 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,74 @@
11
<html xmlns:wicket="http://wicket.apache.org">
22
<body>
33
<wicket:extend>
4-
<header class="jumbotron subhead" id="content">
5-
<div class="container">
6-
<h1>Customers
7-
<a wicket:id="create"></a>
8-
</h1>
9-
</div>
10-
</header>
11-
12-
<div class="container">
13-
<div wicket:id="feedback"></div>
14-
15-
<form wicket:id="form">
16-
<div class="row">
17-
<div class="col-xs-4 col-md-4">
18-
<div wicket:id="idBorder">
19-
<input type="text" wicket:id="id" class="form-control"/>
20-
</div>
21-
<div wicket:id="usernameLikeBorder">
22-
<input type="text" wicket:id="usernameLike" class="form-control"/>
23-
</div>
24-
</div>
25-
<div class="col-xs-4 col-md-4">
26-
<div wicket:id="firstnameLikeBorder">
27-
<input type="text" wicket:id="firstnameLike" class="form-control"/>
28-
</div>
29-
<div wicket:id="lastnameLikeBorder">
30-
<input type="text" wicket:id="lastnameLike" class="form-control"/>
31-
</div>
32-
</div>
33-
<div class="col-xs-4 col-md-4">
34-
<div wicket:id="activeBorder">
35-
<input type="checkbox" wicket:id="active" class="form-check-input"/>
36-
</div>
37-
</div>
38-
</div>
39-
<button type="submit" class="btn btn-primary">Search</button>
40-
<button type="submit" class="btn btn-secondary" wicket:id="cancel">Cancel</button>
41-
42-
</form>
43-
<hr/>
44-
<form wicket:id="filterForm">
45-
<table wicket:id="table" class="table table-striped table-condensed table-hover"></table>
46-
</form>
47-
</div>
4+
5+
<header class="py-4 bg-light border-bottom mb-4">
6+
<div class="container">
7+
<h1 class="h3 mb-0">
8+
Customers
9+
<a wicket:id="create" class="btn btn-primary btn-sm ms-3"></a>
10+
</h1>
11+
</div>
12+
</header>
13+
14+
<div class="container">
15+
16+
<div wicket:id="feedback"></div>
17+
18+
<form wicket:id="form">
19+
20+
<div class="row mb-3">
21+
22+
<div class="col-md-4">
23+
<div wicket:id="idBorder" class="mb-2">
24+
<input type="text" wicket:id="id" class="form-control"/>
25+
</div>
26+
27+
<div wicket:id="usernameLikeBorder" class="mb-2">
28+
<input type="text" wicket:id="usernameLike" class="form-control"/>
29+
</div>
30+
</div>
31+
32+
<div class="col-md-4">
33+
34+
<div wicket:id="firstnameLikeBorder" class="mb-2">
35+
<input type="text" wicket:id="firstnameLike" class="form-control"/>
36+
</div>
37+
38+
<div wicket:id="lastnameLikeBorder" class="mb-2">
39+
<input type="text" wicket:id="lastnameLike" class="form-control"/>
40+
</div>
41+
42+
</div>
43+
44+
<div class="col-md-4">
45+
46+
<div wicket:id="activeBorder">
47+
<div class="form-check">
48+
<input type="checkbox" wicket:id="active" class="form-check-input"/>
49+
<label wicket:for="active" class="form-check-label">Active</label>
50+
</div>
51+
</div>
52+
53+
</div>
54+
55+
</div>
56+
57+
<div class="d-flex gap-2 mb-3">
58+
<button type="submit" class="btn btn-primary">Search</button>
59+
<button type="submit" class="btn btn-outline-secondary" wicket:id="cancel">Cancel</button>
60+
</div>
61+
62+
</form>
63+
64+
<hr/>
65+
66+
<form wicket:id="filterForm">
67+
<table wicket:id="table" class="table table-striped table-hover"></table>
68+
</form>
69+
70+
</div>
71+
4872
</wicket:extend>
4973
</body>
50-
51-
</html>
74+
</html>

0 commit comments

Comments
 (0)