Merge branch 'adoptium:master' into test

Author: Amrutha-Kanhirathingal

.github/workflows/directoriesFilesChangePR.yml

@@ -51,7 +51,7 @@ jobs:
           jdksource: 'install-jdk'
           version: ${{ matrix.version }}
           openjdk_testRepo: '${{ github.event.pull_request.head.repo.full_name }}:${{ github.head_ref }}'
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: failure()
         with:
           name: output_changed_based_build_list

.github/workflows/parse-issues.yml

@@ -44,7 +44,7 @@ jobs:
           cat all.json | python scripts/disabled_tests/issue_status.py -v > output.json
           echo "::endgroup::"
       - name: store artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: disabled_tests
           path: output.json

.github/workflows/runAqa.yml

@@ -35,7 +35,7 @@ jobs:
     - name: Parse parameters
       env:
         args: ${{ github.event.comment.body }}
-      run: python3 TKG/scripts/testBot/runAqaArgParse.py $args 2> log.txt
+      run: python3 TKG/scripts/testBot/runAqaArgParse.py "$args" 2> log.txt
       id: argparse
     - name: Output log
       if: failure()
@@ -45,7 +45,7 @@ jobs:
         log="${log//'%'/'%25'}"
         log="${log//$'\n'/'%0A'}"
         log="${log//$'\r'/'%0D'}"
-        log="${log/$'`'/'\`'}"
+        log="${log//'`'/'\`'}"
         echo ::set-output name=log::$log
       id: output_log
     - name: Create error comment
@@ -54,13 +54,14 @@ jobs:
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
-          comment_body = `
-          @${{ github.actor }}
-          \`\`\`
-          ${{ steps.output_log.outputs.log }}
-          \`\`\`
-          No builds were started.
-          `;
+          const log_content = `${{ steps.output_log.outputs.log }}`;
+          const comment_body = [
+            `@${{ github.actor }}`,
+            '```',
+            log_content,
+            '```',
+            'No builds were started.'
+          ].join('\n');
           github.rest.issues.createComment({
             issue_number: context.issue.number,
             owner: context.repo.owner,
@@ -157,7 +158,7 @@ jobs:
          version: ${{ matrix.jdk_version }}
          openjdk_testRepo: '${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}:${{ fromJSON(steps.get-pr.outputs.result).head.ref }}'
          tkg_Repo: ${{ matrix.tkg_repo }}
-    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       if: failure()
       with:
         name: test_output

openjdk/excludes/ProblemList_openjdk25.txt

@@ -112,7 +112,7 @@ jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java https://bugs.openj
 
 # jdk_net
 
-java/net/CookieHandler/B6644726.java https://bugs.openjdk.org/browse/JDK-8365811 macosx-all
+java/net/CookieHandler/B6644726.java https://bugs.openjdk.org/browse/JDK-8365811 generic-all
 java/net/Inet4Address/PingThis.java https://github.com/adoptium/infrastructure/issues/1127 aix-all
 java/net/InetAddress/BadDottedIPAddress.java https://github.com/adoptium/aqa-tests/issues/593 linux-all
 java/net/InetAddress/CachedUnknownHostName.java https://github.com/adoptium/aqa-tests/issues/593 linux-all

openjdk/openjdk.mk

@@ -143,11 +143,6 @@ JTREG_BASIC_OPTIONS += $(JTREG_KEY_OPTIONS)
 JTREG_BASIC_OPTIONS_WO_EXTRA_OPTS := $(JTREG_BASIC_OPTIONS)
 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 
-# Add APPLICATION_OPTIONS to pass options directly to jtreg (not through vmoptions)
-ifdef APPLICATION_OPTIONS
-    JTREG_BASIC_OPTIONS += $(APPLICATION_OPTIONS)
-endif
-
 # add another new parameter for concurrency
 SPECIAL_CONCURRENCY=$(EXTRA_JTREG_OPTIONS)
 # set SPECIAL_CONCURRENCY to 1 if the jdk is openj9 and the platform is linux_aarch64.