From 0fc5a194d0f66985ad85a808dd3aa4aa64ef407f Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 12 Jan 2023 09:50:07 +0100 Subject: [PATCH 1/2] adopt latest wro4j update site that works again with tycho 3 --- eclipse-distribution/pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index f5cf281a8..3ba58a6ef 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -532,8 +532,7 @@ maven-wro4j p2 - - https://dist.springsource.com/release/TOOLS/third-party/wro4j + https://github.com/jbosstools/m2e-wro4j/releases/download/1.2.1/ maven-dependency-support @@ -626,8 +625,7 @@ maven-wro4j p2 - - https://dist.springsource.com/release/TOOLS/third-party/wro4j + https://github.com/jbosstools/m2e-wro4j/releases/download/1.2.1/ maven-dependency-support From d04f83f1372752e7dea8108ab946b67655a47e77 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 12 Jan 2023 16:08:02 +0100 Subject: [PATCH 2/2] added target definitions for builds against Eclipse 2023-03 --- .../.project | 17 - .../category.xml | 9 +- .../entitlements.plist | 0 .../macos-notarize.sh | 0 .../org.springframework.boot.ide.product | 16 +- .../p2.inf | 0 .../pom.xml | 100 ++++- ...ool-suite-4-dmg-config-e4.27-aarch64.json} | 0 ...ng-tool-suite-4-dmg-config-e4.27-x86.json} | 0 eclipse-distribution/pom.xml | 346 +++++------------- eclipse-language-servers/pom.xml | 100 +++-- 11 files changed, 237 insertions(+), 351 deletions(-) delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e417/.project rename eclipse-distribution/{org.springframework.boot.ide.product.e423 => org.springframework.boot.ide.product.e427}/category.xml (97%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423 => org.springframework.boot.ide.product.e427}/entitlements.plist (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423 => org.springframework.boot.ide.product.e427}/macos-notarize.sh (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423 => org.springframework.boot.ide.product.e427}/org.springframework.boot.ide.product (90%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423 => org.springframework.boot.ide.product.e427}/p2.inf (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423 => org.springframework.boot.ide.product.e427}/pom.xml (86%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423/spring-tool-suite-4-dmg-config-e4.23-aarch64.json => org.springframework.boot.ide.product.e427/spring-tool-suite-4-dmg-config-e4.27-aarch64.json} (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e423/spring-tool-suite-4-dmg-config-e4.23-x86.json => org.springframework.boot.ide.product.e427/spring-tool-suite-4-dmg-config-e4.27-x86.json} (100%) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e417/.project b/eclipse-distribution/org.springframework.boot.ide.product.e417/.project deleted file mode 100644 index bee6e73c3..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e417/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.springframework.boot.ide.product.e417 - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e427/category.xml similarity index 97% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/category.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e427/category.xml index f5269de70..4872593ee 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e423/category.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e427/category.xml @@ -95,7 +95,8 @@ ---> +--> + @@ -127,14 +128,14 @@ - + - - + + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/entitlements.plist b/eclipse-distribution/org.springframework.boot.ide.product.e427/entitlements.plist similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/entitlements.plist rename to eclipse-distribution/org.springframework.boot.ide.product.e427/entitlements.plist diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/macos-notarize.sh b/eclipse-distribution/org.springframework.boot.ide.product.e427/macos-notarize.sh similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/macos-notarize.sh rename to eclipse-distribution/org.springframework.boot.ide.product.e427/macos-notarize.sh diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e427/org.springframework.boot.ide.product similarity index 90% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/org.springframework.boot.ide.product rename to eclipse-distribution/org.springframework.boot.ide.product.e427/org.springframework.boot.ide.product index 39136620f..e4c393481 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e423/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e427/org.springframework.boot.ide.product @@ -9,7 +9,7 @@ -product org.springframework.boot.ide.branding.sts4 --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=11 + -Dosgi.requiredJavaVersion=17 -Dosgi.dataAreaRequiresExplicitInit=true -Xms256m -Xmx2048m @@ -69,7 +69,7 @@ - + @@ -92,14 +92,14 @@ - - - + + + - - + + - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e427/p2.inf similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/p2.inf rename to eclipse-distribution/org.springframework.boot.ide.product.e427/p2.inf diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml similarity index 86% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/pom.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml index 794933a10..03bcccc38 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e423/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml @@ -110,7 +110,12 @@ https://download.eclipse.org/releases/2022-03 - -Declipse.p2.mirrors=false -Dorg.eclipse.ecf.provider.filetransfer.retrieve.readTimeout=100000 -Dorg.eclipse.ecf.provider.filetransfer.retrieve.retryAttempts=30 -Dorg.eclipse.ecf.provider.filetransfer.retrieve.closeTimeout=100000 + + -Declipse.p2.mirrors=false + -Dorg.eclipse.ecf.provider.filetransfer.retrieve.readTimeout=100000 + -Dorg.eclipse.ecf.provider.filetransfer.retrieve.retryAttempts=30 + -Dorg.eclipse.ecf.provider.filetransfer.retrieve.closeTimeout=100000 + org.eclipse.pde.api.tools @@ -179,7 +184,18 @@ eclipse-run - -consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app -repository ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + + -consoleLog + -application + org.eclipse.equinox.p2.director + -nosplash + -destination + ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app + -repository + ${justj.repository} + -installIUs + org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + @@ -189,7 +205,18 @@ eclipse-run - -consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app -repository ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + + -consoleLog + -application + org.eclipse.equinox.p2.director + -nosplash + -destination + ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app + -repository + ${justj.repository} + -installIUs + org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + @@ -199,7 +226,18 @@ eclipse-run - -consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier} -repository ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + + -consoleLog + -application + org.eclipse.equinox.p2.director + -nosplash + -destination + ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier} + -repository + ${justj.repository} + -installIUs + org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + @@ -209,7 +247,18 @@ eclipse-run - -consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier} -repository ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + + -consoleLog + -application + org.eclipse.equinox.p2.director + -nosplash + -destination + ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier} + -repository + ${justj.repository} + -installIUs + org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + @@ -219,7 +268,18 @@ eclipse-run - -consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/aarch64/sts-${unqualifiedVersion}.${p2.qualifier} -repository ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + + -consoleLog + -application + org.eclipse.equinox.p2.director + -nosplash + -destination + ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/aarch64/sts-${unqualifiedVersion}.${p2.qualifier} + -repository + ${justj.repository} + -installIUs + org.eclipse.justj.openjdk.hotspot.jre.full.feature.group + @@ -466,17 +526,17 @@ - + - + - + - + - + - + @@ -486,15 +546,19 @@ + + + + @@ -503,16 +567,16 @@ - + - + - + - + @@ -572,7 +636,7 @@ - + @@ -605,7 +669,7 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/spring-tool-suite-4-dmg-config-e4.23-aarch64.json b/eclipse-distribution/org.springframework.boot.ide.product.e427/spring-tool-suite-4-dmg-config-e4.27-aarch64.json similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/spring-tool-suite-4-dmg-config-e4.23-aarch64.json rename to eclipse-distribution/org.springframework.boot.ide.product.e427/spring-tool-suite-4-dmg-config-e4.27-aarch64.json diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e423/spring-tool-suite-4-dmg-config-e4.23-x86.json b/eclipse-distribution/org.springframework.boot.ide.product.e427/spring-tool-suite-4-dmg-config-e4.27-x86.json similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e423/spring-tool-suite-4-dmg-config-e4.23-x86.json rename to eclipse-distribution/org.springframework.boot.ide.product.e427/spring-tool-suite-4-dmg-config-e4.27-x86.json diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 3ba58a6ef..a36f88445 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -137,253 +137,6 @@ - - e422 - - e4.22.0 - e4.22 - 2021-12 - 2021-12 (4.22) - 2021-12 - 4.22 - e422 - - - - 2021-12 - p2 - https://download.eclipse.org/releases/2021-12/ - - - orbit - p2 - https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository - - - m2e - p2 - https://download.eclipse.org/technology/m2e/releases/1.20.1/ - - - latest-m2e-wtp - p2 - https://download.eclipse.org/m2e-wtp/releases/1.4/ - - - - maven-extras-mirror - p2 - https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/ - - - maven-egit - p2 - https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST - - - - maven-wro4j - p2 - https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-wro4j/1.1.0-2014-06-25_06-16-31-H26/ - - - m2e-chromatic - p2 - https://sidespin.github.io/m2e-chromatic/update/ - - - maven-devtools - p2 - https://dist.springsource.com/release/TOOLS/mavendevtools/ - - - maven-dependency-support - p2 - https://ianbrandt.github.io/m2e-maven-dependency-plugin/ - - - ansi-console - p2 - https://www.mihai-nita.net/eclipse - - - - mylyn-markdown - p2 - https://download.eclipse.org/mylyn/docs/releases/3.0/ - - - wildwebdeveloper - p2 - https://download.eclipse.org/wildwebdeveloper/releases/0.13.3 - - - - lsp4e - p2 - https://download.eclipse.org/lsp4e/releases/0.20.5/ - - - - - - - org.springframework.boot.ide.product.e422 - - - - - - e423 - - e4.23.0 - e4.23 - 2022-03 - 2022-03 (4.23) - 2022-03 - 4.23 - e423 - - - - 2022-03 - p2 - https://download.eclipse.org/releases/2022-03/ - - - orbit - p2 - https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository - - - m2e - p2 - https://download.eclipse.org/technology/m2e/releases/1.20.1/ - - - latest-m2e-wtp - p2 - https://download.eclipse.org/m2e-wtp/releases/1.4/ - - - - maven-extras-mirror - p2 - https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/ - - - maven-egit - p2 - https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST - - - - maven-wro4j - p2 - https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-wro4j/1.1.0-2014-06-25_06-16-31-H26/ - - - m2e-chromatic - p2 - https://sidespin.github.io/m2e-chromatic/update/ - - - maven-devtools - p2 - https://dist.springsource.com/release/TOOLS/mavendevtools/ - - - maven-dependency-support - p2 - https://ianbrandt.github.io/m2e-maven-dependency-plugin/ - - - ansi-console - p2 - https://www.mihai-nita.net/eclipse - - - - mylyn-markdown - p2 - https://download.eclipse.org/mylyn/docs/releases/3.0.45/ - - - - wildwebdeveloper - p2 - https://download.eclipse.org/wildwebdeveloper/releases/0.13.5/ - - - - lsp4e - p2 - https://download.eclipse.org/lsp4e/releases/0.20.5/ - - - - - - - org.springframework.boot.ide.product.e423 - - - - e424 @@ -482,7 +235,7 @@ ../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64 ../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64 --> - org.springframework.boot.ide.product.e424 + org.springframework.boot.ide.product.e424 @@ -575,7 +328,7 @@ ../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64 ../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64 --> - org.springframework.boot.ide.product.e425 + org.springframework.boot.ide.product.e425 @@ -668,7 +421,100 @@ ../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64 ../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64 --> - org.springframework.boot.ide.product.e426 + org.springframework.boot.ide.product.e426 + + + + + + e427 + + e4.27.0 + e4.27 + 2023-03 + 2023-03 (4.27) + 2023-03 + 4.27 + e427 + + + + 2022-12 + p2 + https://download.eclipse.org/staging/2023-03/ + + + orbit + p2 + https://download.eclipse.org/tools/orbit/downloads/drops/S20230101190934/repository + + + 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://download.springsource.com/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/ + + + mylyn-markdown + p2 + https://download.eclipse.org/mylyn/docs/releases/3.0.45/ + + + wildwebdeveloper + p2 + https://download.eclipse.org/wildwebdeveloper/releases/latest/ + + + lsp4e + p2 + + https://download.eclipse.org/lsp4e/snapshots/ + + + tm4e-snapshots + p2 + https://download.eclipse.org/tm4e/releases/0.6.2/ + + + + + + + + org.springframework.boot.ide.product.e427 diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 9c53fa06a..487bab13b 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -126,51 +126,6 @@ - - e423 - - e4.23.0 - e4.23 - 2022-03 - 2022-03 (4.23) - 2022-03 - 4.23 - e423 - - - - 2022-03 - p2 - https://download.eclipse.org/releases/2022-03/ - - - orbit - p2 - https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository - - - mylyn-markdown - p2 - https://download.eclipse.org/mylyn/docs/releases/3.0.45/ - - - lsp4e - p2 - https://download.eclipse.org/lsp4e/releases/0.20.7/ - - - tm4e - p2 - https://download.eclipse.org/tm4e/releases/0.6.1 - - - wwd - p2 - https://download.eclipse.org/wildwebdeveloper/releases/0.13.5/ - - - - e424 @@ -235,11 +190,6 @@ p2 https://download.eclipse.org/releases/2022-09/ - orbit p2 @@ -287,11 +237,53 @@ p2 https://download.eclipse.org/releases/2022-12/ - + https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository + + + mylyn-markdown + p2 + https://download.eclipse.org/mylyn/docs/releases/3.0.45/ + + + lsp4e + p2 + + https://download.eclipse.org/lsp4e/snapshots + + + tm4e + p2 + https://download.eclipse.org/tm4e/releases/0.6.2/ + + + + wwd + p2 + https://download.eclipse.org/wildwebdeveloper/releases/latest/ + + + + + + e427 + + e4.27.0 + e4.27 + 2023-03 + 2023-03 (4.27) + 2023-03 + 4.27 + e427 + + + + 2022-12 + p2 + https://download.eclipse.org/staging/2023-03/ + orbit p2