Merge branch 'master' into shutdown-task-loss-fix

Author: Sushisource

.github/workflows/ci.yml

@@ -32,25 +32,25 @@ jobs:
       - name: Run unit tests (Java 23)
         env:
           USER: unittest
-          USE_DOCKER_SERVICE: false
+          USE_EXTERNAL_SERVICE: false
         run: ./gradlew --no-daemon test -x spotlessCheck -x spotlessApply -x spotlessJava -P edgeDepsTest -PtestJavaVersion=23
 
       - name: Run independent resource tuner test
         env:
           USER: unittest
-          USE_DOCKER_SERVICE: false
+          USE_EXTERNAL_SERVICE: false
         run: ./gradlew --no-daemon temporal-sdk:testResourceIndependent -x spotlessCheck -x spotlessApply -x spotlessJava -P edgeDepsTest -PtestJavaVersion=23
 
       - name: Run Spring Boot 3 compatibility tests
         env:
           USER: unittest
-          USE_DOCKER_SERVICE: false
+          USE_EXTERNAL_SERVICE: false
         run: ./gradlew --no-daemon :temporal-spring-boot-autoconfigure:test -x spotlessCheck -x spotlessApply -x spotlessJava -P edgeDepsTest -P springBoot3Test -PtestJavaVersion=23
 
       - name: Run Spring Boot 4 compatibility tests
         env:
           USER: unittest
-          USE_DOCKER_SERVICE: false
+          USE_EXTERNAL_SERVICE: false
         run: ./gradlew --no-daemon :temporal-spring-boot-autoconfigure:test -x spotlessCheck -x spotlessApply -x spotlessJava -P edgeDepsTest -P springBoot4Test -PtestJavaVersion=23
 
       - name: Publish Test Report
@@ -125,20 +125,20 @@ jobs:
         env:
           USER: unittest
           TEMPORAL_SERVICE_ADDRESS: localhost:7233
-          USE_DOCKER_SERVICE: true
+          USE_EXTERNAL_SERVICE: true
         run: ./gradlew --no-daemon test -x spotlessCheck -x spotlessApply -x spotlessJava -PtestJavaVersion=11
 
       - name: Run Jackson 3 converter tests (Java 17)
         env:
           USER: unittest
-          USE_DOCKER_SERVICE: false
+          USE_EXTERNAL_SERVICE: false
         run: ./gradlew --no-daemon :temporal-sdk:jackson3Tests -x spotlessCheck -x spotlessApply -x spotlessJava -PtestJavaVersion=17
 
       - name: Run virtual thread tests (Java 21)
         env:
           USER: unittest
           TEMPORAL_SERVICE_ADDRESS: localhost:7233
-          USE_DOCKER_SERVICE: true
+          USE_EXTERNAL_SERVICE: true
         run: ./gradlew --no-daemon :temporal-sdk:virtualThreadTests -x spotlessCheck -x spotlessApply -x spotlessJava -PtestJavaVersion=21
 
       - name: Publish Test Report

.github/workflows/nightly-throughput-stress.yml

@@ -8,8 +8,11 @@ before we can merge in any of your changes
 
 ## Development Environment
 
-- Java 23+
-- Docker to run Temporal Server
+- **Java 21+** is required to run Gradle, compile the project, and run all tests locally.
+- Some optional tests also require the [Temporal CLI](https://docs.temporal.io/cli#installation).
+
+If you're using Apple Silicon, see the [note on Rosetta](#note-on-rosetta).
+
 
 ## Build
 
@@ -41,26 +44,32 @@ fatal: No names found, cannot describe anything.
 This can be done resolved by running `git fetch --tags` on your branch. Note, make sure your fork has tags copied from
 the main repo.
 
-## Test and Build
+## Testing
 
-Run a local temporal server with the [temporal CLI](https://docs.temporal.io/cli#installation):
+Run tests:
 
 ```bash
-temporal server start-dev
+./gradlew test
 ```
 
-(If this does not work, see instructions for running the Temporal Server at https://github.com/temporalio/temporal/blob/master/README.md.)
-
-Then run all the tests with:
+Run a single test or group of tests:
 
 ```bash
-./gradlew test
+./gradlew :temporal-sdk:test --offline --tests "io.temporal.activity.ActivityPauseTest"
+./gradlew :temporal-sdk:test --offline --tests "io.temporal.workflow.*"
 ```
 
-Build with:
+By default, integration tests run against the built-in time-skipping test server. Some tests require features that the built-in server doesn't support; those tests will be skipped. To run the skipped tests:
 
+1. Install the [temporal CLI](https://docs.temporal.io/cli#installation), which comes with a built-in dev server.
+2. Find the flags that the dev server will need to run the tests by grepping for `temporal server` in [./github/workflows/ci.yml](./github/workflows/ci.yml).
+3. Start the server: 
+```bash
+temporal server start-dev --YOUR-FLAGS-HERE
+```
+4. Set the `USE_EXTERNAL_SERVICE` environment variable and run the tests: 
 ```bash
-./gradlew build
+USE_EXTERNAL_SERVICE=true ./gradlew test
 ```
 
 ## Note on Rosetta

CONTRIBUTING.md

@@ -1,15 +1,2 @@
-# TIP 
-# 
-# For the best SDK development experience, make to hava all of the following
-# JDKs installed on your machine (`mise install java@[version]`):
-#   - `java@temurin-11`
-#   - `java@temurin-17`
-#   - `java@temurin-23`
-# 
-# Java 21+ is required for anything that requires gradle.
-# 
-# If you find out that gradle isn't automatically picking it up older JDKs as
-# toolchains, see https://mise.jdx.dev/lang/java.html#gradle-toolchains-detection.
-
 [tools]
-java = "temurin-23"
+java = "temurin-21"

mise.toml

@@ -184,8 +184,10 @@ testing {
             targets {
                 all {
                     testTask.configure {
-                        javaLauncher = javaToolchains.launcherFor {
-                            languageVersion = JavaLanguageVersion.of(17)
+                        if (project.hasProperty("testJavaVersion")) {
+                            javaLauncher = javaToolchains.launcherFor {
+                                languageVersion = JavaLanguageVersion.of(project.property("testJavaVersion") as int)
+                            }
                         }
                         shouldRunAfter(test)
                     }
@@ -194,20 +196,24 @@ testing {
         }
 
         // Unlike virtualThreadTests, jackson3Tests source directly imports Jackson 3 types
-        // and java17 classes, so the compile task also needs a Java 17 compiler (not just
+        // and java17 classes, so the compile task also needs a Java 17+ compiler (not just
         // the test launcher).
         tasks.named('compileJackson3TestsJava') {
-            javaCompiler = javaToolchains.compilerFor {
-                languageVersion = JavaLanguageVersion.of(17)
+            if (project.hasProperty("testJavaVersion")) {
+                javaCompiler = javaToolchains.compilerFor {
+                    languageVersion = JavaLanguageVersion.of(project.property("testJavaVersion") as int)
+                }
             }
         }
 
         virtualThreadTests(JvmTestSuite) {
             targets {
                 all {
                     testTask.configure {
-                        javaLauncher = javaToolchains.launcherFor {
-                            languageVersion = JavaLanguageVersion.of(21)
+                        if (project.hasProperty("testJavaVersion")) {
+                            javaLauncher = javaToolchains.launcherFor {
+                                languageVersion = JavaLanguageVersion.of(project.property("testJavaVersion") as int)
+                            }
                         }
                         shouldRunAfter(test)
                     }
@@ -230,8 +236,10 @@ testing {
             targets {
                 all {
                     testTask.configure {
-                        javaLauncher = javaToolchains.launcherFor {
-                            languageVersion = JavaLanguageVersion.of(21)
+                        if (project.hasProperty("testJavaVersion")) {
+                            javaLauncher = javaToolchains.launcherFor {
+                                languageVersion = JavaLanguageVersion.of(project.property("testJavaVersion") as int)
+                            }
                         }
                         environment("USE_VIRTUAL_THREADS", "false")
                     }