From 2a493dbbb01882d9e1cd22acd755e9d03202f1ee Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 9 Nov 2023 17:41:23 -0500
Subject: [PATCH] GHA: Revert downloads page script changes. Update all to
 Cloudgate. Concourse

---
 .../scripts/update-distro-download-page.sh    |  4 +-
 .../aggregate-distro-update-sites.yml         | 13 ++-
 .../aggregate-ls-extensions-update-site.yml   | 13 ++-
 .github/workflows/clear_s3_cache.yml          | 13 ++-
 .github/workflows/gen-nighly-downloads.yml    | 14 ++-
 .../gh-hosted-eclipse-distro-build.yml        |  4 +-
 .../upload-nightly-downloads-page.yml         | 17 ++--
 .../wipe-out-temp-build-artifacts.yml         | 14 ++-
 concourse/pipeline.yml                        | 55 +++++++-----
 .../pom.xml                                   | 69 ---------------
 .../pom.xml                                   | 85 -------------------
 .../pom.xml                                   | 82 ------------------
 12 files changed, 97 insertions(+), 286 deletions(-)

diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh
index d37aa636f..67da50d19 100755
--- a/.github/scripts/update-distro-download-page.sh
+++ b/.github/scripts/update-distro-download-page.sh
@@ -2,14 +2,14 @@ dist_path=$1
 eclipse_version=$2
 build_type=$3
 
-s3_url=s3://tools-spring-io/${dist_path}
+s3_url=s3://dist.springsource.com/${dist_path}
 downloads_html="sts4-nightly-${eclipse_version}.html"
 files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun`
 rm -f ./${downloads_html}
 echo '<ul>' >> $downloads_html
 for file in $files
 do
-  if [[ "$file" =~ ^"s3://tools-spring-io" ]]; then
+  if [[ "$file" =~ ^"s3://dist." ]]; then
     download_url=https://download${file:9}
     filename=${file:${#s3_url}+1}
     echo '  <li><a href="'${download_url}'">'${filename}'</li>' >> $downloads_html
diff --git a/.github/workflows/aggregate-distro-update-sites.yml b/.github/workflows/aggregate-distro-update-sites.yml
index cfdf5af8a..e5b70ddae 100644
--- a/.github/workflows/aggregate-distro-update-sites.yml
+++ b/.github/workflows/aggregate-distro-update-sites.yml
@@ -24,11 +24,18 @@ jobs:
       - name: Timestamp
         id: timestamp
         run: echo "date=`echo $(($(date +%s%N) / 1000000))`" >> $GITHUB_OUTPUT
+      - name: Cloudgate S3 Configuration
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
+        with:
+          aws-access-key-id:  ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }}
+          role-session-name: ${{ github.run_id }}
+          aws-region: us-east-1
+          role-duration-seconds: 900
+          role-skip-session-tagging: true
       - name: Generate and Upload Aggregate Update Sites Data
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
           CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
         run: |
diff --git a/.github/workflows/aggregate-ls-extensions-update-site.yml b/.github/workflows/aggregate-ls-extensions-update-site.yml
index c9581b52e..0797699b1 100644
--- a/.github/workflows/aggregate-ls-extensions-update-site.yml
+++ b/.github/workflows/aggregate-ls-extensions-update-site.yml
@@ -20,11 +20,18 @@ jobs:
       - name: Timestamp
         id: timestamp
         run: echo "date=`echo $(($(date +%s%N) / 1000000))`" >> $GITHUB_OUTPUT
+      - name: Cloudgate S3 Configuration
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
+        with:
+          aws-access-key-id:  ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }}
+          role-session-name: ${{ github.run_id }}
+          aws-region: us-east-1
+          role-duration-seconds: 900
+          role-skip-session-tagging: true
       - name: Generate and Upload Aggregate Update Sites Data
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
           CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
         run: |
diff --git a/.github/workflows/clear_s3_cache.yml b/.github/workflows/clear_s3_cache.yml
index a3a525727..5ba7d9230 100644
--- a/.github/workflows/clear_s3_cache.yml
+++ b/.github/workflows/clear_s3_cache.yml
@@ -18,11 +18,18 @@ jobs:
           ref: ${{ inputs.ref }}
           sparse-checkout: |
             .github
+      - name: Cloudgate S3 Configuration
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
+        with:
+          aws-access-key-id:  ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }}
+          role-session-name: ${{ github.run_id }}
+          aws-region: us-east-1
+          role-duration-seconds: 900
+          role-skip-session-tagging: true
       - name: Invalidate S3 Cloudfront Cache
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
           CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
         run: |
diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml
index 0113e58be..f8d6e2ef7 100644
--- a/.github/workflows/gen-nighly-downloads.yml
+++ b/.github/workflows/gen-nighly-downloads.yml
@@ -8,11 +8,17 @@ jobs:
   gen_html:
     runs-on: ubuntu-latest
     steps:
+      - name: Cloudgate S3 Configuration
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
+        with:
+          aws-access-key-id:  ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }}
+          role-session-name: ${{ github.run_id }}
+          aws-region: us-east-1
+          role-duration-seconds: 900
+          role-skip-session-tagging: true
       - name: Update Nightly Distro Downloads page
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
         run: |
           dist_path="snapshot/STS4/nightly/dist/e4.28"
           s3_url=s3://dist.springsource.com/${dist_path}
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 60c53edc3..a844e7928 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -101,11 +101,11 @@ jobs:
           dist_path=`cat ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-dist-path.txt`
           echo "Removing old Linux .tar.gz files from s3..."
           aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*"
-          echo "Uploading new Linux .ta.gz files to s3..."
+          echo "Uploading new Linux .tar.gz files to s3..."
           aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" --acl public-read --no-progress
           echo "Removing old Linux .tar.gz files from Akamai s3..."
           aws s3 rm s3://tools-spring-io/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*"
-          echo "Uploading new Linux .ta.gz files to Akamai s3..."
+          echo "Uploading new Linux .tar.gz files to Akamai s3..."
           aws s3 cp . s3://tools-spring-io/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" --no-progress
       - name: Clear S3 Caches for P2 Repo
         if: ${{ inputs.build_type != 'snapshot' }}
diff --git a/.github/workflows/upload-nightly-downloads-page.yml b/.github/workflows/upload-nightly-downloads-page.yml
index dd751bbb8..e9ad3048b 100644
--- a/.github/workflows/upload-nightly-downloads-page.yml
+++ b/.github/workflows/upload-nightly-downloads-page.yml
@@ -19,11 +19,17 @@ jobs:
           sparse-checkout: |
             .github
             eclipse-distribution/common/html
+      - name: Cloudgate S3 Configuration
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
+        with:
+          aws-access-key-id:  ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }}
+          role-session-name: ${{ github.run_id }}
+          aws-region: us-east-1
+          role-duration-seconds: 900
+          role-skip-session-tagging: true
       - name: Upload nightly-distributions.html
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
         run: |
           echo "Removing old nightly-distributions.html from s3..."
           aws s3 rm s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html
@@ -31,9 +37,6 @@ jobs:
           aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html --acl public-read --no-progress
       - name: Invalidate S3 Cloudfront Cache
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
           CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
         run: |
diff --git a/.github/workflows/wipe-out-temp-build-artifacts.yml b/.github/workflows/wipe-out-temp-build-artifacts.yml
index 9e131d851..1c02075ca 100644
--- a/.github/workflows/wipe-out-temp-build-artifacts.yml
+++ b/.github/workflows/wipe-out-temp-build-artifacts.yml
@@ -12,12 +12,18 @@ jobs:
   cleanup:
     runs-on: ubuntu-latest
     steps:
+      - name: Cloudgate S3 Configuration
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
+        with:
+          aws-access-key-id:  ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }}
+          role-session-name: ${{ github.run_id }}
+          aws-region: us-east-1
+          role-duration-seconds: 900
+          role-skip-session-tagging: true
       - name: Remove Temp Build Artifacts from S3
         id: cleanup-s3-temp-storage
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
         run: |
           aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "*.zip"
 
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 27d8934c3..efb049c76 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -118,8 +118,9 @@ resources:
   icon: content-save-outline
   source:
     bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     regexp: sts4/vscode-extensions/snapshots/vscode-concourse-(.*).vsix
 - name: s3-bosh-vsix-snapshot
@@ -127,8 +128,9 @@ resources:
   icon: content-save-outline
   source:
     bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     regexp: sts4/vscode-extensions/snapshots/vscode-bosh-(.*).vsix
 - name: s3-manifest-yaml-vsix-snapshot
@@ -136,8 +138,9 @@ resources:
   icon: content-save-outline
   source:
     bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     regexp: sts4/vscode-extensions/snapshots/vscode-manifest-yaml-(.*).vsix
 - name: s3-spring-boot-vsix-snapshot
@@ -145,8 +148,9 @@ resources:
   icon: content-save-outline
   source:
     bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     regexp: sts4/vscode-extensions/snapshots/vscode-spring-boot-(.*).vsix
 - name: s3-concourse-vsix-release
@@ -154,32 +158,36 @@ resources:
   icon: content-save-outline
   source:
     bucket: dist.springsource.com
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     regexp: release/STS4/vscode/vscode-concourse-(.*).vsix
 - name: s3-bosh-vsix-release
   type: s3
   icon: content-save-outline
   source:
     bucket: dist.springsource.com
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     regexp: release/STS4/vscode/vscode-bosh-(.*).vsix
 - name: s3-manifest-yaml-vsix-release
   type: s3
   icon: content-save-outline
   source:
     bucket: dist.springsource.com
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     regexp: release/STS4/vscode/vscode-manifest-yaml-(.*).vsix
 - name: s3-spring-boot-vsix-release
   type: s3
   icon: content-save-outline
   source:
     bucket: dist.springsource.com
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     #region_name: ((s3_region))
     regexp: release/STS4/vscode/vscode-spring-boot-(.*).vsix
 # - name: s3-manifest-yaml-fatjar-snapshot
@@ -251,8 +259,9 @@ resources:
   icon: content-save-outline
   source:
     bucket: ((s3_prod_bucket))
-    access_key_id: ((s3_prod_accesskey))
-    secret_access_key: ((s3_prod_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     path: snapshot/STS4/vscode-extensions
     options:
@@ -274,8 +283,9 @@ resources:
   icon: cached
   source:
     bucket: ((s3_bucket))
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     regexp: mvn-caches/sts4-(.*).tar.gz
 - name: version
@@ -285,8 +295,9 @@ resources:
     driver: s3
     bucket: ((s3_bucket))
     key: versions/vscode-extensions
-    access_key_id: ((s3_accesskey))
-    secret_access_key: ((s3_secretkey))
+    access_key_id: ((s3_svc_accesskey))
+    secret_access_key: ((s3_svc_secretkey))
+    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
     region_name: ((s3_region))
     initial_version: 0.0.5-RC.6
 - name: nightly
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
index b5eda368b..84453bba5 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -346,29 +346,6 @@
 						</goals>
 					</execution>
 
-<!--
-					<execution>
-						<id>upload-nightly-downloads</id>
-						<phase>deploy</phase>
-						<configuration>
-							<skip>${skip.update-nightly-download-page}</skip>
-							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-									<upload bucketName="${dist.bucket}" file="${project.build.directory}/sts4-nightly-${dist.target.major}.html"
-											toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
-									</upload>
-								</s3>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
--->
-
 					<execution>
 						<id>generate-s3-upload-info</id>
 						<phase>verify</phase>
@@ -414,52 +391,6 @@
 						</goals>
 					</execution>
 
-<!--
-					<execution>
-						<id>upload-sts-repository</id>
-						<phase>deploy</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-
-									<delete bucketName="${dist.bucket}">
-										<fileset dir="${dist.path.repo}">
-											<include name="p2.index" />
-											<include name="site.xml" />
-											<include name="content.jar" />
-											<include name="artifacts.xml.xz" />
-											<include name="content.jar" />
-											<include name="content.xml.xz" />
-											<include name="plugins/**" />
-											<include name="features/**" />
-											<include name="binary/**" />
-											<include name="*.zip" />
-											<include name="*.sha256" />
-											<include name="*.md5" />
-										</fileset>
-									</delete>
-
-									<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
-										<fileset
-											dir="${project.build.directory}/repository">
-											<include name="**/*" />
-											<include name="**" />
-										</fileset>
-									</upload>
-
-								</s3>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
--->
 				</executions>
 				<dependencies>
 					<dependency>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
index ece79a926..8f0ef3c71 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
@@ -97,19 +97,6 @@
 					</formats>
 				</configuration>
 			</plugin>
-
-<!--			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-gpg-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>sign-p2-artifacts</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> -->
-
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-eclipserun-plugin</artifactId>
@@ -355,30 +342,6 @@
 							<goal>run</goal>
 						</goals>
 					</execution>
-
-<!--
-					<execution>
-						<id>upload-nightly-downloads</id>
-						<phase>deploy</phase>
-						<configuration>
-							<skip>${skip.update-nightly-download-page}</skip>
-							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-									<upload bucketName="${dist.bucket}" file="${project.build.directory}/sts4-nightly-${dist.target.major}.html"
-											toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
-									</upload>
-								</s3>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
--->
-
 					<execution>
 						<id>generate-s3-upload-info</id>
 						<phase>verify</phase>
@@ -423,54 +386,6 @@
 							<goal>run</goal>
 						</goals>
 					</execution>
-
-<!--
-					<execution>
-						<id>upload-sts-repository</id>
-						<phase>deploy</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-
-									<delete bucketName="${dist.bucket}">
-										<fileset dir="${dist.path.repo}">
-											<include name="p2.index" />
-											<include name="site.xml" />
-											<include name="content.jar" />
-											<include name="artifacts.xml.xz" />
-											<include name="content.jar" />
-											<include name="content.xml.xz" />
-											<include name="plugins/**" />
-											<include name="features/**" />
-											<include name="binary/**" />
-											<include name="*.zip" />
-											<include name="*.sha256" />
-											<include name="*.md5" />
-										</fileset>
-									</delete>
-
-									<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
-										<fileset
-											dir="${project.build.directory}/repository">
-											<include name="**/*" />
-											<include name="**" />
-										</fileset>
-									</upload>
-
-								</s3>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
--->
-
 				</executions>
 				<dependencies>
 					<dependency>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
index ece79a926..ecf7ca00a 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
@@ -98,18 +98,6 @@
 				</configuration>
 			</plugin>
 
-<!--			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-gpg-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>sign-p2-artifacts</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> -->
-
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-eclipserun-plugin</artifactId>
@@ -356,29 +344,6 @@
 						</goals>
 					</execution>
 
-<!--
-					<execution>
-						<id>upload-nightly-downloads</id>
-						<phase>deploy</phase>
-						<configuration>
-							<skip>${skip.update-nightly-download-page}</skip>
-							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-									<upload bucketName="${dist.bucket}" file="${project.build.directory}/sts4-nightly-${dist.target.major}.html"
-											toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
-									</upload>
-								</s3>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
--->
-
 					<execution>
 						<id>generate-s3-upload-info</id>
 						<phase>verify</phase>
@@ -424,53 +389,6 @@
 						</goals>
 					</execution>
 
-<!--
-					<execution>
-						<id>upload-sts-repository</id>
-						<phase>deploy</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-
-									<delete bucketName="${dist.bucket}">
-										<fileset dir="${dist.path.repo}">
-											<include name="p2.index" />
-											<include name="site.xml" />
-											<include name="content.jar" />
-											<include name="artifacts.xml.xz" />
-											<include name="content.jar" />
-											<include name="content.xml.xz" />
-											<include name="plugins/**" />
-											<include name="features/**" />
-											<include name="binary/**" />
-											<include name="*.zip" />
-											<include name="*.sha256" />
-											<include name="*.md5" />
-										</fileset>
-									</delete>
-
-									<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
-										<fileset
-											dir="${project.build.directory}/repository">
-											<include name="**/*" />
-											<include name="**" />
-										</fileset>
-									</upload>
-
-								</s3>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
--->
-
 				</executions>
 				<dependencies>
 					<dependency>