Merge c0a74bc22c into 64d6bfdd39

Previously, release drafter was inferring v0.0.1.
Now we force the proper version for the draft.

.github/release-drafter.yml

@@ -1,9 +1,6 @@
 # See https://github.com/release-drafter/release-drafter#configuration-options
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'rel/v$RESOLVED_VERSION'
-# Filter previous releases to consider only those with the target matching the current branch
-filter-by-commitish: true
-tag-prefix: REL
 exclude-labels:
   - 'skip-changelog'
 categories:

.github/workflows/main.yml

@@ -48,7 +48,7 @@ jobs:
         fetch-depth: 50
     - name: Set up Java ${{ matrix.java_version }}, oracle
       if: ${{ matrix.oracle_java_website != '' }}
-      uses: oracle-actions/setup-java@7a0114d66dbd02646abd345c3395b34c148e6126 # v1.3.2
+      uses: oracle-actions/setup-java@b1546e588c27008e88bfcabda44d11c22316b9b8 # v1.4.2
       with:
         website: ${{ matrix.oracle_java_website }}
         release: ${{ matrix.java_version }}

.github/workflows/matrix.js

@@ -83,6 +83,8 @@ matrix.exclude({os: 'macos-latest', java_distribution: {value: 'oracle'}})
 // Ignore builds with JAVA EA for now, see https://github.com/apache/jmeter/issues/6114
 matrix.exclude({java_version: eaJava})
 matrix.imply({java_version: eaJava}, {java_distribution: {value: 'oracle'}})
+// Oracle JDK is only supported for JDK 21 and later
+matrix.imply({java_distribution: {value: 'oracle'}}, {java_version: v => v === eaJava || v >= 21});
 // TODO: Semeru does not ship Java 21 builds yet
 matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'});
 // Ensure at least one job with "same" hashcode exists

.github/workflows/release-drafter.yml

@@ -8,13 +8,36 @@ on:
       - 'release/**'
   # pull_request_target allows PR from forks to access secrets, so please NEVER add pull_request_target
 
+# Declare default permissions as read-only.
+permissions: read-all
+
 jobs:
   update_release_draft:
     # Skip release drafts in forks
-    if: github.repository_owner == 'apache'
+    if: vars.RUN_RELEASE_DRAFTER == 'true'
     name: Update Release Draft
     runs-on: ubuntu-latest
+    permissions:
+      # write permission is required to create a github release
+      contents: write
     steps:
+      - name: Get the current version
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+        id: current_version
+        with:
+          # language=javascript
+          script: |
+            const response = await github.rest.repos.getContent({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              path: 'gradle.properties',
+              ref: context.sha
+            });
+            const content = Buffer.from(response.data.content, 'base64').toString();
+            const version = content.match(/^jmeter\.version=(.+)$/m)[1];
+            console.log(`Version is ${version}`);
+            return version;
+
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update release body draft
         uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
@@ -23,5 +46,8 @@ jobs:
         with:
         #   config-name: my-config.yml
            disable-autolabeler: true
+           publish: false
+           latest: ${{ github.ref_name == github.event.repository.default_branch }}
+           version: ${{ steps.current_version.outputs.result }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/bom-thirdparty/build.gradle.kts

@@ -127,10 +127,10 @@ dependencies {
         api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
         api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
         api("org.jetbrains:annotations:24.1.0")
-        api("org.jodd:jodd-core:5.0.13")
-        api("org.jodd:jodd-lagarto:5.0.13")
-        api("org.jodd:jodd-log:5.0.13")
-        api("org.jodd:jodd-props:5.0.13")
+        api("org.jodd:jodd-core:5.3.0")
+        api("org.jodd:jodd-lagarto:5.1.5")
+        api("org.jodd:jodd-log:5.1.6")
+        api("org.jodd:jodd-props:5.2.0")
         api("org.jsoup:jsoup:1.17.1")
         api("org.mongodb:mongo-java-driver:2.14.3")
         api("org.mozilla:rhino:1.7.14")