Skip to content

Commit e9fcb28

Browse files
Upgrade Spring Boot 4/JDK 25 - build authentication-service, build person-service, build user-service
1 parent e5ad7f1 commit e9fcb28

File tree

64 files changed

+472
-555
lines changed

Some content is hidden

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

64 files changed

+472
-555
lines changed

.github/workflows/docker-build-push-image-admin-service.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626

2727
# Set up JDK
2828
- name: JDK
29-
uses: actions/setup-java@v2
29+
uses: actions/setup-java@v5
3030
with:
31-
distribution: 'zulu'
32-
java-version: '21'
31+
distribution: 'temurin'
32+
java-version: '25'
3333

3434
- name: Set up QEMU
3535
uses: docker/setup-qemu-action@v1

.github/workflows/docker-build-push-image-authentication-service.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444

4545
# Set up JDK
4646
- name: JDK
47-
uses: actions/setup-java@v2
47+
uses: actions/setup-java@v5
4848
with:
49-
distribution: 'zulu'
50-
java-version: '21'
49+
distribution: 'temurin'
50+
java-version: '25'
5151

5252
- name: Set up QEMU
5353
uses: docker/setup-qemu-action@v3

.github/workflows/docker-build-push-image-edge-service.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626

2727
# Set up JDK
2828
- name: JDK
29-
uses: actions/setup-java@v2
29+
uses: actions/setup-java@v5
3030
with:
31-
distribution: 'zulu'
32-
java-version: '21'
31+
distribution: 'temurin'
32+
java-version: '25'
3333

3434
- name: Set up QEMU
3535
uses: docker/setup-qemu-action@v1

.github/workflows/docker-build-push-image-person-service.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444

4545
# Set up JDK
4646
- name: JDK
47-
uses: actions/setup-java@v2
47+
uses: actions/setup-java@v5
4848
with:
49-
distribution: 'zulu'
50-
java-version: '21'
49+
distribution: 'temurin'
50+
java-version: '25'
5151

5252
- name: Set up QEMU
5353
uses: docker/setup-qemu-action@v1

.github/workflows/docker-build-push-image-user-service.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626

2727
# Set up JDK
2828
- name: JDK
29-
uses: actions/setup-java@v2
29+
uses: actions/setup-java@v5
3030
with:
31-
distribution: 'zulu'
32-
java-version: '21'
31+
distribution: 'temurin'
32+
java-version: '25'
3333

3434
- name: Set up QEMU
3535
uses: docker/setup-qemu-action@v1

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,6 @@ Quick*.java
6666
valid_token_google_oauth
6767
*.java-version
6868
quarkus-service/.java-version
69-
input.json
69+
input.json
70+
docker/opentelemetry-javaagent.jar
71+
docker/package*

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,8 @@ Access it [Swagger UI](http://localhost:{SERVICE_PORT}/swagger-ui.html) - `http:
381381
* [X] Java - Add Authorization Server - Spring Boot 3
382382
* [X] Java - Removed Spring Oauth2 - Spring Boot 3
383383
* [] BFF - Implement BFF Pattern
384+
* [X] Java - Spring Boot 4/JDK 25
385+
* [X] Java - Add TestContainers
384386

385387
### References
386388
[Pattern Microservice Architecture](https://microservices.io/patterns/microservices.html)

admin-server/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<dependency>
6767
<groupId>org.springframework.boot</groupId>
6868
<artifactId>spring-boot-starter-aop</artifactId>
69+
<version>4.0.0-M2</version>
6970
</dependency>
7071

7172
<dependency>

admin-server/src/main/java/com/springboot/adminserver/config/CustomDefaultErrorAttributes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.apache.commons.lang.exception.ExceptionUtils;
88

99
import org.springframework.boot.web.error.ErrorAttributeOptions;
10-
import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
10+
import org.springframework.boot.webmvc.error.DefaultErrorAttributes;
1111
import org.springframework.http.HttpStatus;
1212
import org.springframework.http.HttpStatusCode;
1313
import org.springframework.security.access.AccessDeniedException;

authentication-service/pom.xml

Lines changed: 28 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
</properties>
2222

2323
<dependencies>
24+
<dependency>
25+
<groupId>org.springframework.integration</groupId>
26+
<artifactId>spring-integration-ip</artifactId>
27+
</dependency>
28+
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-integration</artifactId>
32+
</dependency>
33+
2434
<dependency>
2535
<groupId>net.logstash.logback</groupId>
2636
<artifactId>logstash-logback-encoder</artifactId>
@@ -203,13 +213,6 @@
203213
</exclusions>
204214
</dependency>
205215

206-
<dependency>
207-
<groupId>de.flapdoodle.embed</groupId>
208-
<artifactId>de.flapdoodle.embed.mongo.spring31x</artifactId>
209-
<version>4.9.3</version>
210-
<scope>test</scope>
211-
</dependency>
212-
213216
<dependency>
214217
<groupId>org.springframework.security</groupId>
215218
<artifactId>spring-security-test</artifactId>
@@ -242,13 +245,29 @@
242245
<version>3.3.0</version>
243246
<scope>test</scope>
244247
</dependency>
248+
249+
<dependency>
250+
<groupId>org.springframework.boot</groupId>
251+
<artifactId>spring-boot-testcontainers</artifactId>
252+
<scope>test</scope>
253+
</dependency>
254+
<dependency>
255+
<groupId>org.testcontainers</groupId>
256+
<artifactId>junit-jupiter</artifactId>
257+
<scope>test</scope>
258+
</dependency>
259+
<dependency>
260+
<groupId>org.testcontainers</groupId>
261+
<artifactId>mongodb</artifactId>
262+
<scope>test</scope>
263+
</dependency>
245264
</dependencies>
246265

247266
<build>
248267
<plugins>
249268
<plugin>
250-
<groupId>pl.project13.maven</groupId>
251-
<artifactId>git-commit-id-plugin</artifactId>
269+
<groupId>io.github.git-commit-id</groupId>
270+
<artifactId>git-commit-id-maven-plugin</artifactId>
252271
<configuration>
253272
<failOnNoGitDirectory>false</failOnNoGitDirectory>
254273
</configuration>
@@ -333,57 +352,6 @@
333352
</build>
334353

335354
<profiles>
336-
<profile>
337-
<id>native</id>
338-
<properties>
339-
<repackage.classifier>exec</repackage.classifier>
340-
<native-buildtools.version>0.10.3</native-buildtools.version>
341-
</properties>
342-
<dependencies>
343-
<dependency>
344-
<groupId>org.junit.platform</groupId>
345-
<artifactId>junit-platform-launcher</artifactId>
346-
<scope>test</scope>
347-
</dependency>
348-
349-
<dependency>
350-
<groupId>org.springframework.experimental</groupId>
351-
<artifactId>spring-native</artifactId>
352-
</dependency>
353-
</dependencies>
354-
355-
<build>
356-
<plugins>
357-
<plugin>
358-
<groupId>org.springframework.experimental</groupId>
359-
<artifactId>spring-aot-maven-plugin</artifactId>
360-
</plugin>
361-
<plugin>
362-
<groupId>org.graalvm.buildtools</groupId>
363-
<artifactId>native-maven-plugin</artifactId>
364-
<version>${native-buildtools.version}</version>
365-
<extensions>true</extensions>
366-
<executions>
367-
<execution>
368-
<id>test-native</id>
369-
<phase>test</phase>
370-
<goals>
371-
<goal>test</goal>
372-
</goals>
373-
</execution>
374-
<execution>
375-
<id>build-native</id>
376-
<phase>package</phase>
377-
<goals>
378-
<goal>build</goal>
379-
</goals>
380-
</execution>
381-
</executions>
382-
</plugin>
383-
</plugins>
384-
</build>
385-
</profile>
386-
387355
<profile>
388356
<id>spring-native</id>
389357
<build>

0 commit comments

Comments
 (0)