Skip to content

Commit 19910d9

Browse files
sourcloudsourcloud
authored
feat!: Update to spring-boot-4-m1 (#274)
1 parent e061af3 commit 19910d9

322 files changed

Lines changed: 772 additions & 2098 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: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<plugin>
5959
<groupId>org.sonatype.central</groupId>
6060
<artifactId>central-publishing-maven-plugin</artifactId>
61-
<version>0.7.0</version>
61+
<version>0.8.0</version>
6262
<extensions>true</extensions>
6363
<configuration>
6464
<publishingServerId>central</publishingServerId>
@@ -79,7 +79,7 @@
7979
<plugin>
8080
<groupId>org.apache.maven.plugins</groupId>
8181
<artifactId>maven-gpg-plugin</artifactId>
82-
<version>3.0.1</version>
82+
<version>3.2.8</version>
8383
<executions>
8484
<execution>
8585
<id>sign-artifacts</id>
@@ -99,7 +99,7 @@
9999
<plugins>
100100
<plugin>
101101
<artifactId>maven-compiler-plugin</artifactId>
102-
<version>3.11.0</version>
102+
<version>3.14.0</version>
103103
<configuration>
104104
<source>17</source>
105105
<target>17</target>
@@ -108,12 +108,12 @@
108108
<plugin>
109109
<groupId>org.apache.maven.plugins</groupId>
110110
<artifactId>maven-surefire-plugin</artifactId>
111-
<version>3.0.0-M8</version>
111+
<version>3.5.3</version>
112112
</plugin>
113113
<plugin>
114114
<groupId>org.apache.maven.plugins</groupId>
115115
<artifactId>maven-source-plugin</artifactId>
116-
<version>3.2.1</version>
116+
<version>3.3.1</version>
117117
<executions>
118118
<execution>
119119
<id>attach-sources</id>
@@ -126,7 +126,7 @@
126126
<plugin>
127127
<groupId>org.apache.maven.plugins</groupId>
128128
<artifactId>maven-javadoc-plugin</artifactId>
129-
<version>3.4.1</version>
129+
<version>3.11.3</version>
130130
<executions>
131131
<execution>
132132
<id>attach-javadocs</id>
@@ -137,25 +137,29 @@
137137
</executions>
138138
</plugin>
139139
<plugin>
140-
<groupId>com.mycila.maven-license-plugin</groupId>
141-
<artifactId>maven-license-plugin</artifactId>
142-
<version>1.10.b1</version>
140+
<groupId>com.mycila</groupId>
141+
<artifactId>license-maven-plugin</artifactId>
142+
<version>5.0.0</version>
143143
<configuration>
144-
<header>src/etc/license_header.txt</header>
144+
<licenseSets>
145+
<licenseSet>
146+
<header>src/etc/license_header.txt</header>
147+
<includes>
148+
<include>src/main/java/**</include>
149+
<include>src/test/java/**</include>
150+
</includes>
151+
<excludes>
152+
<exclude>src/site</exclude>
153+
</excludes>
154+
</licenseSet>
155+
</licenseSets>
145156
<quiet>false</quiet>
146157
<failIfMissing>true</failIfMissing>
147158
<aggregate>false</aggregate>
148-
<includes>
149-
<include>src/main/java/**</include>
150-
<include>src/test/java/**</include>
151-
</includes>
152-
<excludes>
153-
<exclude>src/site</exclude>
154-
</excludes>
155159
<useDefaultExcludes>true</useDefaultExcludes>
156160
<useDefaultMapping>true</useDefaultMapping>
157161
<properties>
158-
<year>${project.inceptionYear}-2023</year>
162+
<year>${project.inceptionYear}-2025</year>
159163
</properties>
160164
<encoding>UTF-8</encoding>
161165
</configuration>
@@ -170,20 +174,20 @@
170174
</plugin>
171175
<plugin>
172176
<artifactId>maven-release-plugin</artifactId>
173-
<version>2.5.3</version>
177+
<version>3.1.1</version>
174178
<configuration>
175179
<tagNameFormat>v@{project.version}</tagNameFormat>
176180
</configuration>
177181
<dependencies>
178182
<dependency>
179183
<groupId>org.apache.maven.scm</groupId>
180184
<artifactId>maven-scm-provider-gitexe</artifactId>
181-
<version>1.13.0</version>
185+
<version>2.1.0</version>
182186
</dependency>
183187
<dependency>
184188
<groupId>org.apache.maven.scm</groupId>
185189
<artifactId>maven-scm-api</artifactId>
186-
<version>1.13.0</version>
190+
<version>2.1.0</version>
187191
</dependency>
188192
</dependencies>
189193
</plugin>
@@ -202,7 +206,7 @@
202206
<dependency>
203207
<groupId>org.springframework.boot</groupId>
204208
<artifactId>spring-boot-dependencies</artifactId>
205-
<version>3.0.6</version>
209+
<version>4.0.0-M1</version>
206210
<type>pom</type>
207211
<scope>import</scope>
208212
</dependency>
@@ -242,13 +246,13 @@
242246
<dependency>
243247
<groupId>com.google.code.gson</groupId>
244248
<artifactId>gson</artifactId>
245-
<version>2.10.1</version>
249+
<version>2.13.1</version>
246250
<optional>true</optional>
247251
</dependency>
248252
<dependency>
249253
<groupId>org.springdoc</groupId>
250254
<artifactId>springdoc-openapi-starter-common</artifactId>
251-
<version>2.0.2</version>
255+
<version>2.8.9</version>
252256
<optional>true</optional>
253257
</dependency>
254258

@@ -311,13 +315,13 @@
311315
<dependency>
312316
<groupId>nl.jqno.equalsverifier</groupId>
313317
<artifactId>equalsverifier</artifactId>
314-
<version>3.14.1</version>
318+
<version>4.0.7</version>
315319
<scope>test</scope>
316320
</dependency>
317321
<dependency>
318322
<groupId>io.github.classgraph</groupId>
319323
<artifactId>classgraph</artifactId>
320-
<version>4.8.154</version>
324+
<version>4.8.181</version>
321325
<optional>true</optional>
322326
</dependency>
323327
<dependency>

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/Between.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
2424
import net.kaczmarzyk.spring.data.jpa.utils.Converter;
2525
import net.kaczmarzyk.spring.data.jpa.utils.QueryContext;
2626

27+
import java.io.Serial;
2728
import java.util.Arrays;
2829
import java.util.Objects;
2930

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/ComparableSpecification.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/Conjunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/DateSpecification.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/Disjunction.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -52,12 +52,20 @@ public Disjunction(Collection<Specification<T>> innerSpecs) {
5252
public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
5353
Specification<T> combinedSpecs = null;
5454
for (Specification<T> spec : innerSpecs) {
55+
if (spec.equals(Specification.unrestricted())) {
56+
continue;
57+
}
5558
if (combinedSpecs == null) {
56-
combinedSpecs = Specification.where(spec);
59+
combinedSpecs = spec;
5760
} else {
5861
combinedSpecs = combinedSpecs.or(spec);
5962
}
6063
}
64+
65+
if (combinedSpecs == null) {
66+
combinedSpecs = Specification.unrestricted();
67+
}
68+
6169
return combinedSpecs.toPredicate(root, query, cb);
6270
}
6371

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/Empty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/EmptyResultOnTypeMismatch.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/EndingWith.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/net/kaczmarzyk/spring/data/jpa/domain/EndingWithIgnoreCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2014-2023 the original author or authors.
1+
/*
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)