Merge branch 'dev' into XRAY-129870-python-hyphens-fix

Author: basel1322

.github/actions/install-and-setup/action.yml

@@ -12,9 +12,9 @@ runs:
   steps:
     # Install dependencies
     - name: Setup Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.24.x
+        go-version: 1.25
     # - name: Setup Go with cache
     #   uses: jfrog/.github/actions/install-go-with-cache@main
 
@@ -39,7 +39,7 @@ runs:
       uses: actions/setup-java@v5
       with:
         java-version: "11"
-        distribution: "adopt"
+        distribution: "corretto"
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
       with:

.github/workflows/test.yml

@@ -23,7 +23,7 @@ concurrency:
 # Environment variables shared across all jobs.
 env:
   GOPROXY: direct
-  GO_COMMON_TEST_ARGS: "-v github.com/jfrog/jfrog-cli-security --race --timeout 30m --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}"
+  GO_COMMON_TEST_ARGS: "-v github.com/jfrog/jfrog-cli-security --race --timeout 40m --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
   CI: true
   JFROG_CLI_LOG_LEVEL: DEBUG

artifactory_test.go

@@ -113,13 +113,13 @@ func TestDependencyResolutionFromArtifactory(t *testing.T) {
 			projectType:     project.Poetry,
 		},
 	}
-	securityIntegrationTestUtils.CreateJfrogHomeConfig(t, "", true)
-	defer securityTestUtils.CleanTestsHomeEnv()
+	cleanUp := securityIntegrationTestUtils.UseTestHomeWithDefaultXrayConfig(t)
+	defer cleanUp()
 
 	for _, testCase := range testCases {
 		t.Run(testCase.projectType.String(), func(t *testing.T) {
 			if testCase.skipMsg != "" {
-				securityTestUtils.SkipTestIfDurationNotPassed(t, "22-10-2025", 30, testCase.skipMsg)
+				securityTestUtils.SkipTestIfDurationNotPassed(t, "22-11-2025", 30, testCase.skipMsg)
 			}
 			testSingleTechDependencyResolution(t, testCase.testProjectPath, testCase.resolveRepoName, testCase.cacheRepoName, testCase.projectType)
 		})
@@ -271,8 +271,8 @@ func TestUploadCdxCmdCommand(t *testing.T) {
 	// Create a temporary cdx file with suffix .cdx.json to upload
 	tempDirPath, createTempDirCallback := coreTests.CreateTempDirWithCallbackAndAssert(t)
 	defer createTempDirCallback()
-	securityIntegrationTestUtils.CreateJfrogHomeConfig(t, tempDirPath, true)
-	defer securityTestUtils.CleanTestsHomeEnv()
+	cleanUp := securityIntegrationTestUtils.CreateJfrogHomeConfig(t, tempDirPath, securityTests.RtDetails, true)
+	defer cleanUp()
 	cdxFileToUpload := getTestCdxFile(t, tempDirPath)
 	// Configure the repository to upload the cdx file to
 	var repoPath string
@@ -368,7 +368,9 @@ func getTestCdxFile(t *testing.T, tempDir string) string {
 	cdxFilePath := filepath.Join(tempDir, fmt.Sprintf("upload-integration-test-%s.cdx.json", utils.GetCurrentTimeUnix()))
 	file, err := os.Create(cdxFilePath)
 	assert.NoError(t, err)
-	defer file.Close()
+	defer func() {
+		assert.NoError(t, file.Close())
+	}()
 	// Write the BOM to the file
 	assert.NoError(t, cyclonedx.NewBOMEncoder(file, cyclonedx.BOMFileFormatJSON).SetPretty(true).Encode(bom))
 	return cdxFilePath