From a978016ff45600ad62a3bcb78acc714d2b163739 Mon Sep 17 00:00:00 2001 From: aboyko Date: Wed, 12 Mar 2025 12:18:42 -0400 Subject: [PATCH] e436 target and CI. Tycho 4.0.12. JDT LS 1.45 --- .../release-eclipse-distro-build.yml | 20 +- .github/workflows/snapshot-all.yml | 18 +- eclipse-distribution/local-build.sh | 2 +- .../category.xml | 2 +- .../org.springframework.boot.ide.product | 0 .../p2.inf | 0 .../pom.xml | 0 eclipse-distribution/pom.xml | 228 +++++++++--------- eclipse-language-servers/pom.xml | 2 +- headless-services/jdt-ls-extension/pom.xml | 2 +- 10 files changed, 139 insertions(+), 135 deletions(-) rename eclipse-distribution/{org.springframework.boot.ide.product.e433 => org.springframework.boot.ide.product.e436}/category.xml (99%) rename eclipse-distribution/{org.springframework.boot.ide.product.e433 => org.springframework.boot.ide.product.e436}/org.springframework.boot.ide.product (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e433 => org.springframework.boot.ide.product.e436}/p2.inf (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e433 => org.springframework.boot.ide.product.e436}/pom.xml (100%) diff --git a/.github/workflows/release-eclipse-distro-build.yml b/.github/workflows/release-eclipse-distro-build.yml index 196c6f48e..7fda0d685 100644 --- a/.github/workflows/release-eclipse-distro-build.yml +++ b/.github/workflows/release-eclipse-distro-build.yml @@ -14,16 +14,6 @@ on: jobs: - e433-distro: - uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml - with: - eclipse_profile: 'e433' - build_type: 'release' - p2-qualifier: 'RELEASE' - sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} - java_version: '21' - secrets: inherit - e434-distro: uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml with: @@ -43,3 +33,13 @@ jobs: sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} java_version: '21' secrets: inherit + + e436-distro: + uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml + with: + eclipse_profile: 'e436' + build_type: 'release' + p2-qualifier: 'RELEASE' + sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} + java_version: '21' + secrets: inherit diff --git a/.github/workflows/snapshot-all.yml b/.github/workflows/snapshot-all.yml index cfa0603f3..00888c564 100644 --- a/.github/workflows/snapshot-all.yml +++ b/.github/workflows/snapshot-all.yml @@ -28,15 +28,6 @@ jobs: skip_tests: true secrets: inherit - e433-distro: - needs: [ eclipse-ls-extensions ] - uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml - with: - eclipse_profile: 'e433' - build_type: 'snapshot' - java_version: '21' - secrets: inherit - e434-distro: needs: [ eclipse-ls-extensions ] uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -55,6 +46,15 @@ jobs: java_version: '21' secrets: inherit + e436-distro: + needs: [ eclipse-ls-extensions ] + uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml + with: + eclipse_profile: 'e436' + build_type: 'snapshot' + java_version: '21' + secrets: inherit + vscode-spring-boot: needs: [ language-servers-multiplatform-build ] uses: ./.github/workflows/snapshot-vscode-extension.yml diff --git a/eclipse-distribution/local-build.sh b/eclipse-distribution/local-build.sh index 52b8e016f..625f37da3 100755 --- a/eclipse-distribution/local-build.sh +++ b/eclipse-distribution/local-build.sh @@ -1,2 +1,2 @@ -./mvnw clean install -Pe433 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 +./mvnw clean install -Pe436 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e436/category.xml similarity index 99% rename from eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e436/category.xml index 77000088b..dd77aab7d 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e436/category.xml @@ -137,7 +137,7 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e433/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e436/org.springframework.boot.ide.product similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e433/org.springframework.boot.ide.product rename to eclipse-distribution/org.springframework.boot.ide.product.e436/org.springframework.boot.ide.product diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e436/p2.inf similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf rename to eclipse-distribution/org.springframework.boot.ide.product.e436/p2.inf diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e433/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e436/pom.xml similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e433/pom.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e436/pom.xml diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 6365cb6a0..a1199dae2 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -78,7 +78,7 @@ https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version} - 4.0.10 + 4.0.12 UTF-8 3.9.4.202211021051 @@ -129,111 +129,6 @@ - - e433 - - e4.33.0 - e4.33 - 2024-09 - 2024-09 (4.33) - 2024-09 - 4.33.0 - e433 - - - - 2024-09 - p2 - https://download.eclipse.org/releases/2024-09/ - - - orbit - p2 - https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09 - - - buildship-snapshots - p2 - - https://download.eclipse.org/buildship/updates/latest - - - m2e - p2 - https://download.eclipse.org/technology/m2e/releases/latest/ - - - - latest-m2e-wtp-release - p2 - https://download.eclipse.org/m2e-wtp/releases/latest/ - - - maven-extras-mirror - p2 - https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/ - - - maven-egit - p2 - https://github.com/tesla/m2eclipse-egit/releases/download/0.17.0/ - - - maven-wro4j - p2 - https://github.com/jbosstools/m2e-wro4j/releases/download/1.2.1/ - - - maven-dependency-support - p2 - https://ianbrandt.github.io/m2e-maven-dependency-plugin/ - - - - wildwebdeveloper - p2 - https://download.eclipse.org/wildwebdeveloper/releases/latest/ - - - cdt-updates - p2 - https://download.eclipse.org/tools/cdt/releases/latest/ - - - lsp4e - p2 - https://download.eclipse.org/lsp4e/releases/0.26.7/ - - - - tm4e-snapshots - p2 - https://download.eclipse.org/tm4e/releases/latest/ - - - - - - - - org.springframework.boot.ide.product.e433 - - - - e434 @@ -354,13 +249,8 @@ 2025-03 p2 - https://download.eclipse.org/staging/2025-03/ + https://download.eclipse.org/releases/2025-03/ - orbit p2 @@ -452,6 +342,120 @@ org.springframework.boot.ide.product.e435 + + + e436 + + e4.36.0 + e4.36 + 2025-06 + 2025-06 (4.36) + 2025-06 + 4.36.0 + e436 + + + + 2025-06 + p2 + https://download.eclipse.org/staging/2025-06/ + + + + orbit + p2 + https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06 + + + + buildship-snapshots + p2 + + https://download.eclipse.org/buildship/updates/latest + + + m2e + p2 + https://download.eclipse.org/technology/m2e/releases/latest/ + + + + latest-m2e-wtp-release + p2 + https://download.eclipse.org/m2e-wtp/releases/latest/ + + + maven-extras-mirror + p2 + https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/ + + + maven-egit + p2 + https://github.com/tesla/m2eclipse-egit/releases/download/0.17.0/ + + + maven-wro4j + p2 + https://github.com/jbosstools/m2e-wro4j/releases/download/1.2.1/ + + + maven-dependency-support + p2 + https://ianbrandt.github.io/m2e-maven-dependency-plugin/ + + + + wildwebdeveloper + p2 + https://download.eclipse.org/wildwebdeveloper/releases/latest/ + + + cdt-updates + p2 + https://download.eclipse.org/tools/cdt/releases/latest/ + + + lsp4e + p2 + + https://download.eclipse.org/lsp4e/snapshots/ + + + tm4e-snapshots + p2 + https://download.eclipse.org/tm4e/releases/latest/ + + + + + + + + org.springframework.boot.ide.product.e435 + + diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 646cdf820..750ea60ed 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -79,7 +79,7 @@ SNAPSHOT Spring Boot IDE Language Server - 4.0.10 + 4.0.12 UTF-8 tools-spring-io diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml index 107dd394f..bcc386392 100644 --- a/headless-services/jdt-ls-extension/pom.xml +++ b/headless-services/jdt-ls-extension/pom.xml @@ -46,7 +46,7 @@ - 4.0.10 + 4.0.12 true