Skip to content

Commit

Permalink
build upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-manes committed Mar 23, 2024
1 parent ac216e1 commit e6a4411
Show file tree
Hide file tree
Showing 22 changed files with 41 additions and 93 deletions.
9 changes: 2 additions & 7 deletions .github/actions/run-gradle/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ inputs:
required: true
description: The JDK version
early-access:
default: '22'
default: '23'
required: false
description: The early access release
graal:
default: '17'
default: '21'
required: false
description: The GraalVM version
token:
Expand Down Expand Up @@ -75,7 +75,6 @@ runs:
- name: Setup Gradle
id: setup-gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
continue-on-error: true
env:
JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
Expand All @@ -84,10 +83,6 @@ runs:
cache-read-only: false
gradle-home-cache-cleanup: true
gradle-home-cache-strict-match: true
- name: Backoff
if: steps.setup-gradle.outcome == 'failure'
shell: bash
run: sleep 10
- name: Run ${{ inputs.arguments }}
env:
JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
pmd:
runs-on: ubuntu-latest
env:
JAVA_VERSION: 21
JAVA_VERSION: 22
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
Expand All @@ -59,7 +59,7 @@ jobs:
spotbugs:
runs-on: ubuntu-latest
env:
JAVA_VERSION: 21
JAVA_VERSION: 22
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 11, 21, 22, GraalVM ]
java: [ 11, 21, 23, GraalVM ]
env:
JAVA_VERSION: ${{ matrix.java }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ env:
schemastore.org:443
www.graalvm.org:443
PUBLISH_JDK: 11
EA_JDK: 22
EA_JDK: 23

jobs:
compile:
Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 11, 21, 22, GraalVM ]
java: [ 11, 22, 23, GraalVM ]
env:
JAVA_VERSION: ${{ matrix.java }}
steps:
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- simulator:check
- jcache:check
- guava:check
java: [ 11, 21 ]
java: [ 11, 22 ]
include:
- suite: caffeine:weakKeysAndStrongValuesStatsSyncGuavaSlowTest
java: 11
Expand Down
24 changes: 4 additions & 20 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ permissions:

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
JAVA_VERSION: 17
JAVA_VERSION: 21

jobs:
analyze:
Expand Down Expand Up @@ -51,27 +51,11 @@ jobs:
services.gradle.org:443
- name: Checkout repository
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
timeout-minutes: 5
with:
action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: |
distribution: temurin
java-version: ${{ env.JAVA_VERSION }}
attempt_limit: 3
attempt_delay: 2000
- name: Setup Gradle
uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
timeout-minutes: 5
uses: ./.github/actions/run-gradle
with:
action: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
with: |
add-job-summary: never
cache-read-only: false
gradle-home-cache-cleanup: true
attempt_limit: 3
attempt_delay: 2000
java: ${{ env.JAVA_VERSION }}
token: ${{ secrets.GITHUB_TOKEN }}
- name: Initialize CodeQL
uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions: read-all

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
JAVA_VERSION: 21
JAVA_VERSION: 22

jobs:
dependency-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-submission-pr-retreive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
JAVA_VERSION: 21
JAVA_VERSION: 22

jobs:
submit-dependency-graph:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/dependency-submission-pr-submit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,10 @@ jobs:
services.gradle.org:443
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
timeout-minutes: 5
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: |
cache: gradle
distribution: temurin
java-version: ${{ env.JAVA_VERSION }}
attempt_limit: 3
attempt_delay: 2000
java-version: ${{ env.JAVA_VERSION }}
distribution: temurin
- name: Submit Dependency Graph
uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
with:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,10 @@ jobs:
services.gradle.org:443
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
timeout-minutes: 5
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: |
cache: gradle
distribution: temurin
java-version: ${{ env.JAVA_VERSION }}
attempt_limit: 3
attempt_delay: 2000
java-version: ${{ env.JAVA_VERSION }}
distribution: temurin
- name: Submit Dependency Graph
uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
with:
Expand Down
32 changes: 7 additions & 25 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,16 @@ jobs:
www.graalvm.org:443
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
timeout-minutes: 5
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: |
distribution: temurin
java-version: ${{ env.JAVA_VERSION }}
attempt_limit: 3
attempt_delay: 2000
java-version: ${{ env.JAVA_VERSION }}
distribution: temurin
- name: Setup Gradle
uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
timeout-minutes: 5
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
with:
action: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
with: |
add-job-summary: never
cache-read-only: false
gradle-home-cache-cleanup: true
gradle-home-cache-strict-match: true
attempt_limit: 3
attempt_delay: 2000
- name: Setup Maven
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ env.JAVA_VERSION }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
add-job-summary: never
cache-read-only: false
gradle-home-cache-cleanup: true
- name: Simulator
run: >
./gradlew simulator:run
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
api.osv.dev:443
api.securityscorecards.dev:443
bestpractices.coreinfrastructure.org:443
bestpractices.dev:443
fulcio.sigstore.dev:443
github.com:443
oss-fuzz-build-logs.storage.googleapis.com:443
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion examples/hibernate/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ testing.suites {
}

java.toolchain.languageVersion = JavaLanguageVersion.of(
System.getenv("JAVA_VERSION")?.toIntOrNull() ?: 11)
System.getenv("JAVA_VERSION")?.toIntOrNull() ?: 17)

tasks.withType<JavaCompile>().configureEach {
javaCompiler = javaToolchains.compilerFor {
Expand Down
2 changes: 1 addition & 1 deletion examples/hibernate/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
caffeine = "3.1.8"
h2 = "2.2.224"
hibernate = "6.4.4.Final"
hibernate = "6.5.0.CR1"
junit = "5.10.2"
log4j2 = "3.0.0-beta2"
slf4j = "2.0.7"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion examples/write-behind-rxjava/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
awaitility = "4.2.0"
awaitility = "4.2.1"
caffeine = "3.1.8"
junit = "5.10.2"
rxjava = "3.1.8"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 1 addition & 3 deletions gradle/config/pmd/rulesSets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<exclude name="ShortClassName"/>
<exclude name="ShortMethodName"/>
<exclude name="ConfusingTernary"/>
<exclude name="UseExplicitTypes"/>
<exclude name="UnnecessaryReturn"/>
<exclude name="UseDiamondOperator"/>
<exclude name="UselessParentheses"/>
Expand Down Expand Up @@ -79,10 +80,8 @@
<exclude name="ExcessiveImports"/>
<exclude name="CognitiveComplexity"/>
<exclude name="CyclomaticComplexity"/>
<exclude name="ExcessiveClassLength"/>
<exclude name="ExcessivePublicCount"/>
<exclude name="LoosePackageCoupling"/>
<exclude name="ExcessiveMethodLength"/>
<exclude name="CouplingBetweenObjects"/>
<exclude name="AvoidRethrowingException"/>
<exclude name="AbstractClassWithoutAnyMethod"/>
Expand All @@ -99,7 +98,6 @@

<rule ref="category/java/errorprone.xml">
<exclude name="DontImportSun"/>
<exclude name="EmptyWhileStmt"/>
<exclude name="NullAssignment"/>
<exclude name="AssignmentInOperand"/>
<exclude name="UseProperClassLoader"/>
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ bouncycastle-jdk18on = "1.77"
cache2k = "2.6.1.Final"
caffeine = "3.1.8"
checker-framework = "3.42.0"
checkstyle = "10.14.1"
checkstyle = "10.14.2"
coherence = "22.06.2"
commons-collections4 = "4.4"
commons-compress = "1.26.1"
Expand Down Expand Up @@ -77,15 +77,15 @@ osgi-promise = "1.3.0"
pax-exam = "4.13.5"
pax-url = "2.6.14"
picocli = "4.7.5"
pmd = "7.0.0-rc4"
pmd = "7.0.0"
protobuf = "4.26.0"
slf4j = "2.0.12"
slf4j-test = "3.0.1"
snakeyaml = "2.2"
sonarqube = "4.4.1.3373"
spotbugs-contrib = "7.6.4"
spotbugs-core = "4.8.3"
spotbugs-plugin = "6.0.8"
spotbugs-plugin = "6.0.9"
stream = "2.9.8"
tcache = "2.0.1"
testng = "7.9.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit e6a4411

Please sign in to comment.