From c38cfd052f3f2883b835de220392ffae55d4654f Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 30 Jul 2018 12:48:07 +0200 Subject: [PATCH] added target for eclipse 4.9 builds --- .../common/html/nightly-distributions.html | 16 +- .../org.springframework.boot.ide.product | 109 +++++++ .../p2.inf | 23 ++ .../pom.xml | 285 ++++++++++++++++++ .../spring-tool-suite-4-dmg-config-e4.8.json | 10 + .../category.xml | 206 +++++++++++++ .../pom.xml | 153 ++++++++++ eclipse-distribution/pom.xml | 84 ++++++ 8 files changed, 875 insertions(+), 11 deletions(-) create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e49/p2.inf create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e49/spring-tool-suite-4-dmg-config-e4.8.json create mode 100644 eclipse-distribution/org.springframework.boot.ide.repository.e49/category.xml create mode 100644 eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html index 9a145dc4f..3855e7c18 100644 --- a/eclipse-distribution/common/html/nightly-distributions.html +++ b/eclipse-distribution/common/html/nightly-distributions.html @@ -23,7 +23,8 @@

STS4 Distribution:

@@ -48,10 +49,10 @@

Eclipse-based Distribution Builds

-

Spring Tool Suite 4 - based on Eclipse Photon Milestone Builds (4.8.0 Mx)

-
+

Spring Tool Suite 4 - based on Eclipse 2018-09 Milestone Builds (4.9.0) - and beyond

+

Spring Tools 4 - Visual Studio Code Extensions

@@ -68,13 +69,6 @@ $('#atom').load('atom-packages/atom-packages-snippet.html'); -

No longer updated...

-

Spring Tool Suite 4 - based on Eclipse Oxygen.2 (4.7.2)

-
- - diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product new file mode 100644 index 000000000..867949d75 --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product @@ -0,0 +1,109 @@ + + + + + + + + + -product org.springframework.boot.ide.branding.sts4 +--launcher.defaultAction +openFile + -Dosgi.requiredJavaVersion=1.8 +--add-modules=ALL-SYSTEM +-Xms40m + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns + -Xmx1200m + + + -Xmx1200m + + + -Xmx1200m + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e49/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e49/p2.inf new file mode 100644 index 000000000..0800c2a57 --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/p2.inf @@ -0,0 +1,23 @@ +instructions.configure=\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.9,name:Spring Tool Suite 4);\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.9,name:Spring Tool Suite 4);\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#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:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse); + +instructions.unconfigure=\ + org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09);\ + org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09);\ + org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.9);\ + org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.9);\ + 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); + + # 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.e49/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml new file mode 100644 index 000000000..d1effaa8e --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml @@ -0,0 +1,285 @@ + + + 4.0.0 + + + org.springframework.boot.ide + org.springframework.boot.ide + 4.0.0-SNAPSHOT + ../pom.xml + + + org.springframework.boot.ide.product + + eclipse-repository + + + ${accessKey} + ${secretKey} + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + 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.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + + osx-app-signing + package + + ${skip.osx.signing} + + + + + + + + + + + + + + + + + run + + + + + osx-dmg-creation + verify + + + + + + + + + + + + + + run + + + + + osx-dmg-signing + verify + + ${skip.osx.signing} + + + + + + + + + + + + + + + + + + + run + + + + + upload-product-bundles + deploy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + update-nightly-downloads + deploy + + ${skip.update-nightly-download-page} + + + + + + + + + + + + + + + + + + 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.e49/spring-tool-suite-4-dmg-config-e4.8.json b/eclipse-distribution/org.springframework.boot.ide.product.e49/spring-tool-suite-4-dmg-config-e4.8.json new file mode 100644 index 000000000..c86b0023f --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/spring-tool-suite-4-dmg-config-e4.8.json @@ -0,0 +1,10 @@ +{ + "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.repository.e49/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e49/category.xml new file mode 100644 index 000000000..b145883a2 --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.repository.e49/category.xml @@ -0,0 +1,206 @@ + + + + Spring Tool Suite 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml new file mode 100644 index 000000000..5bf988898 --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml @@ -0,0 +1,153 @@ + + + 4.0.0 + + + org.springframework.boot.ide + org.springframework.boot.ide + 4.0.0-SNAPSHOT + ../pom.xml + + + org.springframework.boot.ide.repository + + eclipse-repository + + + ${accessKey} + ${secretKey} + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + none + + + + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + none + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + + 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/pom.xml b/eclipse-distribution/pom.xml index 7cb661a53..962210bc8 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -294,6 +294,90 @@ + + e49 + + e4.9.0 + e4.9 + 2018-09 + 2018-09 (4.9.0) + 2018-09 + 4.9 + e49 + + + + photon + p2 + http://download.eclipse.org/releases/2018-09/ + + + staging + p2 + http://download.eclipse.org/staging/2018-09/ + + + orbit + p2 + http://download.eclipse.org/tools/orbit/downloads/drops/S20180710163057/repository + + + latest-m2e + p2 + http://download.eclipse.org/technology/m2e/releases/1.8 + + + maven-extras-mirror + p2 + http://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/ + + + maven-egit + p2 + http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST + + + maven-wro4j + p2 + http://download.jboss.org/jbosstools/updates/m2e-wro4j/ + + + maven-devtools + p2 + http://dist.springsource.com/release/TOOLS/mavendevtools/ + + + maven-dependency-support + p2 + http://ianbrandt.github.io/m2e-maven-dependency-plugin/ + + + ansi-console + p2 + http://www.mihai-nita.net/eclipse + + + xtext-base + p2 + http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/ + + + lsp4e + p2 + http://download.eclipse.org/lsp4e/snapshots/ + + + + + org.springframework.boot.ide.product.e49 + org.springframework.boot.ide.repository.e49 + + + build.springsource.com