From 145018a8ccc77fb39cf41342d59375bcec9ef23c Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 17 Sep 2020 09:08:21 +0200 Subject: [PATCH] updated target definitions, removed outdated ones, added new one for Eclipse 2020-12 --- .../common/html/nightly-distributions.html | 16 +- .../category.xml | 215 -------- .../org.springframework.boot.ide.product | 124 ----- .../p2.inf | 30 -- .../pom.xml | 479 ------------------ .../category.xml | 402 --------------- .../entitlements.plist | 18 - .../macos-notarize.sh | 32 -- .../org.springframework.boot.ide.product | 124 ----- .../p2.inf | 30 -- .../spring-tool-suite-4-dmg-config-e4.14.json | 10 - .../entitlements.plist | 18 - .../macos-notarize.sh | 32 -- .../pom.xml | 479 ------------------ .../spring-tool-suite-4-dmg-config-e4.15.json | 10 - .../category.xml | 0 .../entitlements.plist | 0 .../macos-notarize.sh | 0 .../org.springframework.boot.ide.product | 31 +- .../p2.inf | 8 - .../pom.xml | 22 +- ...spring-tool-suite-4-dmg-config-e4.18.json} | 0 eclipse-distribution/pom.xml | 212 ++++---- eclipse-language-servers/pom.xml | 99 ++-- 24 files changed, 210 insertions(+), 2181 deletions(-) delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e413/p2.inf delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e414/category.xml delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e414/entitlements.plist delete mode 100755 eclipse-distribution/org.springframework.boot.ide.product.e414/macos-notarize.sh delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e414/org.springframework.boot.ide.product delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e414/p2.inf delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e414/spring-tool-suite-4-dmg-config-e4.14.json delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e415/entitlements.plist delete mode 100755 eclipse-distribution/org.springframework.boot.ide.product.e415/macos-notarize.sh delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e415/pom.xml delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e415/spring-tool-suite-4-dmg-config-e4.15.json rename eclipse-distribution/{org.springframework.boot.ide.product.e415 => org.springframework.boot.ide.product.e418}/category.xml (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e413 => org.springframework.boot.ide.product.e418}/entitlements.plist (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e413 => org.springframework.boot.ide.product.e418}/macos-notarize.sh (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e415 => org.springframework.boot.ide.product.e418}/org.springframework.boot.ide.product (83%) rename eclipse-distribution/{org.springframework.boot.ide.product.e415 => org.springframework.boot.ide.product.e418}/p2.inf (87%) rename eclipse-distribution/{org.springframework.boot.ide.product.e414 => org.springframework.boot.ide.product.e418}/pom.xml (97%) rename eclipse-distribution/{org.springframework.boot.ide.product.e413/spring-tool-suite-4-dmg-config-e4.13.json => org.springframework.boot.ide.product.e418/spring-tool-suite-4-dmg-config-e4.18.json} (100%) diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html index e17b3d001..4f45ac328 100644 --- a/eclipse-distribution/common/html/nightly-distributions.html +++ b/eclipse-distribution/common/html/nightly-distributions.html @@ -23,9 +23,9 @@

STS4 Distribution:

@@ -49,7 +49,13 @@

Eclipse-based Distribution Builds

-

Spring Tool Suite 4 - based on Eclipse 2020-09 Milestone Builds (4.17.0)

+

Spring Tool Suite 4 - based on Eclipse 2020-12 Milestone Builds (4.18.0)

+
+ + +

Spring Tool Suite 4 - based on Eclipse 2020-09 Release (4.17.0)

-

Spring Tool Suite 4 - based on Eclipse 2020-03 Release (4.15.0)

-
- -

Spring Tools 4 - Visual Studio Code Extensions

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml deleted file mode 100644 index 4a600281e..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - - Spring Tool Suite 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product deleted file mode 100644 index be8f4feab..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - -product org.springframework.boot.ide.branding.sts4 ---launcher.defaultAction openFile - - -Dosgi.requiredJavaVersion=1.8 --Xms256m --Xmx1024m --XX:+UseG1GC --XX:+UseStringDeduplication ---add-modules=ALL-SYSTEM - - - - -XstartOnFirstThread --Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e413/p2.inf deleted file mode 100644 index 0dd7203f5..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/p2.inf +++ /dev/null @@ -1,30 +0,0 @@ -instructions.configure=\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-09,name:2019-09);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-09,name:2019-09);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-09);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-09);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ - org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/dropins); - -instructions.unconfigure=\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-09);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-09);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations); - - # Bug 530093: make sure we have latest version of a.jre.javase included with product - requires.3.namespace=org.eclipse.equinox.p2.iu - requires.3.name=a.jre.javase - requires.3.range=[9.0.0,9.0.0] - requires.4.namespace=org.eclipse.equinox.p2.iu - requires.4.name=config.a.jre.javase - requires.4.range=[9.0.0,9.0.0] diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml deleted file mode 100644 index a29dad02b..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml +++ /dev/null @@ -1,479 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot.ide - org.springframework.boot.ide - 4.8.1-SNAPSHOT - ../pom.xml - - - org.springframework.boot.ide.product - - eclipse-repository - - - ${accessKey} - ${secretKey} - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - default-install - none - - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho-version} - - false - - - - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho-version} - - true - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - JavaSE-9 - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho-version} - - - materialize-products - - materialize-products - - package - - - archive-products - - archive-products - - verify - - - - - - org.springframework.boot.ide.branding.sts4 - sts-${unqualifiedVersion}.${p2.qualifier} - - SpringToolSuite4.app - - spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target} - - - - tar.gz - tar.gz - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - generate-license-files - package - - exec - - - java - - -jar - ${project.build.directory}/../../common/eclipse-distribution-license-file-generator.jar - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/plugins/ - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/ - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/ - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt - - - - - - generate-self-extracting-jar - verify - - exec - - - java - - -jar - ${project.build.directory}/../../common/self-extracting-jar-creator.jar - ${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - - - win-exe-signing - package - - ${skip.win.signing} - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - osx-app-signing - package - - ${skip.osx.signing} - - - - - - - - - - - - - - - - - - - - - - run - - - - - - osx-dmg-creation - verify - - - - - - - - - - - - - - run - - - - - osx-dmg-signing - verify - - ${skip.osx.signing} - - - - - - - - - - - - - - - - - - - run - - - - - - osx-dmg-notarizing - verify - - ${skip.osx.notarizing} - - - - - - - - - - - - - - run - - - - - upload-product-bundles - deploy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - update-nightly-downloads - deploy - - ${skip.update-nightly-download-page} - - - - - - - - - - - - - - - - - - run - - - - - zip-sts-repository - install - - - - - - - - - - - - - - - - - - - - - - - run - - - - - upload-sts-repository - deploy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - - org.springframework.build - org.springframework.build.aws.ant - 3.1.0.RELEASE - - - net.java.dev.jets3t - jets3t - 0.8.1 - - - ant-contrib - ant-contrib - 20020829 - - - - - - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e414/category.xml deleted file mode 100644 index b2ac951bb..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/category.xml +++ /dev/null @@ -1,402 +0,0 @@ - - - - Spring Tool Suite 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/entitlements.plist b/eclipse-distribution/org.springframework.boot.ide.product.e414/entitlements.plist deleted file mode 100644 index 6a297d495..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/entitlements.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - com.apple.security.cs.allow-jit - - com.apple.security.cs.allow-unsigned-executable-memory - - com.apple.security.cs.disable-executable-page-protection - - com.apple.security.cs.allow-dyld-environment-variables - - com.apple.security.cs.disable-library-validation - - com.apple.security.cs.debugger - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/macos-notarize.sh b/eclipse-distribution/org.springframework.boot.ide.product.e414/macos-notarize.sh deleted file mode 100755 index eaf3bde2b..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/macos-notarize.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -DMG=$1 -NOTARIZE_SERVICE_URL=$2 - -RESPONSE=\ -$(curl -s -X POST \ - -F file=@${DMG} \ - -F 'options={"primaryBundleId": "SpringTools4", "staple": true};type=application/json' \ - ${NOTARIZE_SERVICE_URL}/macos-notarization-service/notarize) - -echo "Notarization request submitted" -echo ${RESPONSE} - -UUID=$(echo ${RESPONSE} | jq -r '.uuid') - -STATUS=$(echo ${RESPONSE} | jq -r '.notarizationStatus.status') - -while [[ ${STATUS} == 'IN_PROGRESS' ]]; do - sleep 1m - RESPONSE=$(curl -s ${NOTARIZE_SERVICE_URL}/macos-notarization-service/${UUID}/status) - STATUS=$(echo ${RESPONSE} | jq -r '.notarizationStatus.status') -done - -if [[ ${STATUS} != 'COMPLETE' ]]; then - echo "Notarization failed: ${RESPONSE}" - exit 1 -fi - -mv "${DMG}" "${DMG}-unnotarized" - -curl -o ${DMG} -J ${NOTARIZE_SERVICE_URL}/macos-notarization-service/${UUID}/download diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e414/org.springframework.boot.ide.product deleted file mode 100644 index be8f4feab..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/org.springframework.boot.ide.product +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - -product org.springframework.boot.ide.branding.sts4 ---launcher.defaultAction openFile - - -Dosgi.requiredJavaVersion=1.8 --Xms256m --Xmx1024m --XX:+UseG1GC --XX:+UseStringDeduplication ---add-modules=ALL-SYSTEM - - - - -XstartOnFirstThread --Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e414/p2.inf deleted file mode 100644 index 89f3ace02..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/p2.inf +++ /dev/null @@ -1,30 +0,0 @@ -instructions.configure=\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-12,name:2019-12);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-12);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-12);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ - org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/dropins); - -instructions.unconfigure=\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-12);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-12);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations); - - # Bug 530093: make sure we have latest version of a.jre.javase included with product - requires.3.namespace=org.eclipse.equinox.p2.iu - requires.3.name=a.jre.javase - requires.3.range=[9.0.0,9.0.0] - requires.4.namespace=org.eclipse.equinox.p2.iu - requires.4.name=config.a.jre.javase - requires.4.range=[9.0.0,9.0.0] diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/spring-tool-suite-4-dmg-config-e4.14.json b/eclipse-distribution/org.springframework.boot.ide.product.e414/spring-tool-suite-4-dmg-config-e4.14.json deleted file mode 100644 index c86b0023f..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/spring-tool-suite-4-dmg-config-e4.14.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "title": "Spring Tool Suite 4", - "icon": "../org.springframework.boot.ide.branding/sts4.icns", - "contents": [ - { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app" }, - { "x": 448, "y": 100, "type": "link", "path": "/Applications" }, - { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts4.icns", "name": ".VolumeIcon.icns" } - ], - "format": "UDZO" -} diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/entitlements.plist b/eclipse-distribution/org.springframework.boot.ide.product.e415/entitlements.plist deleted file mode 100644 index 6a297d495..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e415/entitlements.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - com.apple.security.cs.allow-jit - - com.apple.security.cs.allow-unsigned-executable-memory - - com.apple.security.cs.disable-executable-page-protection - - com.apple.security.cs.allow-dyld-environment-variables - - com.apple.security.cs.disable-library-validation - - com.apple.security.cs.debugger - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/macos-notarize.sh b/eclipse-distribution/org.springframework.boot.ide.product.e415/macos-notarize.sh deleted file mode 100755 index eaf3bde2b..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e415/macos-notarize.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -DMG=$1 -NOTARIZE_SERVICE_URL=$2 - -RESPONSE=\ -$(curl -s -X POST \ - -F file=@${DMG} \ - -F 'options={"primaryBundleId": "SpringTools4", "staple": true};type=application/json' \ - ${NOTARIZE_SERVICE_URL}/macos-notarization-service/notarize) - -echo "Notarization request submitted" -echo ${RESPONSE} - -UUID=$(echo ${RESPONSE} | jq -r '.uuid') - -STATUS=$(echo ${RESPONSE} | jq -r '.notarizationStatus.status') - -while [[ ${STATUS} == 'IN_PROGRESS' ]]; do - sleep 1m - RESPONSE=$(curl -s ${NOTARIZE_SERVICE_URL}/macos-notarization-service/${UUID}/status) - STATUS=$(echo ${RESPONSE} | jq -r '.notarizationStatus.status') -done - -if [[ ${STATUS} != 'COMPLETE' ]]; then - echo "Notarization failed: ${RESPONSE}" - exit 1 -fi - -mv "${DMG}" "${DMG}-unnotarized" - -curl -o ${DMG} -J ${NOTARIZE_SERVICE_URL}/macos-notarization-service/${UUID}/download diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e415/pom.xml deleted file mode 100644 index a29dad02b..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e415/pom.xml +++ /dev/null @@ -1,479 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot.ide - org.springframework.boot.ide - 4.8.1-SNAPSHOT - ../pom.xml - - - org.springframework.boot.ide.product - - eclipse-repository - - - ${accessKey} - ${secretKey} - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - default-install - none - - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho-version} - - false - - - - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho-version} - - true - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - JavaSE-9 - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho-version} - - - materialize-products - - materialize-products - - package - - - archive-products - - archive-products - - verify - - - - - - org.springframework.boot.ide.branding.sts4 - sts-${unqualifiedVersion}.${p2.qualifier} - - SpringToolSuite4.app - - spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target} - - - - tar.gz - tar.gz - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - generate-license-files - package - - exec - - - java - - -jar - ${project.build.directory}/../../common/eclipse-distribution-license-file-generator.jar - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/plugins/ - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/ - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/ - ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt - - - - - - generate-self-extracting-jar - verify - - exec - - - java - - -jar - ${project.build.directory}/../../common/self-extracting-jar-creator.jar - ${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - - - win-exe-signing - package - - ${skip.win.signing} - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - osx-app-signing - package - - ${skip.osx.signing} - - - - - - - - - - - - - - - - - - - - - - run - - - - - - osx-dmg-creation - verify - - - - - - - - - - - - - - run - - - - - osx-dmg-signing - verify - - ${skip.osx.signing} - - - - - - - - - - - - - - - - - - - run - - - - - - osx-dmg-notarizing - verify - - ${skip.osx.notarizing} - - - - - - - - - - - - - - run - - - - - upload-product-bundles - deploy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - update-nightly-downloads - deploy - - ${skip.update-nightly-download-page} - - - - - - - - - - - - - - - - - - run - - - - - zip-sts-repository - install - - - - - - - - - - - - - - - - - - - - - - - run - - - - - upload-sts-repository - deploy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - - org.springframework.build - org.springframework.build.aws.ant - 3.1.0.RELEASE - - - net.java.dev.jets3t - jets3t - 0.8.1 - - - ant-contrib - ant-contrib - 20020829 - - - - - - - - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/spring-tool-suite-4-dmg-config-e4.15.json b/eclipse-distribution/org.springframework.boot.ide.product.e415/spring-tool-suite-4-dmg-config-e4.15.json deleted file mode 100644 index c86b0023f..000000000 --- a/eclipse-distribution/org.springframework.boot.ide.product.e415/spring-tool-suite-4-dmg-config-e4.15.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "title": "Spring Tool Suite 4", - "icon": "../org.springframework.boot.ide.branding/sts4.icns", - "contents": [ - { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app" }, - { "x": 448, "y": 100, "type": "link", "path": "/Applications" }, - { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts4.icns", "name": ".VolumeIcon.icns" } - ], - "format": "UDZO" -} diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e418/category.xml similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e415/category.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e418/category.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/entitlements.plist b/eclipse-distribution/org.springframework.boot.ide.product.e418/entitlements.plist similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e413/entitlements.plist rename to eclipse-distribution/org.springframework.boot.ide.product.e418/entitlements.plist diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/macos-notarize.sh b/eclipse-distribution/org.springframework.boot.ide.product.e418/macos-notarize.sh similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e413/macos-notarize.sh rename to eclipse-distribution/org.springframework.boot.ide.product.e418/macos-notarize.sh diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e418/org.springframework.boot.ide.product similarity index 83% rename from eclipse-distribution/org.springframework.boot.ide.product.e415/org.springframework.boot.ide.product rename to eclipse-distribution/org.springframework.boot.ide.product.e418/org.springframework.boot.ide.product index be8f4feab..1e508c5fe 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e415/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e418/org.springframework.boot.ide.product @@ -9,11 +9,10 @@ -product org.springframework.boot.ide.branding.sts4 --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=1.8 + -Dosgi.requiredJavaVersion=11 +-Dosgi.dataAreaRequiresExplicitInit=true -Xms256m --Xmx1024m --XX:+UseG1GC --XX:+UseStringDeduplication +-Xmx2048m --add-modules=ALL-SYSTEM @@ -61,26 +60,31 @@ + + + - - + + - - - + + + - + + + @@ -96,6 +100,9 @@ + + + @@ -106,7 +113,9 @@ - + + + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e415/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e418/p2.inf similarity index 87% rename from eclipse-distribution/org.springframework.boot.ide.product.e415/p2.inf rename to eclipse-distribution/org.springframework.boot.ide.product.e418/p2.inf index 7e7e563c0..07a0ab677 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e415/p2.inf +++ b/eclipse-distribution/org.springframework.boot.ide.product.e418/p2.inf @@ -14,11 +14,3 @@ instructions.unconfigure=\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations); - - # Bug 530093: make sure we have latest version of a.jre.javase included with product - requires.3.namespace=org.eclipse.equinox.p2.iu - requires.3.name=a.jre.javase - requires.3.range=[9.0.0,9.0.0] - requires.4.namespace=org.eclipse.equinox.p2.iu - requires.4.name=config.a.jre.javase - requires.4.range=[9.0.0,9.0.0] diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e414/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml similarity index 97% rename from eclipse-distribution/org.springframework.boot.ide.product.e414/pom.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml index a29dad02b..dcb2470ff 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e414/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml @@ -51,16 +51,16 @@ true - + org.eclipse.tycho tycho-p2-director-plugin @@ -475,5 +475,21 @@ + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + true + + + + + + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/spring-tool-suite-4-dmg-config-e4.13.json b/eclipse-distribution/org.springframework.boot.ide.product.e418/spring-tool-suite-4-dmg-config-e4.18.json similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e413/spring-tool-suite-4-dmg-config-e4.13.json rename to eclipse-distribution/org.springframework.boot.ide.product.e418/spring-tool-suite-4-dmg-config-e4.18.json diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 182d1dc1b..63f729443 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -120,99 +120,6 @@ - - e415 - - e4.15.0 - e4.15 - 2020-03 - 2020-03 (4.15.0) - 2020-03 - 4.15 - e415 - - - - 2020-03 - p2 - https://download.eclipse.org/releases/2020-03/ - - - 2020-03-updates - p2 - https://download.eclipse.org/eclipse/updates/4.15/ - - - orbit - p2 - https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository - - - 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://dl.bintray.com/sidespin/repo/m2e-chromatic/1.0.1/ - - - 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/ - - - lsp4e - p2 - https://download.eclipse.org/lsp4e/releases/0.16.0/ - - - - org.springframework.boot.ide.product.e415 - - - e416 @@ -324,9 +231,112 @@ https://download.eclipse.org/releases/2020-09/ - 2020-09-staging + orbit p2 - https://download.eclipse.org/staging/2020-09/ + https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository + + + m2e + p2 + https://download.eclipse.org/technology/m2e/snapshots/1.16.2/latest/ + + + + latest-m2e-wtp + p2 + https://download.eclipse.org/m2e-wtp/milestones/1.4/1.4.4.20200220-1005/ + + + 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://dl.bintray.com/sidespin/repo/m2e-chromatic/1.0.1/ + + + 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/ + + + lsp4e + p2 + https://download.eclipse.org/lsp4e/snapshots/ + + + + + org.springframework.boot.ide.product.e417 + + + + + e418 + + e4.18.0 + e4.18 + 2020-12 + 2020-12 (4.18) + 2020-12 + 4.18 + e418 + + + + 2020-12 + p2 + https://download.eclipse.org/releases/2020-12/ + + + 2020-12-staging + p2 + https://download.eclipse.org/staging/2020-12/ orbit @@ -398,16 +408,16 @@ p2 https://download.eclipse.org/mylyn/docs/releases/3.0/ - lsp4e p2 - https://download.eclipse.org/lsp4e/releases/latest/ + https://download.eclipse.org/lsp4e/snapshots/ + org.springframework.boot.ide.product.e417 diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 30a530bc3..f584ff060 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -118,51 +118,6 @@ - - e415 - - e4.15.0 - e4.15 - 2020-033 - 2020-03 (4.15) - 2020-03 - 4.15 - e415 - - - - 2020-03 - p2 - https://download.eclipse.org/releases/2020-03/ - - - orbit - p2 - https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository - - - e-i-commons - p2 - ${springide-p2-repo} - - - mylyn-markdown - p2 - https://download.eclipse.org/mylyn/docs/releases/3.0/ - - - lsp4e - p2 - https://download.eclipse.org/lsp4e/releases/0.16.0/ - - - tm4e - p2 - https://download.eclipse.org/tm4e/snapshots/ - - - - e416 @@ -226,9 +181,59 @@ https://download.eclipse.org/releases/2020-09/ - 2020-09-staging + orbit p2 - https://download.eclipse.org/staging/2020-09/ + https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository + + + e-i-commons + p2 + ${springide-p2-repo} + + + mylyn-markdown + p2 + https://download.eclipse.org/mylyn/docs/releases/3.0/ + + + + lsp4e + p2 + https://download.eclipse.org/lsp4e/releases/latest/ + + + tm4e + p2 + https://download.eclipse.org/tm4e/snapshots/ + + + + + + e418 + + e4.18.0 + e4.18 + 2020-12 + 2020-12 (4.18) + 2020-12 + 4.18 + e418 + + + + 2020-12 + p2 + https://download.eclipse.org/releases/2020-12/ + + + 2020-12-staging + p2 + https://download.eclipse.org/staging/2020-12/ orbit