diff --git a/.github/workflows/maven-merge-build.yml b/.github/workflows/maven-merge-build.yml index 3377de1..e190e1c 100644 --- a/.github/workflows/maven-merge-build.yml +++ b/.github/workflows/maven-merge-build.yml @@ -20,7 +20,7 @@ jobs: - name: Set up JDK 11 for x64 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' architecture: x64 cache: maven @@ -56,7 +56,7 @@ jobs: fi - name: Upload JaCoCo coverage report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: jacoco-report path: target/site/jacoco/ diff --git a/.github/workflows/maven-pr-build.yml b/.github/workflows/maven-pr-build.yml index 6a32611..f482114 100644 --- a/.github/workflows/maven-pr-build.yml +++ b/.github/workflows/maven-pr-build.yml @@ -20,7 +20,7 @@ jobs: - name: Set up JDK 11 for x64 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' architecture: x64 cache: maven @@ -31,7 +31,7 @@ jobs: echo "coverage = ${{ steps.jacoco.outputs.coverage }}" echo "branch coverage = ${{ steps.jacoco.outputs.branches }}" - name: Upload JaCoCo coverage report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: jacoco-report path: target/site/jacoco/ diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml index 54828f1..eaafd6c 100644 --- a/.github/workflows/publish-central.yml +++ b/.github/workflows/publish-central.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: - java-version: 11 + java-version: 17 distribution: 'adopt' - name: Build with Maven @@ -24,7 +24,7 @@ jobs: - name: Set up Apache Maven Central uses: actions/setup-java@v2 with: # running setup-java again overwrites the settings.xml - java-version: 11 + java-version: 17 distribution: 'adopt' server-id: ossrh server-username: OSSRH_USERNAME diff --git a/pom.xml b/pom.xml index 1495044..eba9774 100644 --- a/pom.xml +++ b/pom.xml @@ -15,15 +15,15 @@ org.springframework.boot spring-boot-starter-parent - 2.7.12 + 3.1.11 UTF-8 UTF-8 - 11 - 11 + 17 + 17 5.7.2 true diff --git a/src/main/java/com/intuit/springwebclient/entity/ClientHttpResponse.java b/src/main/java/com/intuit/springwebclient/entity/ClientHttpResponse.java index 7dbfd36..54e06de 100644 --- a/src/main/java/com/intuit/springwebclient/entity/ClientHttpResponse.java +++ b/src/main/java/com/intuit/springwebclient/entity/ClientHttpResponse.java @@ -2,7 +2,7 @@ import lombok.Builder; import lombok.Getter; -import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; @Getter @Builder @@ -10,7 +10,7 @@ public final class ClientHttpResponse{ private final T response; private final String error; - private final HttpStatus status; + private final HttpStatusCode status; private final boolean isSuccess2xx; }