GH-1459: additional steps towards renaming everything to just Spring Tools

This commit is contained in:
Martin Lippert
2025-03-06 10:58:23 +01:00
parent 195aab9cf8
commit 282d7ef9d9
22 changed files with 58 additions and 58 deletions

View File

@@ -10,7 +10,7 @@ rm -f ./p2.index
echo "<?xml version='1.0' encoding='UTF-8'?>" >> compositeArtifacts.xml
echo "<?compositeArtifactRepository version='1.0.0'?>" >> compositeArtifacts.xml
echo "<repository name='Spring Tool Suite 4'" >> compositeArtifacts.xml
echo "<repository name='Spring Tools for Eclipse'" >> compositeArtifacts.xml
echo " type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>" >> compositeArtifacts.xml
echo " <properties size='1'>" >> compositeArtifacts.xml
echo " <property name='p2.timestamp' value='${val}'/>" >> compositeArtifacts.xml
@@ -29,7 +29,7 @@ echo "</repository>" >> compositeArtifacts.xml
echo "<?xml version='1.0' encoding='UTF-8'?>" >> compositeContent.xml
echo "<?compositeMetadataRepository version='1.0.0'?>" >> compositeContent.xml
echo "<repository name='Spring Tool Suite 4'" >> compositeContent.xml
echo "<repository name='Spring Tools for Eclipse'" >> compositeContent.xml
echo " type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>" >> compositeContent.xml
echo " <properties size='1'>" >> compositeContent.xml
echo " <property name='p2.timestamp' value='${val}'/>" >> compositeContent.xml

View File

@@ -95,7 +95,7 @@ codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" -
cd ${dir}/${destination_folder_name}
echo "Generating dmg-config.json..."
echo '{' >> dmg-config.json
echo ' "title": "Spring Tool Suite 4",' >> dmg-config.json
echo ' "title": "Spring Tools for Eclipse",' >> dmg-config.json
echo ' "icon": "'$icns'",' >> dmg-config.json
echo ' "contents": [' >> dmg-config.json
echo ' { "x": 192, "y": 100, "type": "file", "path": "./SpringToolSuite4.app" },' >> dmg-config.json

View File

@@ -8,7 +8,7 @@ download_url_root=$5
s3_url=s3://${s3_bucket}/${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`
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
s3_url_prefix="s3://${AWS_S3_BUCKET}"

View File

@@ -20,7 +20,7 @@ jobs:
dist_path="snapshot/STS4/nightly/dist/e4.32"
s3_url=s3://$AWS_S3_BUCKET/${dist_path}/
downloads_html="sts4-nightly-e4.32.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`
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`
echo '<ul>' >> $downloads_html
s3_url_prefix="s3://${AWS_S3_BUCKET}"
s3_url_prefix_length=${#s3_url_prefix}

View File

@@ -117,7 +117,7 @@ jobs:
- name: Upload Linux Distro Build Artifacts
run: |
cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products
files=`ls spring-tool-suite-4*linux*.tar.gz`
files=`ls spring-tools-for-eclipse*linux*.tar.gz`
for file in $files
do
echo "Re-archive using tar.gz on linux runner to remove LIBARCHIVE headers"
@@ -134,11 +134,11 @@ jobs:
done
echo "Processing S3 update..."
dist_path=${{ steps.s3-paths.outputs.dist_path }}
ls spring-tool-suite-4*linux*.tar.gz*
ls spring-tools-for-eclipse*linux*.tar.gz*
echo "Removing old Linux .tar.gz files from s3..."
aws s3 rm s3://$AWS_S3_BUCKET/$dist_path --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*"
aws s3 rm s3://$AWS_S3_BUCKET/$dist_path --recursive --exclude "*" --include "spring-tools-for-eclipse*linux*.tar.gz*" --exclude "*/*"
echo "Uploading new Linux .tar.gz files to s3..."
aws s3 cp . s3://$AWS_S3_BUCKET/$dist_path --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" --no-progress
aws s3 cp . s3://$AWS_S3_BUCKET/$dist_path --recursive --exclude "*" --include "spring-tools-for-eclipse*linux*.tar.gz*" --exclude "*/*" --no-progress
- name: Update Nightly Distro Downloads page
if: ${{ inputs.build_type == 'snapshot' }}
run: |
@@ -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-tool-suite-4*win*.zip" --include "spring-tool-suite-4*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/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
outputs:
id: ${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
dist_path: ${{ steps.s3-paths.outputs.dist_path }}
@@ -172,14 +172,14 @@ jobs:
.github
- name: Download Win Zips from S3 for Signing
run: |
rm -f spring-tool-suite-4*win*.zip*
rm -f spring-tool-suite-4*win*.self-extracting.jar*
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-tool-suite-4*win*.zip*" --exclude "*/*" --no-progress
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
- name: Sign EXE within zip files
id: sign
run: |
files=`ls spring-tool-suite-4*win*.zip`
files=`ls spring-tools-for-eclipse*win*.zip`
for file in $files
do
${{ github.workspace }}/.github/scripts/sign-exe-in-zip-file.sh $file ${{ github.workspace }}/.github/scripts/sign-exe.sh ${{ github.workspace }}/.github/scripts/self-extracting-jar-creator.jar ${{ github.run_id }} &
@@ -201,11 +201,11 @@ jobs:
run: |
dist_path=${{ needs.eclipse-distro-build.outputs.dist_path }}
echo "Processing S3 update..."
ls spring-tool-suite-4*win*
ls spring-tools-for-eclipse*win*
echo "Removing old win zip and self extracting jar files from S3..."
aws s3 rm s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*"
aws s3 rm s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip*" --include "spring-tools-for-eclipse*win*.self-extracting.jar*" --exclude "*/*"
echo "Uploading new win zip and self extracting jar files to S3..."
aws s3 mv . s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --no-progress
aws s3 mv . s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip*" --include "spring-tools-for-eclipse*win*.self-extracting.jar*" --exclude "*/*" --no-progress
- name: Update Nightly Distro Downloads page
if: ${{ inputs.build_type == 'snapshot' }}
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-tool-suite-4*macosx*.tar.gz" --exclude "*/*" --no-progress
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
- name: Sign .app, Create and Sign DMG
env:
MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
@@ -262,7 +262,7 @@ jobs:
run: |
export KEYCHAIN=$RUNNER_TEMP/app-signing.keychain-db
ls ${{ github.workspace }}/.github/assets
files=`ls spring-tool-suite-4*macosx*.tar.gz`
files=`ls spring-tools-for-eclipse*macosx*.tar.gz`
for file in $files
do
${{ github.workspace }}/.github/scripts/sign-osx-distro-file.sh $file ${{ github.workspace }}/.github/assets/entitlements.plist ${{ github.workspace }}/.github/assets/sts4.icns
@@ -272,7 +272,7 @@ jobs:
NOTARIZE_PROFILE: notarize-app-dmg-profile
run: |
xcrun notarytool store-credentials $NOTARIZE_PROFILE --apple-id ${{ secrets.VMWARE_APPLE_USER }} --team-id ${{ secrets.VMWARE_APPLE_TEAM_ID }} --password ${{ secrets.VMWARE_APPLE_PASSWORD }}
dmg_files=`ls spring-tool-suite-4*macosx*.dmg`
dmg_files=`ls spring-tools-for-eclipse*macosx*.dmg`
for dmg_file in $dmg_files
do
${{ github.workspace }}/.github/scripts/notarize-osx-distro-file.sh $dmg_file $NOTARIZE_PROFILE &
@@ -294,11 +294,11 @@ jobs:
run: |
dist_path=${{ needs.eclipse-distro-build.outputs.dist_path }}
echo "Processing S3 update..."
ls spring-tool-suite-4*macosx*.dmg*
ls spring-tools-for-eclipse*macosx*.dmg*
echo "Removing old dmg files from S3..."
aws s3 rm s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*"
aws s3 rm s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tools-for-eclipse*macosx*.dmg*" --exclude "*/*"
echo "Uploading new dmg files to S3..."
aws s3 mv . s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --no-progress
aws s3 mv . s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tools-for-eclipse*macosx*.dmg*" --exclude "*/*" --no-progress
- name: Update Nightly Distro Downloads page
if: ${{ inputs.build_type == 'snapshot' && always() }}
run: |
@@ -309,7 +309,7 @@ jobs:
- name: Cleanup
if: ${{ always() }}
run: |
rm -rf *spring-tool-suite-4*macosx*
rm -rf *spring-tools-for-eclipse*macosx*
purge_cache:
needs: [ eclipse-distro-build, sign-win-distros, sign-osx-distros ]
@@ -348,7 +348,7 @@ jobs:
downloads_html="sts4-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-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`
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 --checksum-algorithm CRC32`
s3_url_prefix="s3://${AWS_S3_BUCKET}"
s3_url_prefix_length=${#s3_url_prefix}
for file in $files

View File

@@ -48,7 +48,7 @@ jobs:
downloads_html="sts4-distro-downloads-${{ inputs.eclipse_profile }}.txt"
rm -f ./downloads_html
s3_url=s3://${AWS_S3_BUCKET}/${{ inputs.dist_path }}
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`
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`
s3_url_prefix="s3://${AWS_S3_BUCKET}"
s3_url_prefix_length=${#s3_url_prefix}
for file in $files

View File

@@ -40,19 +40,19 @@
<h2>Eclipse-based Distribution Builds</h2>
<h3>Spring Tool Suite 4 - based on Eclipse 2025-06 Milstone Builds (4.36.0)</h3>
<h3>Spring Tools for Eclipse - based on Eclipse 2025-06 Milstone Builds (4.36.0)</h3>
<div id="e436"></div>
<script type="text/javascript">
$('#e436').load('sts4-nightly-e4.36.html');
</script>
<h3>Spring Tool Suite 4 - based on Eclipse 2025-03 Release (4.35.0)</h3>
<h3>Spring Tools for Eclipse - based on Eclipse 2025-03 Release (4.35.0)</h3>
<div id="e435"></div>
<script type="text/javascript">
$('#e435').load('sts4-nightly-e4.35.html');
</script>
<h3>Spring Tool Suite 4 - based on Eclipse 2024-12 Release (4.34.0)</h3>
<h3>Spring Tools for Eclipse - based on Eclipse 2024-12 Release (4.34.0)</h3>
<div id="e434"></div>
<script type="text/javascript">
$('#e434').load('sts4-nightly-e4.34.html');

View File

@@ -1,10 +1,10 @@
<ul>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.aarch64.dmg">spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.aarch64.dmg</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.aarch64.tar.gz">spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.aarch64.tar.gz</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-macosx.cocoa.aarch64.dmg">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-macosx.cocoa.aarch64.dmg</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-linux.gtk.aarch64.tar.gz">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-linux.gtk.aarch64.tar.gz</li>
</ul>

View File

@@ -1,8 +1,8 @@
<ul>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
<li><a href="https://cdn.spring.io/spring-tools/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-tools-for-eclipse-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
</ul>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site pack200="true">
<description url="https://spring.io/tools">
Spring Tool Suite 4
Spring Tools for Eclipse
</description>
<category-def name="Spring Tools" label="Spring Tools"/>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tools for Eclipse" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -126,7 +126,7 @@
<configurations>
<property name="eclipse.buildId" value="${dist.platform.version}.${buildQualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}"/>
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />

View File

@@ -1,8 +1,8 @@
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tools for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tools for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\

View File

@@ -88,7 +88,7 @@
<rootFolders>
<macosx>SpringToolSuite4.app</macosx>
</rootFolders>
<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
<archiveFileName>spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
</product>
</products>
<formats>

View File

@@ -126,7 +126,7 @@
<configurations>
<property name="eclipse.buildId" value="${dist.platform.version}.${buildQualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}"/>
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />

View File

@@ -1,8 +1,8 @@
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tools for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tools for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\

View File

@@ -88,7 +88,7 @@
<rootFolders>
<macosx>SpringToolsForEclipse.app</macosx>
</rootFolders>
<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
<archiveFileName>spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
</product>
</products>
<formats>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site pack200="true">
<description url="https://spring.io/tools">
Spring Tool Suite 4
Spring Tools for Eclipse
</description>
<category-def name="Spring Tools" label="Spring Tools"/>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tools for Eclipse" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.30.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -126,7 +126,7 @@
<configurations>
<property name="eclipse.buildId" value="${dist.platform.version}.${buildQualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}"/>
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />

View File

@@ -1,8 +1,8 @@
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tools for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tools for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\

View File

@@ -88,7 +88,7 @@
<rootFolders>
<macosx>SpringToolSuite4.app</macosx>
</rootFolders>
<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
<archiveFileName>spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
</product>
</products>
<formats>

View File

@@ -65,9 +65,9 @@
<properties>
<p2.qualifier>${buildQualifier}-SNAPSHOT</p2.qualifier>
<p2.repository.name>Spring Tool Suite</p2.repository.name>
<p2.repository.name>Spring Tools for Eclipse</p2.repository.name>
<dist.name>Spring Tool Suite 4</dist.name>
<dist.name>Spring Tools for Eclipse</dist.name>
<dist.key>TOOLS</dist.key>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.springframework.boot.ide.main.feature"
label="Spring Tool Suite 4 Main Feature"
label="Spring Tools for Eclipse Main Feature"
version="4.30.0.qualifier"
provider-name="Broadcom">