From bdc64fa2182c862d6b4ae60443672d0df9b83d53 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 9 Nov 2023 11:45:12 -0500
Subject: [PATCH] GHA: Try to solve issue for rewrite-properties bad gateway

---
 .github/workflows/eclipse-ls-extensions-build.yml |  2 +-
 headless-services/commons/commons-gradle/pom.xml  |  8 --------
 headless-services/commons/commons-rewrite/pom.xml |  9 ---------
 headless-services/commons/pom.xml                 | 10 +++++++---
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 010b11557..cad452256 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -89,7 +89,7 @@ jobs:
           export $(printf "AWS_ACCESS_KEY_ID=%s AWS_SECRET_ACCESS_KEY=%s AWS_SESSION_TOKEN=%s" \
           $(aws sts assume-role \
           --role-arn arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }} \
-          --role-session-name gha-upload \
+          --role-session-name ${{ github.run_id }} \
           --query "Credentials.[AccessKeyId,SecretAccessKey,SessionToken]" \
           --output text))
           echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
diff --git a/headless-services/commons/commons-gradle/pom.xml b/headless-services/commons/commons-gradle/pom.xml
index a0df53f0d..c8de98845 100644
--- a/headless-services/commons/commons-gradle/pom.xml
+++ b/headless-services/commons/commons-gradle/pom.xml
@@ -17,14 +17,6 @@
 		<gradle-tooling.version>7.6</gradle-tooling.version>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>gradle-repo</id>
-			<name>Gradle Tooling Repo</name>
-			<url>https://repo.gradle.org/gradle/libs-releases</url>
-		</repository>
-	</repositories>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
diff --git a/headless-services/commons/commons-rewrite/pom.xml b/headless-services/commons/commons-rewrite/pom.xml
index 2c9fd116f..19c415fec 100644
--- a/headless-services/commons/commons-rewrite/pom.xml
+++ b/headless-services/commons/commons-rewrite/pom.xml
@@ -208,14 +208,5 @@
 		</dependency>
 		 
 	</dependencies>
-	
-	<repositories>
-		<repository>
-			<id>gradle-repo</id>
-			<name>Gradle Tooling Repo</name>
-			<url>https://repo.gradle.org/gradle/libs-releases</url>
-		</repository>
-	</repositories>
-
 
 </project>
\ No newline at end of file
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index d9439418e..2f842409e 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -79,10 +79,14 @@
 			</snapshots>
 		</repository>
 		<repository>
-			<id>gradle-tooling-rcs</id>
-			<name>Gradle Tooling</name>
-			<url>https://repo.gradle.org/gradle/libs-releases/</url>
+			<id>gradle-repo</id>
+			<name>Gradle Tooling Repo</name>
+			<url>https://repo.gradle.org/gradle/libs-releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
+
 	</repositories>
 
 	<pluginRepositories>