Merge branch 'main' into distinct_from

Author: pengpeng-lu

.github/workflows/pull_request.yml

@@ -64,6 +64,40 @@ jobs:
           include-hidden-files: true
           retention-days: 1
 
+  lucene-tests:
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout sources
+        uses: actions/[email protected]
+      - name: Setup Base Environment
+        uses: ./actions/setup-base-env
+      - name: Setup FDB
+        uses: ./actions/setup-fdb
+      - name: Run Gradle Test
+        uses: ./actions/gradle-test
+        with:
+          gradle_command: :fdb-record-layer-lucene:test :fdb-record-layer-lucene:destructiveTest
+          gradle_args: -PreleaseBuild=false -PpublishBuild=false
+      - name: Publish Test Reports
+        if: always()
+        uses: actions/[email protected]
+        with:
+          name: lucene-test-reports
+          path: |
+            test-reports/fdb-record-layer-lucene/
+      - name: Publish Coverage Data
+        uses: actions/[email protected]
+        with:
+          name: lucene-coverage-data
+          path: |
+            **/.out/jacoco/*.exec
+          include-hidden-files: true
+          retention-days: 1
+
   other-tests:
     runs-on: ubuntu-latest
     permissions:
@@ -80,7 +114,7 @@ jobs:
       - name: Run Gradle Test
         uses: ./actions/gradle-test
         with:
-          gradle_command: test -x :fdb-record-layer-core:test destructiveTest -x :fdb-record-layer-core:destructiveTest
+          gradle_command: test -x :fdb-record-layer-core:test -x :fdb-record-layer-lucene:test destructiveTest -x :fdb-record-layer-core:destructiveTest -x :fdb-record-layer-lucene:destructiveTest 
           gradle_args: -PreleaseBuild=false -PpublishBuild=false
       - name: Publish Test Reports
         if: always()
@@ -92,7 +126,6 @@ jobs:
             test-reports/fdb-extensions/
             test-reports/fdb-record-layer-icu/
             test-reports/fdb-record-layer-spatial/
-            test-reports/fdb-record-layer-lucene/
             test-reports/fdb-record-layer-jmh/
             test-reports/examples/
             test-reports/fdb-relational-api/
@@ -113,7 +146,7 @@ jobs:
           retention-days: 1
 
   coverage:
-    needs: [core-tests, other-tests]
+    needs: [core-tests, lucene-tests, other-tests]
     runs-on: ubuntu-latest
     permissions:
       checks: read

.github/workflows/release.yml

@@ -39,6 +39,7 @@ jobs:
   #   a) all the tests
   #   b) the mixed-mode tests
   test:
+    needs: [get-update-type]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -50,6 +51,12 @@ jobs:
         uses: ./actions/setup-base-env
       - name: Setup FDB
         uses: ./actions/setup-fdb
+      # Increment the version here so that the version used in tests matches the eventually published version.
+      # This is actually important in order to correctly choose appropriate external server versions during
+      # mixed mode tests (see: https://github.com/FoundationDB/fdb-record-layer/issues/3449)
+      - name: Increment version
+        shell: bash
+        run: python build/versionutils.py gradle.properties --increment -u ${{ needs.get-update-type.outputs.update-type }}
       - name: Run Gradle Test
         uses: ./actions/gradle-test
         with:
@@ -182,9 +189,9 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
       # Post release: Update various files which reference version
       # Updating the yaml files has to be done after the tests complete, or it will mark tests as failing that aren't

.idea/gradle.xml

@@ -310,8 +310,8 @@ if (Boolean.parseBoolean(centralPublish)) {
     nexusPublishing {
         repositories {
             sonatype {
-                username = System.getenv("MAVEN_USER")
-                password = System.getenv("MAVEN_PASSWORD")
+                // Update the URL now that the OSSRH service has been sunset: https://central.sonatype.org/news/20250326_ossrh_sunset/
+                nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
             }
         }
     }