Fix formatting of DateFormat.strict_date_optional_time_nanos.

Original Pull Request: #3337
Closes: #3334

Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
(cherry picked from commit cd1bd52466)

.github/actions/release-train-build/action.yml

@@ -0,0 +1,30 @@
+name: Build Release
+runs:
+  using: composite
+  steps:
+    - name: Write settings.xml
+      if: ${{ env.RELEASE_TRAIN_SETTINGS_XML != '' }}
+      shell: bash
+      run: |
+        echo "::notice::Writing provided settings-xml input to release-train-settings.xml"
+        echo "${RELEASE_TRAIN_SETTINGS_XML}" > release-train-settings.xml
+    - name: Prepare Maven command
+      shell: bash
+      run: |
+        MAVEN_LOGGING_OPTS=()
+        if [[ "${RUNNER_DEBUG}" == "1" || "${ACTIONS_STEP_DEBUG}" == "true" ]]; then
+          echo "::notice::transfer-progress enabled"
+        else
+          MAVEN_LOGGING_OPTS+=(--no-transfer-progress)
+        fi
+
+        echo "RELEASE_TRAIN_MVN=./mvnw --batch-mode ${MAVEN_LOGGING_OPTS[*]} --settings release-train-settings.xml clean deploy -DaltDeploymentRepository=release-train::file://$(pwd)/deployment-repository -DskipTests -Dgpg.skip" >> "${GITHUB_ENV}"
+    - name: Build Release
+      shell: bash
+      run: ${RELEASE_TRAIN_MVN} --activate-profiles releaseTrain,release,ci
+    - name: Distribution build
+      shell: bash
+      run: ${RELEASE_TRAIN_MVN} --activate-profiles releaseTrain,distribute
+    - name: Schema build
+      shell: bash
+      run: ${RELEASE_TRAIN_MVN} --activate-profiles releaseTrain,distribute-schema

.github/actions/release-train-build/deployment-spec.yml

@@ -0,0 +1,6 @@
+artifactory:
+  artifacts:
+    - pattern: "/**/spring-data-*-docs.zip"
+      properties:
+        zip.deployed: "false"
+        zip.type: "docs"

.github/actions/release-train-test/action.yml

@@ -0,0 +1,24 @@
+name: Test Release
+runs:
+  using: composite
+  steps:
+    - name: Write settings.xml
+      if: ${{ env.RELEASE_TRAIN_SETTINGS_XML != '' }}
+      shell: bash
+      run: |
+        echo "::notice::Writing provided settings-xml input to release-train-settings.xml"
+        echo "${RELEASE_TRAIN_SETTINGS_XML}" > release-train-settings.xml
+    - name: Prepare Maven command
+      shell: bash
+      run: |
+        MAVEN_LOGGING_OPTS=()
+        if [[ "${RUNNER_DEBUG}" == "1" || "${ACTIONS_STEP_DEBUG}" == "true" ]]; then
+          echo "::notice::transfer-progress enabled"
+        else
+          MAVEN_LOGGING_OPTS+=(--no-transfer-progress)
+        fi
+
+        echo "RELEASE_TRAIN_MVN=./mvnw --batch-mode ${MAVEN_LOGGING_OPTS[*]} --settings release-train-settings.xml clean verify -Dgpg.skip" >> "${GITHUB_ENV}"
+    - name: Test Release
+      shell: bash
+      run: ${RELEASE_TRAIN_MVN} --activate-profiles releaseTrain,release,ci

.github/workflow-generator.yml

@@ -0,0 +1,26 @@
+workflow:
+  generator:
+    project:
+      java:
+        versions:
+          primary: 25
+    workflows:
+      release-train:
+        join:
+          watch: false
+        leave:
+          watch: false
+        ready:
+          watch: false
+        build:
+          env:
+            COMMERCIAL_REPO_USERNAME: secrets.COMMERCIAL_ARTIFACTORY_USERNAME
+            COMMERCIAL_REPO_PASSWORD: secrets.COMMERCIAL_ARTIFACTORY_PASSWORD
+            COMMERCIAL_RELEASE_REPO_URL: vars.COMMERCIAL_RELEASE_REPO_URL
+            RELEASE_TRAIN_SETTINGS_XML: vars.RELEASE_TRAIN_SETTINGS_XML
+        test:
+          env:
+            COMMERCIAL_REPO_USERNAME: secrets.COMMERCIAL_ARTIFACTORY_USERNAME
+            COMMERCIAL_REPO_PASSWORD: secrets.COMMERCIAL_ARTIFACTORY_PASSWORD
+            COMMERCIAL_RELEASE_REPO_URL: vars.COMMERCIAL_RELEASE_REPO_URL
+            RELEASE_TRAIN_SETTINGS_XML: vars.RELEASE_TRAIN_SETTINGS_XML

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI Build
 on:
   workflow_dispatch:
   push:
-    branches: [ main, 'issue/**' ]
+    branches: [ 6.1.x, 'issue/6.1.x/**' ]
 
 permissions: read-all
 
@@ -13,17 +13,21 @@ jobs:
       matrix:
         java-version: [ base, main ]
     name: Build project
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.ACTION_RUNNER || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v6
       - name: Setup Java and Maven
-        uses: spring-projects/spring-data-build/actions/setup-maven@main
+        uses: spring-projects/spring-data-build/actions/setup-maven@4.1.x
         with:
           java-version: ${{ matrix.java-version }}
           develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
       - name: Build
-        uses: spring-projects/spring-data-build/actions/maven-build@main
+        uses: spring-projects/spring-data-build/actions/maven-build@4.1.x
         env:
+          OSS_ARTIFACTORY_USR: '${{ secrets.ARTIFACTORY_USERNAME }}'
+          OSS_ARTIFACTORY_PSW: '${{ secrets.ARTIFACTORY_PASSWORD }}'
+          COMMERCIAL_ARTIFACTORY_USR: '${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}'
+          COMMERCIAL_ARTIFACTORY_PSW: '${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}'
           TESTCONTAINERS_REUSE_ENABLE: true
         with:
           settings-xml: '${{ vars.SETTINGS_XML }}'

.github/workflows/codeql.yml

@@ -4,6 +4,7 @@ name: "CodeQL Advanced"
 
 on:
   push:
+    branches: [ 6.1.x ]
   pull_request:
   workflow_dispatch:
   schedule:

.github/workflows/release-train-build.yml

@@ -0,0 +1,92 @@
+# This file was auto-generated by github-actions-workflow-generator 0.0.6. Do not edit.
+# To update it, modify .github/workflow-generator.yml as needed and re-run the generator.
+
+name: "Release Train – Build"
+run-name: "${{ inputs.callback-ref }} – Build"
+"on":
+  workflow_dispatch:
+    inputs:
+      callback:
+        description: "Repository to which a callback should be made upon completion"
+        required: true
+        type: "string"
+      callback-ref:
+        description: "Ref in the callback repository to which a callback should be made upon completion"
+        required: true
+        type: "string"
+      release-train-maven-repository-url:
+        description: "URL of a Maven repository to be used to resolve artifacts of projects earlier in the train"
+        required: true
+        type: "string"
+permissions:
+  contents: "read"
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+jobs:
+  build-release:
+    name: "Build Release"
+    runs-on: "ubuntu22-2-8"
+    steps:
+    - name: "Prevent Re-runs"
+      id: "prevent-re-runs"
+      run: |-
+        if [ "$GITHUB_RUN_ATTEMPT" -gt 1 ]; then
+          echo "Re-runs are prohibited. Use the 'Release Train – Retry' workflow to retry build failures"
+          exit 1
+        fi
+    - name: "Set up Java"
+      id: "set-up-java"
+      uses: "actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95" # v5.6.0
+      with:
+        distribution: "liberica"
+        java-version: "25"
+    - name: "Check Out Code"
+      id: "check-out-code"
+      uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
+    - name: "Build Release"
+      id: "build-release"
+      uses: "./.github/actions/release-train-build"
+      env:
+        COMMERCIAL_RELEASE_REPO_URL: "${{ vars.COMMERCIAL_RELEASE_REPO_URL }}"
+        COMMERCIAL_REPO_PASSWORD: "${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}"
+        COMMERCIAL_REPO_USERNAME: "${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}"
+        RELEASE_TRAIN_MAVEN_REPOSITORY_PASSWORD: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_MAVEN_REPOSITORY_PASSWORD }}"
+        RELEASE_TRAIN_MAVEN_REPOSITORY_URL: "${{ inputs.release-train-maven-repository-url }}"
+        RELEASE_TRAIN_MAVEN_REPOSITORY_USERNAME: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_MAVEN_REPOSITORY_USERNAME }}"
+        RELEASE_TRAIN_SETTINGS_XML: "${{ vars.RELEASE_TRAIN_SETTINGS_XML }}"
+    - name: "Upload Deployment Repository"
+      id: "upload-deployment-repository"
+      uses: "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a" # v7.0.1
+      with:
+        name: "deployment-repository"
+        path: "deployment-repository/**"
+    - name: "Upload Deployment Spec"
+      id: "upload-deployment-spec"
+      uses: "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a" # v7.0.1
+      with:
+        archive: "false"
+        if-no-files-found: "ignore"
+        name: "deployment-spec"
+        path: ".github/actions/release-train-build/deployment-spec.yml"
+    - name: "Save Build System Caches"
+      id: "save-build-system-caches"
+      uses: "actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9" # v6.1.0
+      with:
+        key: "release-train-${{ inputs.callback-ref }}-${{ github.ref_name }}"
+        path: "~/.m2/repository"
+    - name: "Send Callback"
+      id: "send-callback"
+      if: "${{ !cancelled() }}"
+      env:
+        GH_TOKEN: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_GITHUB_TOKEN }}"
+      run: |-
+        gh workflow run callback \
+        --repo ${{ inputs.callback }} \
+        --ref ${{ inputs.callback-ref }} \
+        --field commit-hash=${{ steps.check-out-code.outputs.commit }} \
+        --field deployment-repository-artifact-identifier=${{ steps.upload-deployment-repository.outputs.artifact-id }} \
+        --field deployment-spec-artifact-identifier=${{ steps.upload-deployment-spec.outputs.artifact-id }} \
+        --field release-branch=${{ github.ref_name }} \
+        --field release-repository=${{ github.repository }} \
+        --field result=${{ job.status == 'success' && 'built' || 'build-failed' }} \
+        --field workflow-run-url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/release-train-join.yml

@@ -0,0 +1,43 @@
+# This file was auto-generated by github-actions-workflow-generator 0.0.6. Do not edit.
+# To update it, modify .github/workflow-generator.yml as needed and re-run the generator.
+
+name: "Release Train – Join"
+run-name: "${{ inputs.release-train }} – Join"
+"on":
+  workflow_dispatch:
+    inputs:
+      deployment-destination:
+        description: "Destination to which the release should be deployed"
+        options:
+        - "Maven Central"
+        - "Spring Enterprise"
+        required: true
+        type: "choice"
+      release-train:
+        description: "Release train"
+        required: true
+        type: "string"
+      release-train-repository:
+        default: "spring-io/release-train"
+        description: "Release train repository"
+        required: true
+        type: "string"
+permissions:
+  contents: "none"
+jobs:
+  join-release-train:
+    name: "Join Release Train"
+    runs-on: "ubuntu-latest"
+    steps:
+    - name: "Join Release Train"
+      id: "join-release-train"
+      env:
+        GH_TOKEN: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_GITHUB_TOKEN }}"
+      run: |-
+        gh workflow run join \
+        --repo ${{ inputs.release-train-repository }} \
+        --ref ${{ inputs.release-train }} \
+        --field commit-hash=${{ github.sha }} \
+        --field deployment-destination=${{ inputs.deployment-destination == 'Maven Central' && 'maven-central' || 'spring-enterprise' }} \
+        --field release-branch=${{ github.ref_name }} \
+        --field release-repository=${{ github.repository }}

.github/workflows/release-train-leave.yml

@@ -0,0 +1,34 @@
+# This file was auto-generated by github-actions-workflow-generator 0.0.6. Do not edit.
+# To update it, modify .github/workflow-generator.yml as needed and re-run the generator.
+
+name: "Release Train – Leave"
+run-name: "${{ inputs.release-train }} – Leave"
+"on":
+  workflow_dispatch:
+    inputs:
+      release-train:
+        description: "Release train"
+        required: true
+        type: "string"
+      release-train-repository:
+        default: "spring-io/release-train"
+        description: "Release train repository"
+        required: true
+        type: "string"
+permissions:
+  contents: "none"
+jobs:
+  leave:
+    name: "Leave"
+    runs-on: "ubuntu-latest"
+    steps:
+    - name: "Leave"
+      id: "leave"
+      env:
+        GH_TOKEN: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_GITHUB_TOKEN }}"
+      run: |-
+        gh workflow run leave \
+        --repo ${{ inputs.release-train-repository }} \
+        --ref ${{ inputs.release-train }} \
+        --field release-branch=${{ github.ref_name }} \
+        --field release-repository=${{ github.repository }}

.github/workflows/release-train-ready.yml

@@ -0,0 +1,35 @@
+# This file was auto-generated by github-actions-workflow-generator 0.0.6. Do not edit.
+# To update it, modify .github/workflow-generator.yml as needed and re-run the generator.
+
+name: "Release Train – Ready"
+run-name: "${{ inputs.release-train }} – Ready"
+"on":
+  workflow_dispatch:
+    inputs:
+      release-train:
+        description: "Release train"
+        required: true
+        type: "string"
+      release-train-repository:
+        default: "spring-io/release-train"
+        description: "Release train repository"
+        required: true
+        type: "string"
+permissions:
+  contents: "none"
+jobs:
+  ready:
+    name: "Ready"
+    runs-on: "ubuntu-latest"
+    steps:
+    - name: "Ready"
+      id: "ready"
+      env:
+        GH_TOKEN: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_GITHUB_TOKEN }}"
+      run: |-
+        gh workflow run ready \
+        --repo ${{ inputs.release-train-repository }} \
+        --ref ${{ inputs.release-train }} \
+        --field commit-hash=${{ github.sha }} \
+        --field release-branch=${{ github.ref_name }} \
+        --field release-repository=${{ github.repository }}

.github/workflows/release-train-retry.yml

@@ -0,0 +1,34 @@
+# This file was auto-generated by github-actions-workflow-generator 0.0.6. Do not edit.
+# To update it, modify .github/workflow-generator.yml as needed and re-run the generator.
+
+name: "Release Train – Retry"
+run-name: "${{ inputs.release-train }} – Retry"
+"on":
+  workflow_dispatch:
+    inputs:
+      release-train:
+        description: "Release train"
+        required: true
+        type: "string"
+      release-train-repository:
+        default: "spring-io/release-train"
+        description: "Release train repository"
+        required: true
+        type: "string"
+permissions:
+  contents: "none"
+jobs:
+  trigger-retry:
+    name: "Trigger Retry"
+    runs-on: "ubuntu-latest"
+    steps:
+    - name: "Trigger Retry"
+      id: "trigger-retry"
+      env:
+        GH_TOKEN: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_GITHUB_TOKEN }}"
+      run: |-
+        gh workflow run retry \
+        --repo ${{ inputs.release-train-repository }} \
+        --ref ${{ inputs.release-train }} \
+        --field release-branch=${{ github.ref_name }} \
+        --field release-repository=${{ github.repository }}

.github/workflows/release-train-test.yml

@@ -0,0 +1,85 @@
+# This file was auto-generated by github-actions-workflow-generator 0.0.6. Do not edit.
+# To update it, modify .github/workflow-generator.yml as needed and re-run the generator.
+
+name: "Release Train – Test"
+run-name: "${{ inputs.callback-ref }} – Test"
+"on":
+  workflow_dispatch:
+    inputs:
+      callback:
+        description: "Repository to which a callback should be made upon completion"
+        required: true
+        type: "string"
+      callback-ref:
+        description: "Ref in the callback repository to which a callback should be made upon completion"
+        required: true
+        type: "string"
+      release-train-maven-repository-url:
+        description: "URL of a Maven repository to be used to resolve artifacts of projects earlier in the train"
+        required: true
+        type: "string"
+permissions:
+  contents: "read"
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+jobs:
+  test-release:
+    name: "Test Release"
+    runs-on: "ubuntu22-2-8"
+    steps:
+    - name: "Prevent Re-runs"
+      id: "prevent-re-runs"
+      run: |-
+        if [ "$GITHUB_RUN_ATTEMPT" -gt 1 ]; then
+          echo "Re-runs are prohibited. Use the 'Release Train – Retry' workflow to retry test failures"
+          exit 1
+        fi
+    - name: "Set up Java"
+      id: "set-up-java"
+      uses: "actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95" # v5.6.0
+      with:
+        distribution: "liberica"
+        java-version: "25"
+    - name: "Check Out Code"
+      id: "check-out-code"
+      uses: "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" # v7.0.0
+    - name: "Restore Build System Caches"
+      id: "restore-build-system-caches"
+      uses: "actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9" # v6.1.0
+      with:
+        key: "release-train-${{ inputs.callback-ref }}-${{ github.ref_name }}"
+        path: "~/.m2/repository"
+    - name: "Test Release"
+      id: "test-release"
+      uses: "./.github/actions/release-train-test"
+      env:
+        COMMERCIAL_RELEASE_REPO_URL: "${{ vars.COMMERCIAL_RELEASE_REPO_URL }}"
+        COMMERCIAL_REPO_PASSWORD: "${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}"
+        COMMERCIAL_REPO_USERNAME: "${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}"
+        RELEASE_TRAIN_MAVEN_REPOSITORY_PASSWORD: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_MAVEN_REPOSITORY_PASSWORD }}"
+        RELEASE_TRAIN_MAVEN_REPOSITORY_URL: "${{ inputs.release-train-maven-repository-url }}"
+        RELEASE_TRAIN_MAVEN_REPOSITORY_USERNAME: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_MAVEN_REPOSITORY_USERNAME }}"
+        RELEASE_TRAIN_SETTINGS_XML: "${{ vars.RELEASE_TRAIN_SETTINGS_XML }}"
+    - name: "Send Callback"
+      id: "send-callback"
+      if: "${{ !cancelled() }}"
+      env:
+        GH_TOKEN: "${{ secrets.RELEASE_TRAIN_PARTICIPANT_GITHUB_TOKEN }}"
+      run: |-
+        gh workflow run callback \
+        --repo ${{ inputs.callback }} \
+        --ref ${{ inputs.callback-ref }} \
+        --field commit-hash=${{ steps.check-out-code.outputs.commit }} \
+        --field release-branch=${{ github.ref_name }} \
+        --field release-repository=${{ github.repository }} \
+        --field result=${{ job.status == 'success' && 'tested' || 'test-failed' }} \
+        --field workflow-run-url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+    - name: "Upload Build System Reports"
+      id: "upload-build-system-reports"
+      if: "${{ failure() }}"
+      uses: "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a" # v7.0.1
+      with:
+        name: "build-system-reports"
+        path: |-
+          **/target/surefire-reports
+          **/target/failsafe-reports

.github/workflows/snapshots.yml

@@ -3,7 +3,7 @@ name: Snapshots
 on:
   workflow_dispatch:
   push:
-    branches: [ main, 'issue/**' ]
+    branches: [ 6.1.x, 'issue/6.1.x/**', 'release/**' ]
 
 permissions: read-all
 
@@ -11,22 +11,21 @@ jobs:
   build-snapshots:
     name: Build and deploy snapshots
     if: ${{ github.repository_owner == 'spring-projects' }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.ACTION_RUNNER || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v6
       - name: Setup Java and Maven
-        uses: spring-projects/spring-data-build/actions/setup-maven@main
+        uses: spring-projects/spring-data-build/actions/setup-maven@4.1.x
         with:
           develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
       - name: Deploy to Artifactory
-        uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@main
+        uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@4.1.x
         env:
+          OSS_ARTIFACTORY_USR: '${{ secrets.ARTIFACTORY_USERNAME }}'
+          OSS_ARTIFACTORY_PSW: '${{ secrets.ARTIFACTORY_PASSWORD }}'
+          COMMERCIAL_ARTIFACTORY_USR: '${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}'
+          COMMERCIAL_ARTIFACTORY_PSW: '${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}'
           TESTCONTAINERS_REUSE_ENABLE: true
         with:
           build-name: 'spring-data-elasticsearch'
-          username: '${{ secrets.ARTIFACTORY_USERNAME }}'
-          password: '${{ secrets.ARTIFACTORY_PASSWORD }}'
-          context-url: '${{ vars.ARTIFACTORY_CONTEXT_URL }}'
-          repository: '${{ vars.ARTIFACTORY_REPOSITORY }}'
-          project: '${{ vars.ARTIFACTORY_PROJECT }}'
           settings-xml: '${{ vars.SETTINGS_XML }}'

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>6.1.0</version>
+	<version>6.1.2-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.2-SNAPSHOT</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,11 +18,11 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<springdata.commons>4.1.0</springdata.commons>
+		<springdata.commons>4.1.2-SNAPSHOT</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.4.2</elasticsearch-java>
-		<elasticsearch-rest-client>9.4.2</elasticsearch-rest-client>
+		<elasticsearch-java>9.4.6</elasticsearch-java>
+		<elasticsearch-rest-client>9.4.5</elasticsearch-rest-client>
 
 		<hoverfly>0.20.2</hoverfly>
 		<log4j>2.25.4</log4j>
@@ -376,8 +376,18 @@
 				<filtering>false</filtering>
 				<excludes>
 					<exclude>**/versions.properties</exclude>
+					<exclude>notice.txt</exclude>
+					<exclude>license.txt</exclude>
 				</excludes>
 			</resource>
+			<resource>
+				<directory>${project.root}/src/main/resources</directory>
+				<targetPath>META-INF</targetPath>
+				<includes>
+					<include>notice.txt</include>
+					<include>license.txt</include>
+				</includes>
+			</resource>
 		</resources>
 
 		<plugins>
@@ -498,8 +508,20 @@
 	</profiles>
 
 	<repositories>
-		
-		
+		<repository>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
 	</repositories>
 
 </project>

src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc

@@ -1,6 +1,17 @@
 [[new-features]]
 = What's new
 
+[[new-features.6-1-2]]
+== New in Spring Data Elasticsearch 6.1.2
+
+* Upgrade to Elasticsearch client 9.4.6
+* Fix formatting of DateFormat.strict_date_optional_time_nanos  (https://github.com/spring-projects/spring-data-elasticsearch/issues/3334[GH #3334])
+
+[[new-features.6-1-1]]
+== New in Spring Data Elasticsearch 6.1.1
+
+* Upgrade to Elasticsearch 9.4.5
+
 [[new-features.6-1-0]]
 == New in Spring Data Elasticsearch 6.1
 

src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc

@@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
 [cols="^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2026.0 | 6.1.x | 9.4.2 | 7.0.x
+| 2026.0 | 6.1.x | 9.4.6 | 7.0.x
 | 2025.1 | 6.0.x | 9.2.2 | 7.0.x
 | 2025.0 | 5.5.xfootnote:oom[Out of maintenance] | 8.18.1 | 6.2.x
 | 2024.1 | 5.4.xfootnote:oom[] | 8.15.5 | 6.1.x

src/main/antora/resources/antora-resources/antora.yml

@@ -13,7 +13,7 @@ asciidoc:
     include-xml-namespaces: false
     spring-data-commons-docs-url: '${documentation.baseurl}/spring-data/commons/reference/${springdata.commons.short}'
     spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
-    springdocsurl: '${documentation.baseurl}/spring-framework/reference/{springversionshort}'
+    springdocsurl: '${documentation.spring-reference-url}/{springversionshort}'
     spring-framework-docs: '{springdocsurl}'
     springjavadocurl: '${documentation.spring-javadoc-url}'
     spring-framework-javadoc: '{springjavadocurl}'

src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java

@@ -88,7 +88,7 @@ public enum DateFormat {
 	 * @since 5.3
 	 */
 	strict_date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
-	strict_date_optional_time_nanos("uuuu-MM-dd['T'HH:mm:ss.SSSSSSXXX]"), //
+	strict_date_optional_time_nanos("uuuu-MM-dd['T'HH:mm:ss.SSSSSSSSSXXX]"), //
 	date_time("uuuu-MM-dd'T'HH:mm:ss.SSSXXX"), //
 	/**
 	 * @since 5.3

src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

@@ -70,11 +70,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.Optional;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -234,7 +234,8 @@ class RequestConverter extends AbstractQueryProcessor {
 		for (Alias alias : indexSettings.getAliases()) {
 			co.elastic.clients.elasticsearch.indices.Alias esAlias = co.elastic.clients.elasticsearch.indices.Alias
 					.of(ab -> {
-						co.elastic.clients.elasticsearch.indices.Alias.Builder aliasBuilder = ab.filter(getQuery(alias.getFilter(), null))
+						co.elastic.clients.elasticsearch.indices.Alias.Builder aliasBuilder = ab
+								.filter(getQuery(alias.getFilter(), null))
 								.isHidden(alias.getHidden())
 								.isWriteIndex(alias.getWriteIndex());
 						getRouting(alias.getRouting()).ifPresent(aliasBuilder::routing);
@@ -807,7 +808,7 @@ class RequestConverter extends AbstractQueryProcessor {
 		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
 
 		return GetRequest.of(grb -> {
-			GetRequest.Builder builder =  grb //
+			GetRequest.Builder builder = grb //
 					.index(indexCoordinates.getIndexName()) //
 					.id(id); //
 			getRouting(routing).ifPresent(builder::routing);
@@ -846,7 +847,7 @@ class RequestConverter extends AbstractQueryProcessor {
 
 		List<MultiGetOperation> multiGetOperations = query.getIdsWithRouting().stream()
 				.map(idWithRouting -> MultiGetOperation.of(mgo -> {
-					MultiGetOperation.Builder builder =  mgo //
+					MultiGetOperation.Builder builder = mgo //
 							.index(index.getIndexName()) //
 							.id(idWithRouting.id()) //
 							.source(sourceConfig);
@@ -1071,29 +1072,7 @@ class RequestConverter extends AbstractQueryProcessor {
 		return UpdateRequest.of(uqb -> {
 			uqb.index(indexName).id(query.getId());
 
-			var scriptData = query.getScriptData();
-			var script = scriptData != null ? scriptData.script() : null;
-
-			if (script != null) {
-				Map<String, JsonData> params = new HashMap<>();
-
-				if (query.getParams() != null) {
-					query.getParams().forEach((key, value) -> params.put(key, JsonData.of(value, jsonpMapper)));
-				}
-
-				uqb.script(sb -> {
-					sb
-							.lang(scriptData.language())
-							.params(params);
-
-					if (script != null) {
-						sb.source(s -> s.scriptString(script));
-					}
-					sb.id(scriptData.scriptName());
-
-					return sb;
-				});
-			}
+			uqb.script(getScript(query.getScriptData()));
 
 			uqb
 					.doc(query.getDocument())
@@ -1980,6 +1959,7 @@ class RequestConverter extends AbstractQueryProcessor {
 		}
 		return Optional.empty();
 	}
+
 	Optional<String> getRouting(@Nullable String routing1, @Nullable String routing2) {
 		return getRouting(routing1).or(() -> getRouting(routing2));
 	}

src/main/java/org/springframework/data/elasticsearch/client/elc/rest5_client/Rest5Clients.java

@@ -93,16 +93,18 @@ public final class Rest5Clients {
 					throw new RuntimeException(e);
 				}
 			}
-			httpAsyncClientBuilder.addRequestInterceptorFirst((request, entity, context) -> {
-				clientConfiguration.getHeadersSupplier().get().forEach((header, values) -> {
-					// The accept and content-type headers are already put on the request, despite this being the first
-					// interceptor.
-					if ("Accept".equalsIgnoreCase(header) || " Content-Type".equalsIgnoreCase(header)) {
-						request.removeHeaders(header);
-					}
-					values.forEach(value -> request.addHeader(header, value));
-				});
-			});
+			httpAsyncClientBuilder.addExecInterceptorFirst("es-rest5-client",
+					(request, entityProducer, scope, chain, asyncExecCallback) -> {
+						clientConfiguration.getHeadersSupplier().get().forEach((header, values) -> {
+							// The accept and content-type headers may already be put on the request, despite this being the
+							// first interceptor.
+							if ("Accept".equalsIgnoreCase(header) || "Content-Type".equalsIgnoreCase(header)) {
+								request.removeHeaders(header);
+							}
+							values.forEach(value -> request.addHeader(header, value));
+						});
+						chain.proceed(request, entityProducer, scope, asyncExecCallback);
+					});
 
 			// add httpclient configurator callbacks provided by the configuration
 			for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration

src/main/resources/license.txt

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         https://www.apache.org/licenses/
@@ -178,7 +179,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,18 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-=======================================================================   
-
-To the extent any open source subcomponents are licensed under the EPL and/or other 
-similar licenses that require the source code and/or modifications to 
-source code to be made available (as would be noted above), you may obtain a 
-copy of the source code corresponding to the binaries for such open source 
-components and modifications thereto, if any, (the "Source Files"), by 
-downloading the Source Files from https://www.springsource.org/download, 
-or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview 
-Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com.  All 
-such requests should clearly specify:  OPEN SOURCE FILES REQUEST, Attention General 
-Counsel.  VMware shall mail a copy of the Source Files to you on a CD or equivalent 
-physical medium.  This offer to obtain a copy of the Source Files is valid for three 
-years from the date you acquired this Software product.

src/main/resources/notice.txt

@@ -1,5 +1,5 @@
-Spring Data Elasticsearch 6.1 GA (2026.0.0)
-Copyright (c) [2013-2022] Pivotal Software, Inc.
+Spring Data Elasticsearch 6.1.1 (2026.0.1)
+Copyright (c) [2013-2026] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
 You may not use this product except in compliance with the License.

src/test/java/org/springframework/data/elasticsearch/client/RestClientsTest.java

@@ -16,7 +16,6 @@
 package org.springframework.data.elasticsearch.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.*;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static io.specto.hoverfly.junit.dsl.HoverflyDsl.*;
 import static io.specto.hoverfly.junit.verification.HoverflyVerifications.*;
@@ -32,6 +31,7 @@ import io.specto.hoverfly.junit5.api.HoverflyConfig;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
@@ -108,6 +108,8 @@ public class RestClientsTest {
 			AtomicInteger connectionConfigurerCount = new AtomicInteger(0);
 			AtomicInteger connectionManagerConfigurerCount = new AtomicInteger(0);
 			AtomicInteger requestConfigurerCount = new AtomicInteger(0);
+			ThreadLocal<String> threadLocal = ThreadLocal.withInitial(() -> null);
+			AtomicReference<String> supplierThreadName = new AtomicReference<>();
 
 			ClientConfigurationBuilder configurationBuilder = new ClientConfigurationBuilder();
 			configurationBuilder //
@@ -115,7 +117,9 @@ public class RestClientsTest {
 					.withBasicAuth("user", "password") //
 					.withDefaultHeaders(defaultHeaders) //
 					.withHeaders(() -> {
+						supplierThreadName.set(Thread.currentThread().getName());
 						HttpHeaders httpHeaders = new HttpHeaders();
+						httpHeaders.add("thread", threadLocal.get());
 						httpHeaders.add("supplied", "val0");
 						httpHeaders.add("supplied", "val" + supplierCount.getAndIncrement());
 						return httpHeaders;
@@ -179,6 +183,7 @@ public class RestClientsTest {
 			// do several calls to check that the headerSupplier provided values are set
 			int startValue = clientUnderTest.usesInitialRequest() ? 2 : 1;
 			for (int i = startValue; i <= startValue + 2; i++) {
+				threadLocal.set("local");
 				clientUnderTest.ping();
 
 				verify(headRequestedFor(urlEqualTo("/")) //
@@ -189,10 +194,15 @@ public class RestClientsTest {
 						.withHeader("supplied", new EqualToPattern("val0")) //
 						// on the first call Elasticsearch does the version check and thus already increments the counter
 						.withHeader("supplied", new EqualToPattern("val" + i)) //
-						.withHeader("supplied", including("val0", "val" + i)));
+						.withHeader("supplied", including("val0", "val" + i)) //
+						.withHeader("thread", new EqualToPattern("local")));
 				;
 			}
 
+			// the headers supplier must run on the calling thread, so a ThreadLocal set above is visible (#3300).
+			// this guards against future regressions that move the supplier back onto the async I/O thread.
+			assertThat(supplierThreadName.get()).isEqualTo(Thread.currentThread().getName());
+
 			assertThat(restClientConfigurerCount).hasValue(clientUnderTestFactory.getExpectedRestClientConfigurerCalls());
 			assertThat(httpClientConfigurerCount).hasValue(1);
 			assertThat(connectionConfigurerCount).hasValue(clientUnderTestFactory.getExpectedConnectionConfigurerCalls());

src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java

@@ -16,6 +16,10 @@
 package org.springframework.data.elasticsearch.client.elc;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -131,10 +135,28 @@ class RequestConverterTest {
 				.documentUpdateRequest(updateQuery, IndexCoordinates.of("foo"), null, null);
 
 		assertThat(updateRequest.id()).isEqualTo("queryId");
+		assertThat(updateRequest.script()).isNotNull();
 		assertThat(updateRequest.script().source().scriptString()).isEqualTo("script");
 		assertThat(updateRequest.script().id()).isEqualTo("scriptName");
 	}
 
+	@Test // #3324
+	@DisplayName("should allow update script with only an id and no script code")
+	void shouldAllowUpdateScriptWithOnlyAnIdAndNoScriptCode() {
+		var updateQuery = UpdateQuery
+				.builder("queryId")
+				.withScriptName("scriptName")
+				.build();
+
+		UpdateRequest<org.springframework.data.elasticsearch.core.document.Document, ?> updateRequest = requestConverter
+				.documentUpdateRequest(updateQuery, IndexCoordinates.of("foo"), null, null);
+
+		assertThat(updateRequest.id()).isEqualTo("queryId");
+		assertThat(updateRequest.script()).isNotNull();
+		assertThat(updateRequest.script().source()).isNull();
+		assertThat(updateRequest.script().id()).isEqualTo("scriptName");
+	}
+
 	@Test
 	void getRouting() {
 
@@ -148,5 +170,4 @@ class RequestConverterTest {
 		assertEquals("5", requestConverter.getRouting(null, "5").get());
 
 	}
-
 }

src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterUnitTests.java

@@ -27,7 +27,8 @@ import org.springframework.data.elasticsearch.annotations.DateFormat;
  */
 class ElasticsearchDateConverterUnitTests {
 
-	private final ZonedDateTime zdt = ZonedDateTime.now(ZoneId.of("Europe/Berlin"));
+	public static final ZoneId zoneEuropeBerlin = ZoneId.of("Europe/Berlin");
+	private final ZonedDateTime zdt = ZonedDateTime.now(zoneEuropeBerlin);
 
 	@ParameterizedTest // DATAES-716
 	@EnumSource(DateFormat.class)
@@ -274,10 +275,14 @@ class ElasticsearchDateConverterUnitTests {
 		check(ElasticsearchDateConverter.of(DateFormat.date_optional_time), LocalDateTime.class);
 	}
 
-	@Test // #2676
+	@Test // #2676, #3334
 	@DisplayName("should convert strict_date_optional_time_nanos")
 	void shouldConvertStrictDateOptionalTime() {
-		check(ElasticsearchDateConverter.of(DateFormat.strict_date_optional_time_nanos), LocalDateTime.class);
+		LocalDateTime parsed = check(ElasticsearchDateConverter.of(DateFormat.strict_date_optional_time_nanos),
+				LocalDateTime.class);
+		// additional check that all nanoseconds are re-read
+		var zoned = ZonedDateTime.of(parsed, zoneEuropeBerlin);
+		assertThat(zoned).isEqualTo(zdt);
 	}
 
 	@Test // #1647
@@ -418,11 +423,12 @@ class ElasticsearchDateConverterUnitTests {
 		check(ElasticsearchDateConverter.of("basic_date_time ||invalid-pattern"), LocalDateTime.class);
 	}
 
-	private <T extends TemporalAccessor> void check(ElasticsearchDateConverter converter, Class<T> type) {
+	private <T extends TemporalAccessor> T check(ElasticsearchDateConverter converter, Class<T> type) {
 
 		String formatted = converter.format(zdt);
 		T parsed = converter.parse(formatted, type);
 
 		assertThat(parsed).isNotNull();
+		return parsed;
 	}
 }

src/test/resources/testcontainers-elasticsearch.properties

@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=9.4.2
+sde.testcontainers.image-version=9.4.5
 #
 #
 # needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13