From 8c5f84206cae5d83427f9fc2918a52340a0fe1e5 Mon Sep 17 00:00:00 2001 From: Sean Simmie Date: Tue, 7 Feb 2023 21:10:15 +0000 Subject: [PATCH 1/5] Upgrade to Spring Boot 3 --- .github/workflows/ci.yml | 2 +- .github/workflows/daily.yml | 2 +- .github/workflows/pr.yml | 2 +- .mvn/jvm.config | 10 ++++++++++ pom.xml | 5 +++-- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .mvn/jvm.config diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09cb477..08a3531 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' server-id: github settings-path: ${{ github.workspace }}/.mvn/ diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 27ee201..421f8c9 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' server-id: github settings-path: ${{ github.workspace }}/.mvn/ diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 43a8088..63ccf4d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' settings-path: ${{ github.workspace }}/.mvn/ diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..32599ce --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,10 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED diff --git a/pom.xml b/pom.xml index c3f554c..0855501 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5 + 3.0.2 net.ssimmie @@ -112,6 +112,7 @@ 1.5.1 1.2.2 3.10.1 + 2.18.0 2.9.4 0.8.8 1.3.7 @@ -238,7 +239,7 @@ com.google.errorprone error_prone_core - 2.3.4 + ${error-prone.version} From 57304a58c5cf21753d2809c6e4de032d6efcd25e Mon Sep 17 00:00:00 2001 From: Sean Simmie Date: Wed, 8 Feb 2023 08:53:03 +0000 Subject: [PATCH 2/5] Update CreateChecklistCommand.java --- .../todos/application/port/in/CreateChecklistCommand.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/net/ssimmie/todos/application/port/in/CreateChecklistCommand.java b/application/src/main/java/net/ssimmie/todos/application/port/in/CreateChecklistCommand.java index 488e186..a6e8322 100644 --- a/application/src/main/java/net/ssimmie/todos/application/port/in/CreateChecklistCommand.java +++ b/application/src/main/java/net/ssimmie/todos/application/port/in/CreateChecklistCommand.java @@ -1,9 +1,9 @@ package net.ssimmie.todos.application.port.in; -import javax.validation.ConstraintViolationException; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.constraints.NotBlank; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotBlank; public class CreateChecklistCommand { From 361d228dc79f627e40524de7fde74d443003b558 Mon Sep 17 00:00:00 2001 From: Sean Simmie Date: Wed, 8 Feb 2023 08:53:16 +0000 Subject: [PATCH 3/5] Update CreateChecklistCommandTest.java --- .../todos/application/port/in/CreateChecklistCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/test/java/net/ssimmie/todos/application/port/in/CreateChecklistCommandTest.java b/application/src/test/java/net/ssimmie/todos/application/port/in/CreateChecklistCommandTest.java index 5af48dd..93ceff1 100644 --- a/application/src/test/java/net/ssimmie/todos/application/port/in/CreateChecklistCommandTest.java +++ b/application/src/test/java/net/ssimmie/todos/application/port/in/CreateChecklistCommandTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.jparams.verifier.tostring.ToStringVerifier; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.Test; class CreateChecklistCommandTest { From 8eeb608de33ff071c9289e22b6c669ec1a61dabb Mon Sep 17 00:00:00 2001 From: Sean Simmie Date: Wed, 8 Feb 2023 14:00:27 +0000 Subject: [PATCH 4/5] Update ChecklistsResourceTest.java --- .../application/adapter/in/web/ChecklistsResourceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/test/java/net/ssimmie/todos/application/adapter/in/web/ChecklistsResourceTest.java b/application/src/test/java/net/ssimmie/todos/application/adapter/in/web/ChecklistsResourceTest.java index 82b123a..b917b92 100644 --- a/application/src/test/java/net/ssimmie/todos/application/adapter/in/web/ChecklistsResourceTest.java +++ b/application/src/test/java/net/ssimmie/todos/application/adapter/in/web/ChecklistsResourceTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.springframework.http.HttpStatus.CREATED; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.Test; import org.springframework.hateoas.EntityModel; import org.springframework.hateoas.Link; From 12b7e0bcd52912698ebb4ca6d79b2e177159a68c Mon Sep 17 00:00:00 2001 From: Sean Simmie Date: Tue, 7 Feb 2023 21:10:15 +0000 Subject: [PATCH 5/5] Upgrade to Spring Boot 3 --- .github/workflows/ci.yml | 2 +- .github/workflows/daily.yml | 2 +- .github/workflows/pr.yml | 2 +- .mvn/jvm.config | 10 ++++++++++ pom.xml | 5 +++-- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .mvn/jvm.config diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09cb477..08a3531 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' server-id: github settings-path: ${{ github.workspace }}/.mvn/ diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 27ee201..421f8c9 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' server-id: github settings-path: ${{ github.workspace }}/.mvn/ diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 43a8088..63ccf4d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'maven' settings-path: ${{ github.workspace }}/.mvn/ diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..32599ce --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,10 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED diff --git a/pom.xml b/pom.xml index 5ff938a..03dc99d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5 + 3.0.2 net.ssimmie @@ -112,6 +112,7 @@ 1.5.1 1.2.2 3.10.1 + 2.18.0 2.9.4 0.8.8 1.3.7 @@ -238,7 +239,7 @@ com.google.errorprone error_prone_core - 2.3.4 + ${error-prone.version}