diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 14580efb4f..4eaee3bbee 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,5 +12,4 @@ # For each one, we add the owning team, as well as # @temporalio/sdk, so the SDK team can continue to # manage repo-wide concerns -/contrib/temporal-spring-ai/ @temporalio/sdk @temporalio/ai-sdk /contrib/temporal-workflowstreams/ @temporalio/sdk @temporalio/ai-sdk diff --git a/AGENTS.md b/AGENTS.md index 377a0138d8..d5ca176e43 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -9,7 +9,6 @@ - `temporal-spring-boot-autoconfigure`: Spring Boot auto configuration. - `temporal-kotlin`: Kotlin DSL for the SDK. - `contrib/temporal-opentracing`: OpenTracing interceptor integration. -- `contrib/temporal-spring-ai`: one-time relocation POM; Spring AI development lives in `temporalio/ai-integrations`. ## General Guidance - Avoid changing public API signatures. Anything under an `internal` directory diff --git a/CHANGELOG.md b/CHANGELOG.md index b330567376..9c013205f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,10 @@ to docs, or any other relevant information. ## [Unreleased] ### :boom: Breaking Changes +- Removed `io.temporal:temporal-spring-ai` from the SDK BOM after publishing the relocation POM in 1.41.0 and 1.41.1. + Declare `io.temporal:spring-ai` with an explicit version for + [the standalone integration](https://github.com/temporalio/ai-integrations/tree/main/java/spring-ai). + Spring AI 1 / Spring Boot 3 applications should pin `io.temporal:temporal-spring-ai:1.40.x` until they migrate. - `WorkflowOutboundCallsInterceptor` has new `getVersion(..., GetVersionOptions)`, `upsertTypedSearchAttributes(UpsertSearchAttributesOptions, ...)`, and `upsertMemo(Map, UpsertMemoOptions)` methods. Implementations that don't extend diff --git a/contrib/temporal-spring-ai/README.md b/contrib/temporal-spring-ai/README.md deleted file mode 100644 index 775e34827b..0000000000 --- a/contrib/temporal-spring-ai/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# Temporal Spring AI has moved - -The Spring AI integration is developed and released in -[temporalio/ai-integrations](https://github.com/temporalio/ai-integrations/tree/main/java/spring-ai) -under the independently versioned Maven coordinate `io.temporal:spring-ai`. -Version [0.1.0 is available on Maven Central](https://central.sonatype.com/artifact/io.temporal/spring-ai/0.1.0). -The Java package remains `io.temporal.springai`. - -See the [standalone usage guide](https://github.com/temporalio/ai-integrations/tree/main/java/spring-ai) -for installation and migration instructions. The integration's releases are -versioned independently of the Java SDK. - -The standalone 0.1.0 release requires Java 17 or later, Spring AI 2, Spring Boot 4, -and Temporal Java SDK 1.40.0 or later. Spring AI 1 / Spring Boot 3 applications -should remain on `io.temporal:temporal-spring-ai:1.40.x` until they are ready to -migrate. Spring AI 1 workflow histories are not replay-compatible with the new -integration; complete existing executions or use separate worker deployments. - -This directory contains only a relocation POM from the next SDK version of -`io.temporal:temporal-spring-ai` to `io.temporal:spring-ai:0.1.0`. It has no source, -tests, JARs, or Spring AI dependencies. The SDK BOM retains the old coordinate for -this final relocation release. - -After publishing the one-time relocation POM, remove this Gradle project, its BOM -constraint, and its CODEOWNERS entry from sdk-java. Existing releases remain -available at their original coordinates. diff --git a/contrib/temporal-spring-ai/build.gradle b/contrib/temporal-spring-ai/build.gradle deleted file mode 100644 index b2ad959834..0000000000 --- a/contrib/temporal-spring-ai/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id 'base' -} - -description = 'Temporal Spring AI relocation' - -// Remove this project after publishing the one-time relocation release. -publishing { - publications { - mavenJava(MavenPublication) { - pom { - packaging = 'pom' - distributionManagement { - relocation { - groupId = 'io.temporal' - artifactId = 'spring-ai' - version = '0.1.0' - message = 'Use io.temporal:spring-ai from temporalio/ai-integrations.' - } - } - } - } - } -} diff --git a/gradle/java.gradle b/gradle/java.gradle index a91b312934..37db264a55 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -1,5 +1,5 @@ subprojects { - if (name in ['temporal-bom', 'temporal-spring-ai']) { + if (name == 'temporal-bom') { return } apply plugin: 'java-library' diff --git a/settings.gradle b/settings.gradle index a2ee73e91a..caa1bb50cc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,9 +21,6 @@ project(':temporal-opentracing').projectDir = file('contrib/temporal-opentracing include 'temporal-opentelemetry' project(':temporal-opentelemetry').projectDir = file('contrib/temporal-opentelemetry') include 'temporal-kotlin' -// Retained for the one-time relocation POM; implementation lives in ai-integrations. -include 'temporal-spring-ai' -project(':temporal-spring-ai').projectDir = file('contrib/temporal-spring-ai') include 'temporal-workflowstreams' project(':temporal-workflowstreams').projectDir = file('contrib/temporal-workflowstreams') include 'temporal-aws-lambda' diff --git a/temporal-bom/build.gradle b/temporal-bom/build.gradle index 0bbae3e4bd..86515deeda 100644 --- a/temporal-bom/build.gradle +++ b/temporal-bom/build.gradle @@ -16,8 +16,6 @@ dependencies { api project(':temporal-sdk') api project(':temporal-serviceclient') api project(':temporal-shaded') - // Retained for the final relocation release of the old coordinate. - api project(':temporal-spring-ai') api project(':temporal-spring-boot-autoconfigure') api project(':temporal-spring-boot-starter') api project(':temporal-test-server')