Merge branch 'spring-projects:main' into main

brianvfernandes · Apr 2, 2024 · 786d6b9 · 786d6b9
2 parents 17f2742 + d4afb57
commit 786d6b9
Show file tree

Hide file tree

Showing 249 changed files with 4,511 additions and 639 deletions.
diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
@@ -48,11 +48,6 @@ do
   codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
 done
 
-# These end being inside osx distro tar.gz file built on Linux
-rm -rf ${dir}/${destination_folder_name}/SpringToolSuite4.app/plugins
-rm -rf ${dir}/${destination_folder_name}/SpringToolSuite4.app/p2
-rm -f ${dir}/${destination_folder_name}/SpringToolSuite4.app/artifacts.xml
-
 # Sign the app
 ls -la ${dir}/${destination_folder_name}/SpringToolSuite4.app/
 codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
@@ -71,7 +66,7 @@ echo '  "format": "UDZO"' >> dmg-config.json
 echo '}' >> dmg-config.json
 cat ./dmg-config.json
 dmg_filename=${filename%.*.*}.dmg
-aboyko-appdmg ./dmg-config.json ../${dmg_filename}
+appdmg ./dmg-config.json ../${dmg_filename}
 
 cd ..
 rm -rf ./${destination_folder_name}

diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml
@@ -1,7 +1,7 @@
 name: Create Release
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
       version:
         description: Github release marker, i.e. 4.20.1.RELEASE
@@ -64,4 +64,4 @@ jobs:
           release_name: ${{ inputs.version }}
           body_path: ${{ github.workspace }}/gen-changelog.md
           draft: true
-          prerelease: false
+          prerelease: false
diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -14,7 +14,7 @@ on:
       eclipse_profile:
         description: Eclipse profile 'e429' etc
         required: false
-        default: 'e429'
+        default: 'e430'
         type: string
       skip_tests:
         description: skip ls tests execution
@@ -113,14 +113,14 @@ jobs:
         run: |
           invalid_urls=`aws s3 ls s3://tools-spring-io/${{ steps.upload-p2-to-akamai.outputs.p2_path }}/ --recursive | awk '{$1=$2=$3=""; print $0}' | sed -e 's/^[ \t]*/https:\/\/cdn.spring.io\/spring-tools\//' | paste -sd' ' -`
           echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
-      - name: Verify Eclipse LS Extensions on e431
+      - name: Verify Eclipse LS Extensions on e432
         if: ${{ inputs.build_type == 'snapshot' }}
         run: |
           cd eclipse-language-servers
           if command -v xvfb-run ; then
-            xvfb-run ./mvnw --batch-mode clean package -Pe431 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
+            xvfb-run ./mvnw --batch-mode clean package -Pe432 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
           else
-            ./mvnw --batch-mode clean package -Pe431 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
+            ./mvnw --batch-mode clean package -Pe432 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
           fi
 
   purge_cache:

diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -235,7 +235,7 @@ jobs:
 
   sign-osx-distros:
     needs: [ eclipse-distro-build ]
-    runs-on: macos-latest-xl
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
@@ -264,7 +264,7 @@ jobs:
       - name: Install appdmg
         run: |
           python3 -m pip install setuptools
-          npm install -g aboyko-appdmg
+          npm install -g appdmg
       - name: Cloudgate S3 Configuration
         uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a
         with:

diff --git a/.github/workflows/publish-eclipse-release.yml b/.github/workflows/publish-eclipse-release.yml
@@ -38,11 +38,11 @@ jobs:
       latest: ${{ inputs.eclipse_latest }}
     secrets: inherit
 
-#  create-github-release:
-#    uses: ./.github/workflows/create-gh-release.yml
-#    with:
-#      version: ${{ inputs.release_version }}.RELEASE
-#    secrets: inherit
+  create-github-release:
+    uses: ./.github/workflows/create-gh-release.yml
+    with:
+      version: ${{ inputs.release_version }}.RELEASE
+    secrets: inherit
 
 #  announce-release:
 #    needs: [ aggregate-ls-extension-update-site, aggregate-distro-update-site, create-github-release ]

diff --git a/.github/workflows/release-eclipse-distro-build.yml b/.github/workflows/release-eclipse-distro-build.yml
@@ -14,30 +14,29 @@ on:
 
 jobs:
 
-  e429-distro:
+  e430-distro:
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
-      eclipse_profile: 'e429'
+      eclipse_profile: 'e430'
       build_type: 'release'
       p2-qualifier: 'RELEASE'
       sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
     secrets: inherit
 
-  e430-distro:
+  e431-distro:
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
-      eclipse_profile: 'e430'
+      eclipse_profile: 'e431'
       build_type: 'release'
       p2-qualifier: 'RELEASE'
       sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
     secrets: inherit
 
-  e431-distro:
+  e432-distro:
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
-      eclipse_profile: 'e431'
+      eclipse_profile: 'e432'
       build_type: 'release'
       p2-qualifier: 'RELEASE'
       sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
     secrets: inherit
-
diff --git a/...ws/snapshot-e429-eclipse-distro-build.yml → ...ws/snapshot-e432-eclipse-distro-build.yml b/...ws/snapshot-e429-eclipse-distro-build.yml → ...ws/snapshot-e432-eclipse-distro-build.yml
@@ -1,7 +1,7 @@
-name: Snapshot - 4.29 Eclipse STS Distribution Build
+name: Snapshot - 4.32 Eclipse STS Distribution Build
 
 concurrency:
-  group: e429-snapshot
+  group: e432-snapshot
   cancel-in-progress: true
 
 on:
@@ -13,10 +13,10 @@ on:
 #  workflow_dispatch:
 
 jobs:
-  e429-distro:
+  e432-distro:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
-      eclipse_profile: 'e429'
+      eclipse_profile: 'e432'
       build_type: 'snapshot'
     secrets: inherit
diff --git a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml
@@ -14,6 +14,6 @@ jobs:
   eclipse-ls-extensions:
     uses: ./.github/workflows/eclipse-ls-extensions-build.yml
     with:
-      eclipse_profile: 'e429'
+      eclipse_profile: 'e430'
       build_type: 'snapshot'
     secrets: inherit
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
@@ -268,19 +268,6 @@ resources:
 #     secret_access_key: ((s3_prod_secretkey))
 #     region_name: ((s3_prod_region))
 #     regexp: release/STS4/fatjars/spring-boot-language-server-(.*).jar
-- name: vscode-snapshot-website
-  type: s3-multi
-  icon: content-save-outline
-  source:
-    bucket: ((s3_prod_bucket))
-    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
-    change_dir_to: website
-    options:
-    - "--acl public-read"
 - name: vscode-snapshot-website-akamai
   type: s3-multi
   icon: content-save-outline
@@ -1139,7 +1126,6 @@ jobs:
   - task: build-website
     file: sts4/concourse/tasks/build-vscode-website.yml
   - in_parallel:
-    - put: vscode-snapshot-website
     - put: vscode-snapshot-website-akamai      
 # - name: build-fatjars
 #   plan:

diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,9 +23,9 @@ <h2>Eclipse p2 repositories</h2>
 
 	<p><b>STS4 Distribution:</b>
 		<ul>
+			<li>for Eclipse 2024-06 (4.32): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.32">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.32</a></li>
 			<li>for Eclipse 2024-03 (4.31): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.31">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.31</a></li>
 			<li>for Eclipse 2023-12 (4.30): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.30">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.30</a></li>
-			<li>for Eclipse 2023-09 (4.29): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.29">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.29</a></li>
 		</ul>
 	</p>
 
@@ -40,7 +40,13 @@ <h2>Eclipse p2 repositories</h2>
 
 	<h2>Eclipse-based Distribution Builds</h2>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2024-03 Milestone Builds (4.31.0)</h3>
+	<h3>Spring Tool Suite 4 - based on Eclipse 2023-06 Milestone Builds (4.32.0)</h3>
+	<div id="e432"></div>
+	<script type="text/javascript">
+		$('#e432').load('sts4-nightly-e4.32.html');
+	</script>
+
+	<h3>Spring Tool Suite 4 - based on Eclipse 2024-03 Release (4.31.0)</h3>
 	<div id="e431"></div>
 	<script type="text/javascript">
 		$('#e431').load('sts4-nightly-e4.31.html');
@@ -52,12 +58,6 @@ <h3>Spring Tool Suite 4 - based on Eclipse 2023-12 Release (4.30.0)</h3>
 		$('#e430').load('sts4-nightly-e4.30.html');
 	</script>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2023-09 Release (4.29.0)</h3>
-	<div id="e429"></div>
-	<script type="text/javascript">
-		$('#e429').load('sts4-nightly-e4.29.html');
-	</script>
-
 	<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>
 
 	<div id="vsix"></div>

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.boot.ide.branding.feature"
 	label="Spring Tool Suite 4 Branding Feature"
-	version="4.22.0.qualifier"
+	version="4.22.1.qualifier"
 	provider-name="Broadcom">
 
 	<plugin

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.22.0-SNAPSHOT</version>
+		<version>4.22.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF b/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.springframework.boot.ide.branding;singleton:=true
-Bundle-Version: 4.22.0.qualifier
+Bundle-Version: 4.22.1.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.ui,

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.22.0-SNAPSHOT</version>
+		<version>4.22.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/...stribution/org.springframework.boot.ide.product.e430/org.springframework.boot.ide.product b/...stribution/org.springframework.boot.ide.product.e430/org.springframework.boot.ide.product
@@ -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.22.0.qualifier" useFeatures="true" includeLaunchers="true">
+<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.22.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.22.0-SNAPSHOT</version>
+		<version>4.22.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -190,7 +190,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
@@ -211,7 +211,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>

diff --git a/...stribution/org.springframework.boot.ide.product.e431/org.springframework.boot.ide.product b/...stribution/org.springframework.boot.ide.product.e431/org.springframework.boot.ide.product
@@ -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.22.0.qualifier" useFeatures="true" includeLaunchers="true">
+<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.22.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.22.0-SNAPSHOT</version>
+		<version>4.22.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -190,7 +190,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
@@ -211,7 +211,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>

diff --git a/...mework.boot.ide.product.e429/category.xml → ...mework.boot.ide.product.e432/category.xml b/...mework.boot.ide.product.e429/category.xml → ...mework.boot.ide.product.e432/category.xml
@@ -131,7 +131,7 @@
 <!--	<bundle id="javassist.source"/> -->
 	<bundle id="javax.activation"/>
 <!--	<bundle id="javax.activation.source"/> -->
-	<bundle id="javax.annotation"/>
+<!--	<bundle id="javax.annotation"/> -->
 <!--	<bundle id="javax.annotation.source"/> -->
 <!--	<bundle id="javax.ws.rs"/> -->
 <!--	<bundle id="javax.xml.bind"/> -->
@@ -140,6 +140,7 @@
 	<bundle id="org.aopalliance"/>
 	<bundle id="org.apache.log4j"/>
 	<bundle id="org.yaml.snakeyaml"/>
+	<bundle id="org.snakeyaml.engine"/>
 	<bundle id="org.eclipse.lsp4e"/>
 	<bundle id="org.eclipse.lsp4e.debug"/>
 	<bundle id="org.eclipse.lsp4e.jdt"/>

diff --git a/...e429/org.springframework.boot.ide.product → ...e432/org.springframework.boot.ide.product b/...e429/org.springframework.boot.ide.product → ...e432/org.springframework.boot.ide.product
@@ -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.22.0.qualifier" useFeatures="true" includeLaunchers="true">
+<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.22.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -69,7 +69,7 @@
 
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
-      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
+<!--      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/> -->
       <feature id="org.eclipse.m2e.wtp.feature" installMode="root"/>
 <!--      <feature id="org.eclipse.m2e.wtp.jaxrs.feature" installMode="root"/> -->
 <!--      <feature id="org.eclipse.m2e.wtp.jsf.feature" installMode="root"/> -->

diff --git a/...ingframework.boot.ide.product.e429/p2.inf → ...ingframework.boot.ide.product.e432/p2.inf b/...ingframework.boot.ide.product.e429/p2.inf → ...ingframework.boot.ide.product.e432/p2.inf