Skip to content

Commit 666905d

Browse files
rstoyanchevrstoyanchev
committed
Merge upgrade of booking-mvc to Web Flow 3
2 parents 65a16fe + 91a1866 commit 666905d

Some content is hidden

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

50 files changed

+1742
-802
lines changed

‎booking-mvc/pom.xml‎

Lines changed: 31 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -52,89 +52,71 @@
5252
</dependency>
5353
<!-- Servlet -->
5454
<dependency>
55-
<groupId>javax.servlet</groupId>
56-
<artifactId>javax.servlet-api</artifactId>
55+
<groupId>jakarta.servlet</groupId>
56+
<artifactId>jakarta.servlet-api</artifactId>
5757
<version>${servlet.version}</version>
5858
<scope>provided</scope>
5959
</dependency>
6060
<dependency>
61-
<groupId>javax.servlet.jsp</groupId>
62-
<artifactId>jsp-api</artifactId>
63-
<version>2.1</version>
61+
<groupId>jakarta.servlet.jsp</groupId>
62+
<artifactId>jakarta.servlet.jsp-api</artifactId>
63+
<version>${jsp-api.version}</version>
6464
<scope>provided</scope>
6565
</dependency>
6666
<dependency>
67-
<groupId>javax.servlet</groupId>
68-
<artifactId>jstl</artifactId>
69-
<version>1.2</version>
67+
<groupId>jakarta.servlet.jsp.jstl</groupId>
68+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
69+
<version>${jstl-api}</version>
7070
</dependency>
7171
<!-- Thymeleaf -->
7272
<dependency>
7373
<groupId>org.thymeleaf</groupId>
7474
<artifactId>thymeleaf</artifactId>
75-
<version>2.1.5.RELEASE</version>
75+
<version>3.1.0.M1</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.thymeleaf</groupId>
79-
<artifactId>thymeleaf-spring4</artifactId>
80-
<version>2.1.5.RELEASE</version>
79+
<artifactId>thymeleaf-spring6</artifactId>
80+
<version>3.1.0.M1</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.thymeleaf.extras</groupId>
84-
<artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
85-
<version>2.1.1.RELEASE</version>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.thymeleaf.extras</groupId>
89-
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
90-
<version>2.1.2.RELEASE</version>
84+
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
85+
<version>3.1.0.M1</version>
9186
</dependency>
87+
<!--
9288
<dependency>
9389
<groupId>org.thymeleaf.extras</groupId>
9490
<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
9591
<version>2.1.2.RELEASE</version>
9692
</dependency>
97-
<!-- Apache Tiles -->
98-
<dependency>
99-
<groupId>org.apache.tiles</groupId>
100-
<artifactId>tiles-core</artifactId>
101-
<version>${tiles.version}</version>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.apache.tiles</groupId>
105-
<artifactId>tiles-api</artifactId>
106-
<version>${tiles.version}</version>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.apache.tiles</groupId>
110-
<artifactId>tiles-template</artifactId>
111-
<version>${tiles.version}</version>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.apache.tiles</groupId>
115-
<artifactId>tiles-servlet</artifactId>
116-
<version>${tiles.version}</version>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.apache.tiles</groupId>
120-
<artifactId>tiles-jsp</artifactId>
121-
<version>${tiles.version}</version>
122-
</dependency>
93+
-->
12394
<!-- Database, JPA -->
12495
<dependency>
12596
<groupId>org.hsqldb</groupId>
12697
<artifactId>hsqldb</artifactId>
12798
<version>${hsqldb.version}</version>
12899
<scope>runtime</scope>
129100
</dependency>
101+
<dependency>
102+
<groupId>org.hibernate</groupId>
103+
<artifactId>hibernate-core-jakarta</artifactId>
104+
<version>${hibernate.version}</version>
105+
</dependency>
130106
<dependency>
131107
<groupId>org.hibernate</groupId>
132108
<artifactId>hibernate-entitymanager</artifactId>
133109
<version>${hibernate.version}</version>
110+
<exclusions>
111+
<exclusion>
112+
<groupId>org.hibernate</groupId>
113+
<artifactId>hibernate-core</artifactId>
114+
</exclusion>
115+
</exclusions>
134116
</dependency>
135117
<!-- JSR 303 with Hibernate Validator -->
136118
<dependency>
137-
<groupId>org.hibernate</groupId>
119+
<groupId>org.hibernate.validator</groupId>
138120
<artifactId>hibernate-validator</artifactId>
139121
<version>${hibernate-validator.version}</version>
140122
</dependency>
@@ -212,16 +194,16 @@
212194
<plugin>
213195
<groupId>org.apache.maven.plugins</groupId>
214196
<artifactId>maven-compiler-plugin</artifactId>
215-
<version>3.7.0</version>
197+
<version>3.10.1</version>
216198
<configuration>
217-
<source>1.8</source>
218-
<target>1.8</target>
199+
<source>17</source>
200+
<target>17</target>
219201
</configuration>
220202
</plugin>
221203
<plugin>
222204
<groupId>org.apache.maven.plugins</groupId>
223205
<artifactId>maven-surefire-plugin</artifactId>
224-
<version>2.20.1</version>
206+
<version>2.22.2</version>
225207
<configuration>
226208
<junitArtifactName>junit:junit</junitArtifactName>
227209
<includes>

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
import java.util.Date;
88
import java.util.Set;
99

10-
import javax.persistence.Basic;
11-
import javax.persistence.Entity;
12-
import javax.persistence.GeneratedValue;
13-
import javax.persistence.GenerationType;
14-
import javax.persistence.Id;
15-
import javax.persistence.ManyToOne;
16-
import javax.persistence.Temporal;
17-
import javax.persistence.TemporalType;
18-
import javax.persistence.Transient;
19-
import javax.validation.constraints.Future;
20-
import javax.validation.constraints.NotNull;
10+
import jakarta.persistence.Basic;
11+
import jakarta.persistence.Entity;
12+
import jakarta.persistence.GeneratedValue;
13+
import jakarta.persistence.GenerationType;
14+
import jakarta.persistence.Id;
15+
import jakarta.persistence.ManyToOne;
16+
import jakarta.persistence.Temporal;
17+
import jakarta.persistence.TemporalType;
18+
import jakarta.persistence.Transient;
19+
import jakarta.validation.constraints.Future;
20+
import jakarta.validation.constraints.NotNull;
2121

2222
import org.hibernate.validator.constraints.NotEmpty;
2323
import org.springframework.format.annotation.DateTimeFormat;

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.lang.annotation.RetentionPolicy;
66
import java.lang.annotation.Target;
77

8-
import javax.validation.Constraint;
9-
import javax.validation.Payload;
8+
import jakarta.validation.Constraint;
9+
import jakarta.validation.Payload;
1010

1111
@Constraint(validatedBy = BookingDateRangeValidator.class)
1212
@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER })

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.springframework.webflow.samples.booking;
22

3-
import javax.validation.ConstraintValidator;
4-
import javax.validation.ConstraintValidatorContext;
3+
import jakarta.validation.ConstraintValidator;
4+
import jakarta.validation.ConstraintValidatorContext;
55

66
public class BookingDateRangeValidator implements ConstraintValidator<BookingDateRange, Booking> {
77

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingFlowHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.springframework.webflow.samples.booking;
22

3-
import javax.servlet.http.HttpServletRequest;
4-
import javax.servlet.http.HttpServletResponse;
3+
import jakarta.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.http.HttpServletResponse;
55

66
import org.springframework.webflow.core.FlowException;
77
import org.springframework.webflow.execution.FlowExecutionOutcome;

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.io.Serializable;
44
import java.math.BigDecimal;
55

6-
import javax.persistence.Column;
7-
import javax.persistence.Entity;
8-
import javax.persistence.GeneratedValue;
9-
import javax.persistence.Id;
6+
import jakarta.persistence.Column;
7+
import jakarta.persistence.Entity;
8+
import jakarta.persistence.GeneratedValue;
9+
import jakarta.persistence.Id;
1010

1111
/**
1212
* A hotel where users may book stays.

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public HotelsController(BookingService bookingService) {
2121
}
2222

2323
@GetMapping("/hotels/search")
24-
public void search(SearchCriteria searchCriteria, Principal currentUser, Model model) {
24+
public void search(@SuppressWarnings("unused") SearchCriteria searchCriteria, Principal currentUser, Model model) {
2525
if (currentUser != null) {
2626
List<Booking> booking = bookingService.findBookings(currentUser.getName());
2727
model.addAttribute(booking);

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.List;
44

5-
import javax.persistence.EntityManager;
6-
import javax.persistence.PersistenceContext;
5+
import jakarta.persistence.EntityManager;
6+
import jakarta.persistence.PersistenceContext;
77

88
import org.springframework.stereotype.Repository;
99
import org.springframework.stereotype.Service;

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.Serializable;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.Id;
7-
import javax.persistence.Table;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.Id;
7+
import jakarta.persistence.Table;
88

99
/**
1010
* A user who can book hotels.

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/DataAccessConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Collections;
44

5-
import javax.persistence.EntityManagerFactory;
5+
import jakarta.persistence.EntityManagerFactory;
66
import javax.sql.DataSource;
77

88
import org.springframework.context.annotation.Bean;

0 commit comments

Comments
 (0)