upgrade junit

ben-manes · Jul 24, 2023 · 84dafa0 · 84dafa0
1 parent b7e0ddf
commit 84dafa0
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 9 deletions.
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
@@ -45,10 +45,10 @@ runs:
         website: jdk.java.net
         version: latest
     - name: Set up GraalVM
-      uses: graalvm/setup-graalvm@b11d36630f94ed5864e0a680a979b5afde449e9d # v1
+      uses: graalvm/setup-graalvm@8ae40e7db98195001fcd3e4d5fbecae827196940 # v1
       if: inputs.java == 'GraalVM'
       with:
-        version: 'latest'
+        distribution: 'graalvm'
         components: 'native-image'
         github-token: ${{ inputs.token }}
         java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -26,8 +26,10 @@ jobs:
             api.github.com:443
             caffeine.gradle-enterprise.cloud:443
             download.java.net:443
+            download.oracle.com:443
             downloads.gradle.org:443
             downloads.gradle-dn.com:443
+            gds.oracle.com:443
             github.com:443
             jcenter.bintray.com:443
             objects.githubusercontent.com:443

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,8 +15,10 @@ env:
     cloudflare.com:443
     docker.io:443
     download.java.net:443
+    download.oracle.com:443
     downloads.gradle.org:443
     downloads.gradle-dn.com:443
+    gds.oracle.com:443
     ghcr.io:443
     github.com:443
     jdk.java.net:443

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -21,8 +21,10 @@ jobs:
             api.github.com:443
             api.adoptium.net:443
             caffeine.gradle-enterprise.cloud:443
+            download.oracle.com:443
             downloads.gradle.org:443
             downloads.gradle-dn.com:443
+            gds.oracle.com:443
             github.com:443
             jcenter.bintray.com:443
             objects.githubusercontent.com:443

diff --git a/examples/graal-native/README.md b/examples/graal-native/README.md
@@ -4,6 +4,7 @@ Graal native image uses ahead-of-time compilation to build an optimized executab
 
 ```console
 sdk install java 22.3.2.r17-grl
+sdk use java 22.3.2.r17-grl
 export JAVA_HOME=${SDKMAN_DIR}/candidates/java/current
 ```
 

diff --git a/examples/graal-native/build.gradle.kts b/examples/graal-native/build.gradle.kts
@@ -20,8 +20,15 @@ tasks.test {
 }
 
 graalvmNative {
-  binaries.all {
-    resources.autodetect()
+  binaries {
+    all {
+      resources.autodetect()
+    }
+    named("test") {
+      buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
+      buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
+      buildArgs.add("-H:+ReportExceptionStackTraces")
+    }
   }
   toolchainDetection = false
 }

diff --git a/examples/graal-native/gradle/libs.versions.toml b/examples/graal-native/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 caffeine = "3.1.6"
 graal = "0.9.23"
-junit = "5.9.3"
+junit = "5.10.0"
 truth = "1.1.5"
 versions = "0.47.0"
 

diff --git a/examples/graal-native/gradle/wrapper/gradle-wrapper.properties b/examples/graal-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/hibernate/gradle/libs.versions.toml b/examples/hibernate/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 caffeine = "3.1.6"
 h2 = "2.2.220"
 hibernate = "6.2.7.Final"
-junit = "5.9.3"
+junit = "5.10.0"
 slf4j = "2.0.7"
 truth = "1.1.5"
 versions = "0.47.0"

diff --git a/examples/hibernate/gradle/wrapper/gradle-wrapper.properties b/examples/hibernate/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -58,7 +58,7 @@ json-bind = "1.0"
 jsoup = "1.16.1"
 junit-testng = "1.0.4"
 junit4 = "4.13.2"
-junit5 = "5.10.0-RC2"
+junit5 = "5.10.0"
 kotlin = "1.9.0"
 lincheck = "2.18.1"
 mockito = "5.4.0"