Skip to content

Commit 9fc9bfb

Browse files
MarcGiffingMarcGiffing
authored
Merge pull request #234 from newgro/update-springboot-4
Update springboot 4
2 parents 74a6f03 + 5921815 commit 9fc9bfb

60 files changed

Lines changed: 581 additions & 561 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 8 additions & 7 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>
@@ -53,9 +53,10 @@
5353
<properties>
5454
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5555
<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>
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-context/src/main/java/com/giffing/wicket/spring/boot/context/extensions/types/TypeParser.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.NoArgsConstructor;
55
import org.apache.wicket.util.lang.Bytes;
66

7-
import com.giffing.wicket.spring.boot.context.exceptions.WicketSpringBootException;
87
import java.time.Duration;
98

109
@NoArgsConstructor(access = AccessLevel.PRIVATE)

‎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/html/modal/YesNoModal.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html xmlns:wicket="http://wicket.apache.org">
1+
<html xmlns:wicket="http://wicket.apache.org" lang="en">
22
<head>
33
<title>TextContentModal</title>
44
</head>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html xmlns:wicket="http://wicket.apache.org">
1+
<html xmlns:wicket="http://wicket.apache.org" lang="en">
22
<head>
33
<title>TextContentModal</title>
44
</head>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<html xmlns:wicket="http://wicket.apache.org">
2+
<html xmlns:wicket="http://wicket.apache.org" lang="en">
33
<body>
44
<wicket:panel>
55
<div wicket:id="feedbackul" class="feedbackPanel">

‎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.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html xmlns:wicket="http://wicket.apache.org">
2+
<html xmlns:wicket="http://wicket.apache.org" lang="en">
33
<head>
44
<meta charset="utf-8">
55
<title>Apache Wicket &amp; Spring Bootstrap</title>

0 commit comments

Comments
 (0)