diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1381cb5..f3297a5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,16 +14,16 @@ jobs: outputs: release-version: ${{ steps.version-step.outputs.version }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: Get DDI-Lifecycle lib version id: version-step @@ -55,10 +55,10 @@ jobs: needs: check-version runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} @@ -86,10 +86,10 @@ jobs: needs: [check-version, publish] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Create GitHub release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: tag_name: ${{ needs.check-version.outputs.release-version }} target_commitish: ${{ github.head_ref || github.ref }} diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index 94210c3..3e96aab 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -15,10 +15,10 @@ jobs: outputs: snapshot-version: ${{ steps.version-step.outputs.version }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} @@ -58,16 +58,16 @@ jobs: needs: check-version runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: Publish DDI Lifecycle lib on Maven Central run: | @@ -80,7 +80,7 @@ jobs: needs: [check-version, publish-snapshot] runs-on: ubuntu-latest steps: - - uses: actions/github-script@v7 + - uses: actions/github-script@v8 with: script: | github.rest.issues.createComment({ @@ -95,7 +95,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Create tag - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: script: | github.rest.git.createRef({ @@ -108,7 +108,7 @@ jobs: remove-publish-label: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions-ecosystem/action-remove-labels@v1 with: labels: 'publish-snapshot' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aece19b..91e86e2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,10 +16,10 @@ jobs: if: ${{ (github.event.pull_request.draft == false) && !contains(github.event.pull_request.labels.*.name, 'publish-snapshot') }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..37f78a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/model/build.gradle.kts b/model/build.gradle.kts index 99d44ec..74fb82b 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -30,11 +30,11 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation("org.apache.logging.log4j:log4j-core:2.21.1") // - implementation("org.springframework:spring-beans:6.1.11") + implementation("org.springframework:spring-beans:7.0.4") // Use JUnit Jupiter for testing. - testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") - testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.3") + testImplementation("org.junit.jupiter:junit-jupiter:6.0.3") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3") // XMLUnit testImplementation("org.xmlunit:xmlunit-assertj3:2.10.0") } diff --git a/settings.gradle.kts b/settings.gradle.kts index c4bf87b..87f8631 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ plugins { // Apply the foojay-resolver plugin to allow automatic download of JDKs - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "DDI-Lifecycle-Java"