Updating branch

Signed-off-by: Adam Farley <[email protected]>

.github/workflows/codeql-analysis.yml

@@ -42,11 +42,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+      uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+      uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,4 +71,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+      uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6

.github/workflows/runAqa.yml

@@ -19,7 +19,7 @@ jobs:
       id: workflow_run_info
     # Checkout current (TKG) repo to access the repo-specific config file `.github/workflows/runAqaConfig.json` and the shared script `scripts/testRepo/runAqaArgParse.py`
     - name: Checkout current repo
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         path: 'main'
     - name: Parse parameters
@@ -107,7 +107,7 @@ jobs:
         sourceType: 'buildType'
         impl: ${{ matrix.jdk_impl }}
     - name: Checkout PR Ref
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       if: matrix.sdk_resource == 'build-jdk'
       with:
         repository: ${{ matrix.build_repo_branch.repo }}
@@ -168,7 +168,7 @@ jobs:
          openjdk_testRepo: ${{ matrix.openjdk_testrepo }}
          openj9_repo: ${{ matrix.openj9_repo }}
          tkg_Repo: '${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}:${{ fromJSON(steps.get-pr.outputs.result).head.ref }}'
-    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       if: failure()
       with:
         name: test_output

.github/workflows/testTKG.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.event.comment.body, 'run tkg-test')
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
       - name: Set up JDK
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
         with:
           distribution: 'temurin'
           java-version: 11

clean.mk

@@ -26,8 +26,8 @@ cleanBuild:
 	$(RM) -r $(BUILD_ROOT)
 
 clean: cleanBuild
-	$(RM) -r $(TEST_ROOT)$(D)TKG$(D)output_*
+	$(RM) -r $(Q)$(TEST_ROOT)$(Q)$(D)TKG$(D)output_*
 	$(RM) $(FAILEDTARGETS)
-	ant -f $(TEST_ROOT)$(D)TKG$(D)scripts/build_tools.xml clean
+	ant -f $(Q)$(TEST_ROOT)$(Q)$(D)TKG$(D)scripts/build_tools.xml clean
 
 .PHONY: cleanBuild clean

compile.mk

@@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG)
 else
 TEST_FLAG_PARAM :=
 endif
-COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) -DJDK_VENDOR=$(JDK_VENDOR) -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
+COMPILE_CMD=ant -f scripts$(D)build_test.xml $(Q)-DTEST_ROOT=$(TEST_ROOT)$(Q) $(Q)-DBUILD_ROOT=$(BUILD_ROOT)$(Q) $(Q)-DJDK_VERSION=$(JDK_VERSION)$(Q) $(Q)-DJDK_IMPL=$(JDK_IMPL)$(Q) $(Q)-DJDK_VENDOR=$(JDK_VENDOR)$(Q) $(Q)-DJCL_VERSION=$(JCL_VERSION)$(Q) $(Q)-DBUILD_LIST=${COMPILE_BUILD_LIST}$(Q) $(Q)-DRESOURCES_DIR=${RESOURCES_DIR}$(Q) $(Q)-DSPEC=${SPEC}$(Q) $(Q)-DTEST_JDK_HOME=${TEST_JDK_HOME}$(Q) $(Q)-DJVM_VERSION=$(JVM_VERSION)$(Q) $(Q)-DLIB_DIR=$(LIB_DIR)$(Q) ${TEST_FLAG_PARAM}
 
 
 compile:

makefile

@@ -108,7 +108,7 @@ endif
 # compile tools
 #######################################
 include moveDmp.mk
-COMPILE_TOOLS_CMD=ant -f .$(D)scripts$(D)build_tools.xml -DTEST_JDK_HOME=$(TEST_JDK_HOME) -DTEST_ROOT=$(TEST_ROOT) -DLIB_DIR=$(LIB_DIR)
+COMPILE_TOOLS_CMD=ant -f .$(D)scripts$(D)build_tools.xml $(Q)-DTEST_JDK_HOME=$(TEST_JDK_HOME)$(Q) $(Q)-DTEST_ROOT=$(TEST_ROOT)$(Q) $(Q)-DLIB_DIR=$(LIB_DIR)$(Q)
 
 compileTools:
 	$(RM) -r $(COMPILATION_OUTPUT); \

scripts/getDependencies.pl

@@ -184,45 +184,10 @@
 		fname => 'jcstress-tests-all-20240222.jar',
 		sha1 => '200da75e67689e8a604ec6fe9a6f55b2c000b6ce'
 	},
-	hamcrest_core => {
-		url => 'https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar',
-		fname => 'hamcrest-core.jar',
-		sha1 => 'c38c18e0e59e9cca7ebcc4f9dcd19c10f246334c'
-	},
-	bcprov_jdk18on => {
-		url => 'https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.78.1/bcprov-jdk18on-1.78.1.jar',
-		fname => 'bcprov-jdk18on.jar',
-		sha1 => '5225dd6a150c23dd7ed398acd32bf3e8b976301f'
-	},
-	junit_vintage_engine => {
-		url => 'https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-engine/5.10.2/junit-vintage-engine-5.10.2.jar',
-		fname => 'junit-vintage-engine.jar',
-		sha1 => '47a0dacf0c64158188ac5c80d5060e5a537fa052'
-	},
-	junit_platform_suite => {
-		url => 'https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite/1.10.1/junit-platform-suite-1.10.1.jar',
-		fname => 'junit-platform-suite.jar',
-		sha1 => '6b1330a6d303605bc704393eda1aa53dbc806c61'
-	},
-	junit_jupiter_api => {
-		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar',
-		fname => 'junit-jupiter-api.jar',
-		sha1 => 'd290fdc830c58abab24538715b2eabc26195349a'
-	},
-	junit_jupiter_engine => {
-		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar',
-		fname => 'junit-jupiter-engine.jar',
-		sha1 => '772f895ff9cbd83bf4a097b6b381493c6149a2af'
-	},
-	junit_jupiter_params => {
-		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/5.10.2/junit-jupiter-params-5.10.2.jar',
-		fname => 'junit-jupiter-params.jar',
-		sha1 => '359132c82a9d3fa87a325db6edd33b5fdc67a3d8'
-	},
-	junit_platform_suite_api => {
-		url => 'https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-api/1.10.2/junit-platform-suite-api-1.10.2.jar',
-		fname => 'junit-platform-suite-api.jar',
-		sha1 => '174bba1574c37352b0eb2c06e02b6403738ad57c'
+	maven => {
+		url => 'https://dlcdn.apache.org/maven/maven-3/3.9.8/binaries/apache-maven-3.9.8-bin.tar.gz',
+		fname => 'apache-maven-bin.tar.gz',
+		sha1 => '7f15c63c129f036dd5c96b1a591ed8d888f75617'
 	});
 
 my %system_jars = (
@@ -453,10 +418,10 @@ sub downloadFile {
 	# .txt SHA files are in ISO8859-1
 	# note _ENCODE_FILE_NEW flag is set for zos
 	if ('.txt' eq substr $filename, -length('.txt')) {
-		print "Now running download command: _ENCODE_FILE_NEW=ISO8859-1 curl $curlOpts -k -o $filename $url 2>&1\n";
 		$output = qx{_ENCODE_FILE_NEW=ISO8859-1 curl $curlOpts -k -o $filename $url 2>&1};
+	} elsif ('.jar' eq substr $filename, -length('.jar')) {
+		$output = qx{_ENCODE_FILE_NEW=BINARY curl $curlOpts -k -o $filename $url 2>&1};
 	} else {
-		print "Now running download command: _ENCODE_FILE_NEW=UNTAGGED curl $curlOpts -k -o $filename $url 2>&1\n";
 		$output = qx{_ENCODE_FILE_NEW=UNTAGGED curl $curlOpts -k -o $filename $url 2>&1};
 	}
 	my $returnCode = $?;

src/org/openj9/envInfo/JavaInfo.java

@@ -55,7 +55,7 @@ public String getSPEC(String javaImplInfo) {
             return null;
         }
 
-        if (osArch.contains("amd64") || osArch.contains("x86")) {
+        if (osArch.contains("amd64") || osArch.contains("x86") || osArch.contains("i386")) {
             spec += "_x86";
         } else if (osArch.contains("ppc") || osArch.contains("powerpc")) {
             spec += "_ppc";
@@ -246,10 +246,17 @@ public void checkVTstandard() {
         }
     }
 
+    public void checkJFR() {
+        if ("true".equalsIgnoreCase(System.getProperty("org.eclipse.openj9.jfr.isJFREnabled"))) {
+            detectedTfs.add("JFR");
+        }
+    }
+
     public String getTestFlag() {
         String testFlag = "";
         checkCRIU();
         checkVTstandard();
+        checkJFR();
         String envTf = System.getenv("TEST_FLAG");
         String paddedTf = null;
         if (envTf != null) {

src/org/testKitGen/TestDivider.java

@@ -225,8 +225,19 @@ private Map<String, Integer> getDataFromTRSS()  {
 		String group = getGroup();
 		String level = getLevel();
 		Map<String, Integer> map = new HashMap<String, Integer>();
+		String osName = System.getProperty("os.name").toLowerCase();
+		if (osName.contains("mac")) {
+			plat = plat.replace("_xl", "");
+		}
 		String URL = constructURL(impl, plat, group, level);
-		String command = "curl --silent --max-time 120 -L " + URL;
+		String command;
+
+		if (osName.contains("win")) {
+			command = "cmd.exe /c curl --silent --max-time 120 -L -k \"" + URL + "\"";
+		} else {
+			command = "curl --silent --max-time 120 -L -k " + URL;
+		}
+
 		System.out.println("Attempting to get test duration data from TRSS.");
 		System.out.println(command);
 		Process process;