spring-projects · BoykoAlex · Jul 9, 2025 · Jul 7, 2025 · Jul 8, 2025 · Jul 8, 2025
diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh
@@ -7,7 +7,7 @@ s3_bucket=$4
 download_url_root=$5
 
 s3_url=s3://${s3_bucket}/${dist_path}
-downloads_html="sts4-nightly-${eclipse_version}.html"
+downloads_html="sts-nightly-${eclipse_version}.html"
 files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tools-for-eclipse*.zip" --include "spring-tools-for-eclipse*.dmg" --include "spring-tools-for-eclipse*.self-extracting.jar" --include "spring-tools-for-eclipse*.tar.gz" --exclude "*/*" --dryrun`
 rm -f ./${downloads_html}
 echo '<ul>' >> $downloads_html
@@ -23,4 +23,4 @@ do
 done
 echo '</ul>' >> $downloads_html
 cat ./$downloads_html
-aws s3 mv ./$downloads_html s3://${s3_bucket}/${build_type}/STS4/ --no-progress
+aws s3 mv ./$downloads_html s3://${s3_bucket}/${build_type}/STS5/ --no-progress
diff --git a/.github/workflows/aggregate-distro-update-sites.yml b/.github/workflows/aggregate-distro-update-sites.yml
@@ -60,25 +60,25 @@ jobs:
             if [[ "$dir" =~ $pattern ]]; then
               echo "Found ${dir}"
               dir_name=${dir:0:-1}
-              site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}"
+              site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${{ inputs.version }}/${dir_name}"
               ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url $dir_name
               cat ./compositeArtifacts.xml
               cat ./compositeContent.xml
               if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
-                aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
-                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
-                aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
-                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeContent.xml "
-                aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
-                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/p2.index "
+                aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32
+                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/compositeArtifacts.xml "
+                aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32
+                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/compositeContent.xml "
+                aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32
+                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/p2.index "
                 echo "TODO: Purge Cache"
               fi
-              aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
-              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
-              aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
-              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
-              aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
-              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/p2.index "
+              aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32
+              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/compositeArtifacts.xml "
+              aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32
+              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/compositeContent.xml "
+              aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32
+              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/p2.index "
             fi
           done
           echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/aggregate-ls-extensions-update-site.yml b/.github/workflows/aggregate-ls-extensions-update-site.yml
@@ -35,16 +35,16 @@ jobs:
         run: |
           echo "S3 Aggregate Update Sites Creation..."
           invalid_urls=""
-          site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/${{ inputs.version }}"
+          site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/${{ inputs.version }}"
           ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url
           cat ./compositeArtifacts.xml
           cat ./compositeContent.xml
-          aws s3 cp ./compositeArtifacts.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts4-language-server-integrations/ --checksum-algorithm CRC32
-          invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/compositeArtifacts.xml "
-          aws s3 cp ./compositeContent.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts4-language-server-integrations/ --checksum-algorithm CRC32
-          invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/compositeContent.xml "
-          aws s3 cp ./p2.index s3://$AWS_S3_BUCKET/release/TOOLS/sts4-language-server-integrations/ --checksum-algorithm CRC32
-          invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/p2.index"
+          aws s3 cp ./compositeArtifacts.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32
+          invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/compositeArtifacts.xml "
+          aws s3 cp ./compositeContent.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32
+          invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/compositeContent.xml "
+          aws s3 cp ./p2.index s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32
+          invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/p2.index"
           echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
       - uses: ./.github/actions/cloudflare-purge
         name: Invalidate URLs

diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -21,8 +21,8 @@ on:
         required: false
         default: false
         type: boolean
-      sts4-language-servers-version:
-        description: version of sts4 ls extensions
+      sts-language-servers-version:
+        description: version of sts ls extensions
         required: false
         type: string
 env:
@@ -76,16 +76,16 @@ jobs:
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           gpg_keyname: ${{ secrets.GPG_KEYID }}
         run: |
-          sts4_ls_version=${{ inputs.sts4-language-servers-version }}
-          sts4_ls_version_param=""
-          if ! [[ -z ${sts4_ls_version} ]]; then
-            sts4_ls_version_param="-Ddist.version=${sts4_ls_version}"
+          sts_ls_version=${{ inputs.sts-language-servers-version }}
+          sts_ls_version_param=""
+          if ! [[ -z ${sts_ls_version} ]]; then
+            sts_ls_version_param="-Ddist.version=${sts_ls_version}"
           fi  
           cd eclipse-language-servers
           if command -v xvfb-run ; then
-            xvfb-run ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore
+            xvfb-run ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore
           else
-            ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore
+            ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore
           fi
       - name: Upload P2 Repo to S3
         id: upload-p2
@@ -134,7 +134,7 @@ jobs:
                   {
                     \"header\": {
                       \"title\": \"${build_type} Eclipse LS Extensions ${version}\",
-                      \"subtitle\": \"${{ inputs.sts4-language-servers-version }}\",
+                      \"subtitle\": \"${{ inputs.sts-language-servers-version }}\",
                       \"imageUrl\": \"https://avatars.githubusercontent.com/u/317776?s=48&amp;v=4\",
                     },
                     \"sections\": [

diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -13,7 +13,7 @@ on:
         required: true
         default: 'snapshot'
         type: string
-      sts4-language-servers-version:
+      sts-language-servers-version:
         description: version of sts4 ls extensions
         required: false
         type: string
@@ -78,18 +78,18 @@ jobs:
           gpg_keyname: ${{ secrets.GPG_KEYID }}
         run: |
           java -version
-          sts4_ls_version=${{ inputs.sts4-language-servers-version }}
-          sts4_ls_version_param=""
-          if ! [[ -z ${sts4_ls_version} ]]; then
-            sts4_ls_version_param="-Dsts4-language-servers-version=${sts4_ls_version}"
+          sts_ls_version=${{ inputs.sts-language-servers-version }}
+          sts_ls_version_param=""
+          if ! [[ -z ${sts_ls_version} ]]; then
+            sts_ls_version_param="-Dsts-language-servers-version=${sts_ls_version}"
           fi
           p2_qualifier=${{ inputs.p2-qualifier }}
           p2_qualifier_param=""
           if ! [[ -z ${p2_qualifier} ]]; then
             p2_qualifier_param="-Dp2.qualifier=${p2_qualifier}"
           fi
           cd eclipse-distribution
-          ./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign \
+          ./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign \
           -Dmaven.repo.local=~/.m2/repository-signed -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dp2.replaceQualifier=true \
           -Dskip.eclipserun.proxies=false -Dtycho.equinox.resolver.uses=true \
           -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
@@ -149,7 +149,7 @@ jobs:
         run: |
           echo "Uploading Win Zips and OSX tar.gz to S3 for signing..."
           id=${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
-          aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/$id --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
+          aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://$AWS_S3_BUCKET/sts-distro-ci-temp/$id --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
     outputs:
       id: ${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
       dist_path: ${{ steps.s3-paths.outputs.dist_path }}
@@ -175,7 +175,7 @@ jobs:
           rm -f spring-tools-for-eclipse*win*.zip*
           rm -f spring-tools-for-eclipse*win*.self-extracting.jar*
           ls
-          aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip*" --exclude "*/*" --no-progress
+          aws s3 mv s3://$AWS_S3_BUCKET/sts-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip*" --exclude "*/*" --no-progress
       - name: Sign EXE within zip files
         id: sign
         run: |
@@ -254,7 +254,7 @@ jobs:
         run: |
           rm -rf *macosx*
           ls
-          aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
+          aws s3 mv s3://$AWS_S3_BUCKET/sts-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
       - name: Sign .app, Create and Sign DMG
         env:
           MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
@@ -345,7 +345,7 @@ jobs:
       - name: Google Chat Notification
         run: |
           echo "P2 Update Site: ${DOWNLOAD_URL_ROOT}/${{ needs.eclipse-distro-build.outputs.p2_path }}"
-          downloads_html="sts4-distro-downloads-${{ inputs.eclipse_profile }}.txt"
+          downloads_html="sts-distro-downloads-${{ inputs.eclipse_profile }}.txt"
           rm -f ./downloads_html
           s3_url=s3://${AWS_S3_BUCKET}/${{ needs.eclipse-distro-build.outputs.dist_path }}
           files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tools-for-eclipse*.zip" --include "spring-tools-for-eclipse*.dmg" --include "spring-tools-for-eclipse*.self-extracting.jar" --include "spring-tools-for-eclipse*.tar.gz" --exclude "*/*" --dryrun`
@@ -413,7 +413,7 @@ jobs:
       - name: Remove Temp Build Artifacts from S3
         id: cleanup-s3-temp-storage
         run: |
-          aws s3 rm s3://$AWS_S3_BUCKET/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ needs.eclipse-distro-build.outputs.id }}/*"
+          aws s3 rm s3://$AWS_S3_BUCKET/sts-distro-ci-temp --recursive --exclude "*" --include "${{ needs.eclipse-distro-build.outputs.id }}/*"
 
   notify-failure:
     needs: [ eclipse-distro-build, sign-win-distros, sign-osx-distros, cleanup, purge_cache ]

diff --git a/.github/workflows/snapshot-all.yml b/.github/workflows/snapshot-all.yml
@@ -1,7 +1,7 @@
 name: Snapshot - Eclipse LS Extensions
 
 concurrency:
-  group: snapshot-all
+  group: sts5-snapshot-all
   cancel-in-progress: true
 
 on:

diff --git a/.github/workflows/snapshot-vscode-extension.yml b/.github/workflows/snapshot-vscode-extension.yml
@@ -64,5 +64,5 @@ jobs:
           echo `${{ github.workspace }}/.github/scripts/gen-vscode-link-bullet.sh vscode-spring-cli "Spring CLI" $DOWNLOAD_URL_ROOT` >> $downloads_html
           echo '</ul>' >> $downloads_html
           cat ./$downloads_html
-          aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/STS4/vscode-extensions/ --no-progress --checksum-algorithm CRC32
+          aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/STS5/vscode-extensions/ --no-progress --checksum-algorithm CRC32
 
diff --git a/.github/workflows/upload-nightly-downloads-page.yml b/.github/workflows/upload-nightly-downloads-page.yml
@@ -7,6 +7,7 @@ on:
       - 'main'
     paths:
       - 'eclipse-distribution/common/html/nightly-distributions.html'
+      - 'eclipse-distribution/common/html/nightly-distributions-4.html'
 
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.CDN_S3_ACCESS_KEY }}
@@ -30,6 +31,21 @@ jobs:
       - name: Upload nightly-distributions.html
         run: |
           echo "Removing old nightly-distributions.html from s3..."
+
+          aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/nightly-distributions.html --debug --cli-connect-timeout 60
+          aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/stylesheet.css --debug --cli-connect-timeout 60
+          aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/jquery-2.0.3.min.js --debug --cli-connect-timeout 60
+
           aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --debug --cli-connect-timeout 60
+          aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --debug --cli-connect-timeout 60
+          aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/jquery-2.0.3.min.js --debug --cli-connect-timeout 60
+
           echo "Uploading new nightly-distributions.html to s3..."
-          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --no-progress --checksum-algorithm CRC32
+
+          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/STS5/nightly-distributions.html --no-progress --checksum-algorithm CRC32
+          aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS5/stylesheet.css --no-progress --checksum-algorithm CRC32
+          aws s3 cp ./eclipse-distribution/common/html/jquery-2.0.3.min.js s3://$AWS_S3_BUCKET/snapshot/STS5/jquery-2.0.3.min.js --no-progress --checksum-algorithm CRC32
+
+          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions-4.html s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --no-progress --checksum-algorithm CRC32
+          aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --no-progress --checksum-algorithm CRC32
+          aws s3 cp ./eclipse-distribution/common/html/jquery-2.0.3.min.js s3://$AWS_S3_BUCKET/snapshot/STS4/jquery-2.0.3.min.js --no-progress --checksum-algorithm CRC32