Skip to content

Commit d4c810e

Browse files
ctvairplusdarrachequesne
ctvairplus
authored and
darrachequesne
committed
feat: upgrade to Spring Boot 3.0.0
Reference: https://docs.spring.io/spring-boot/docs/3.0.1/reference/html/index.html
1 parent 9b1123d commit d4c810e

28 files changed

+327
-257
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
jdk-version:
16-
- 8
17-
- 11
18-
- 14
16+
- 17
1917

2018
steps:
2119
- name: Checkout repository
@@ -29,7 +27,7 @@ jobs:
2927
cache: maven
3028

3129
- name: Test with Maven
32-
run: mvn test
30+
run: mvn -B test
3331

3432
test-postgres:
3533
runs-on: ubuntu-latest
@@ -51,10 +49,10 @@ jobs:
5149
- name: Checkout repository
5250
uses: actions/checkout@v3
5351

54-
- name: Set up JDK 14
52+
- name: Set up JDK 17
5553
uses: actions/setup-java@v3
5654
with:
57-
java-version: 14
55+
java-version: 17
5856
distribution: adopt
5957
cache: maven
6058

@@ -84,10 +82,10 @@ jobs:
8482
- name: Checkout repository
8583
uses: actions/checkout@v3
8684

87-
- name: Set up JDK 14
85+
- name: Set up JDK 17
8886
uses: actions/setup-java@v3
8987
with:
90-
java-version: 14
88+
java-version: 17
9189
distribution: adopt
9290
cache: maven
9391

‎pom.xml

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.darrachequesne</groupId>
77
<artifactId>spring-data-jpa-datatables</artifactId>
8-
<version>5.2.0</version>
8+
<version>6.0.0-SNAPSHOT</version>
99

1010
<name>Spring Data JPA for DataTables</name>
1111
<description>Spring Data JPA extension to work with the great jQuery plug-in DataTables (http://datatables.net/)</description>
@@ -48,12 +48,12 @@
4848

4949
<properties>
5050
<!-- Version of maven plugins -->
51-
<version.plugin.maven-release-plugin>2.5.2</version.plugin.maven-release-plugin>
52-
<version.plugin.nexus-staging-maven-plugin>1.6.5</version.plugin.nexus-staging-maven-plugin>
53-
<version.plugin.maven-gpg-plugin>1.6</version.plugin.maven-gpg-plugin>
51+
<version.plugin.maven-release-plugin>3.0.0-M7</version.plugin.maven-release-plugin>
52+
<version.plugin.nexus-staging-maven-plugin>1.6.13</version.plugin.nexus-staging-maven-plugin>
53+
<version.plugin.maven-gpg-plugin>3.0.1</version.plugin.maven-gpg-plugin>
5454

5555
<!-- Source encoding -->
56-
<java.version>1.8</java.version>
56+
<java.version>17</java.version>
5757
<maven.compiler.source>${java.version}</maven.compiler.source>
5858
<maven.compiler.target>${java.version}</maven.compiler.target>
5959
<source.encoding>UTF-8</source.encoding>
@@ -64,7 +64,14 @@
6464
<dependency>
6565
<groupId>org.springframework.boot</groupId>
6666
<artifactId>spring-boot-dependencies</artifactId>
67-
<version>2.6.7</version>
67+
<version>3.0.0</version>
68+
<type>pom</type>
69+
<scope>import</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.junit</groupId>
73+
<artifactId>junit-bom</artifactId>
74+
<version>5.9.1</version>
6875
<type>pom</type>
6976
<scope>import</scope>
7077
</dependency>
@@ -89,36 +96,40 @@
8996
</dependency>
9097

9198
<dependency>
92-
<groupId>javax.validation</groupId>
93-
<artifactId>validation-api</artifactId>
99+
<groupId>jakarta.validation</groupId>
100+
<artifactId>jakarta.validation-api</artifactId>
94101
</dependency>
95102

96103
<!-- Hibernate -->
97104
<dependency>
98-
<groupId>org.hibernate</groupId>
99-
<artifactId>hibernate-entitymanager</artifactId>
105+
<groupId>org.hibernate.orm</groupId>
106+
<artifactId>hibernate-core</artifactId>
107+
<version>6.1.4.Final</version>
100108
</dependency>
101-
102109
<dependency>
103110
<groupId>com.querydsl</groupId>
104111
<artifactId>querydsl-apt</artifactId>
112+
<version>5.0.0</version>
113+
<classifier>jakarta</classifier>
105114
</dependency>
106115

107116
<dependency>
108117
<groupId>com.querydsl</groupId>
109118
<artifactId>querydsl-jpa</artifactId>
119+
<version>5.0.0</version>
120+
<classifier>jakarta</classifier>
110121
</dependency>
111122

112123
<dependency>
113-
<groupId>javax.annotation</groupId>
114-
<artifactId>javax.annotation-api</artifactId>
124+
<groupId>jakarta.annotation</groupId>
125+
<artifactId>jakarta.annotation-api</artifactId>
115126
<scope>compile</scope>
116127
</dependency>
117128

118129
<!-- Test -->
119130
<dependency>
120-
<groupId>junit</groupId>
121-
<artifactId>junit</artifactId>
131+
<groupId>org.junit.jupiter</groupId>
132+
<artifactId>junit-jupiter-engine</artifactId>
122133
<scope>test</scope>
123134
</dependency>
124135

@@ -141,8 +152,8 @@
141152
</dependency>
142153

143154
<dependency>
144-
<groupId>mysql</groupId>
145-
<artifactId>mysql-connector-java</artifactId>
155+
<groupId>com.mysql</groupId>
156+
<artifactId>mysql-connector-j</artifactId>
146157
<scope>test</scope>
147158
</dependency>
148159

@@ -154,7 +165,7 @@
154165

155166
<dependency>
156167
<groupId>org.slf4j</groupId>
157-
<artifactId>slf4j-log4j12</artifactId>
168+
<artifactId>slf4j-reload4j</artifactId>
158169
<scope>test</scope>
159170
</dependency>
160171

@@ -164,12 +175,12 @@
164175
<plugins>
165176
<plugin>
166177
<groupId>com.mysema.maven</groupId>
167-
<artifactId>maven-apt-plugin</artifactId>
168-
<version>1.0</version>
178+
<artifactId>apt-maven-plugin</artifactId>
179+
<version>1.1.3</version>
169180
<executions>
170181
<execution>
171182
<goals>
172-
<goal>test-process</goal>
183+
<goal>process</goal>
173184
</goals>
174185
<configuration>
175186
<outputDirectory>target/generated-sources/java</outputDirectory>
@@ -181,7 +192,7 @@
181192
<plugin>
182193
<groupId>org.apache.maven.plugins</groupId>
183194
<artifactId>maven-compiler-plugin</artifactId>
184-
<version>3.8.1</version>
195+
<version>3.10.1</version>
185196
<configuration>
186197
<source>${maven.compiler.source}</source>
187198
<target>${maven.compiler.target}</target>
@@ -191,7 +202,7 @@
191202
<plugin>
192203
<groupId>org.apache.maven.plugins</groupId>
193204
<artifactId>maven-resources-plugin</artifactId>
194-
<version>3.1.0</version>
205+
<version>3.3.0</version>
195206
<configuration>
196207
<encoding>${source.encoding}</encoding>
197208
</configuration>
@@ -215,7 +226,7 @@
215226
<plugin>
216227
<groupId>org.apache.maven.plugins</groupId>
217228
<artifactId>maven-javadoc-plugin</artifactId>
218-
<version>3.2.0</version>
229+
<version>3.4.1</version>
219230
</plugin>
220231
<!-- Nexus Staging Maven Plugin for Deployment and Release into Sonatype
221232
OSSRH -->
@@ -230,6 +241,12 @@
230241
<autoReleaseAfterClose>true</autoReleaseAfterClose>
231242
</configuration>
232243
</plugin>
244+
245+
<plugin>
246+
<groupId>org.apache.maven.plugins</groupId>
247+
<artifactId>maven-surefire-plugin</artifactId>
248+
<version>3.0.0-M7</version>
249+
</plugin>
233250
</plugins>
234251
</build>
235252

‎src/main/java/org/springframework/data/jpa/datatables/ColumnFilter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.querydsl.core.types.Predicate;
55
import com.querydsl.core.types.dsl.*;
66

7-
import javax.persistence.criteria.CriteriaBuilder;
8-
import javax.persistence.criteria.Expression;
9-
import javax.persistence.criteria.From;
7+
import jakarta.persistence.criteria.CriteriaBuilder;
8+
import jakarta.persistence.criteria.Expression;
9+
import jakarta.persistence.criteria.From;
1010
import java.util.HashSet;
1111
import java.util.Set;
1212

@@ -72,7 +72,7 @@ public Predicate createPredicate(PathBuilder<?> pathBuilder, String attributeNam
7272
}
7373

7474
@Override
75-
public javax.persistence.criteria.Predicate createPredicate(From<?, ?> from, CriteriaBuilder criteriaBuilder, String attributeName) {
75+
public jakarta.persistence.criteria.Predicate createPredicate(From<?, ?> from, CriteriaBuilder criteriaBuilder, String attributeName) {
7676
Expression<?> expression = from.get(attributeName);
7777

7878
if (values.isEmpty()) {
@@ -81,7 +81,7 @@ public javax.persistence.criteria.Predicate createPredicate(From<?, ?> from, Cri
8181
return super.createPredicate(from, criteriaBuilder, attributeName);
8282
}
8383

84-
javax.persistence.criteria.Predicate predicate;
84+
jakarta.persistence.criteria.Predicate predicate;
8585
if (isBooleanComparison) {
8686
predicate = expression.in(booleanValues);
8787
} else {

‎src/main/java/org/springframework/data/jpa/datatables/Filter.java

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

33
import com.querydsl.core.types.dsl.PathBuilder;
44

5-
import javax.persistence.criteria.CriteriaBuilder;
6-
import javax.persistence.criteria.From;
7-
import javax.persistence.criteria.Predicate;
5+
import jakarta.persistence.criteria.CriteriaBuilder;
6+
import jakarta.persistence.criteria.From;
7+
import jakarta.persistence.criteria.Predicate;
88

99
interface Filter {
1010

‎src/main/java/org/springframework/data/jpa/datatables/GlobalFilter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.querydsl.core.types.dsl.PathBuilder;
66
import com.querydsl.core.types.dsl.StringOperation;
77

8-
import javax.persistence.criteria.CriteriaBuilder;
9-
import javax.persistence.criteria.Expression;
10-
import javax.persistence.criteria.From;
11-
import javax.persistence.criteria.Predicate;
8+
import jakarta.persistence.criteria.CriteriaBuilder;
9+
import jakarta.persistence.criteria.Expression;
10+
import jakarta.persistence.criteria.From;
11+
import jakarta.persistence.criteria.Predicate;
1212

1313
/**
1414
* Filter which creates a basic "WHERE ... LIKE ..." clause

0 commit comments

Comments
 (0)