From d1d6bd9d26a950e31fdcc979eb2ae32edfcce900 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Sat, 20 Apr 2019 12:25:28 +0200
Subject: [PATCH] added missing e4.12 product definition

---
 .../category.xml                              | 211 ++++++++++
 .../org.springframework.boot.ide.product      | 120 ++++++
 .../p2.inf                                    |  30 ++
 .../pom.xml                                   | 388 ++++++++++++++++++
 .../spring-tool-suite-4-dmg-config-e4.12.json |  10 +
 5 files changed, 759 insertions(+)
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e412/p2.inf
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e412/spring-tool-suite-4-dmg-config-e4.12.json

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
new file mode 100644
index 000000000..5373cae79
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site pack200="true">
+	<description url="https://spring.io/tools">
+		Spring Tool Suite 4
+	</description>
+
+	<!-- Eclipse Integration Commons -->
+	<category-def name="Uncategorized" label="Uncategorized"/>
+	<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
+	<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
+
+	<feature
+		id="org.springsource.ide.eclipse.commons.quicksearch.feature"
+		version="0.0.0">
+		<category name="Core / Eclipse Integration Commons" />
+	</feature>
+	
+	<!-- STS4 branding and custom features -->
+	<category-def name="Spring Tool Suite 4 Distribution" label="Spring Tool Suite 4 Distribution" />
+
+	<feature
+		id="org.springframework.boot.ide.main.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Distribution" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.branding.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Distribution" />
+	</feature>
+
+	<!-- Spring IDE -->
+	<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
+	<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
+	<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
+	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
+	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature>
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature>
+
+	<!-- Language Server -->
+	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.jdt.ls.commons">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.core">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.ui">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.livexp">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+<!--
+	<bundle id="io.projectreactor.reactor-core">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.reactivestreams.reactive-streams">
+		<category name="Uncategorized"/>
+	</bundle>
+-->
+	<bundle id="javax.activation" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+	<bundle id="javax.activation.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="javax.xml.bind" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+	<bundle id="javax.xml.bind.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="javax.xml.stream" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.dadacoalition.yedit">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.yaml.snakeyaml">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<feature id="tm-feature">
+		<category name="Uncategorized"/>
+	</feature>
+
+	<bundle id="org.eclipse.lsp4e">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.lsp4j">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.lsp4j.jsonrpc">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.xtext.xbase.lib">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="com.google.gson">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.jcodings">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.joni">
+		<category name="Uncategorized"/>
+	</bundle>
+
+    <bundle id="org.bouncycastle.bcpg" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="org.bouncycastle.bcpg.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="org.bouncycastle.bcpkix" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="org.bouncycastle.bcpkix.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="org.bouncycastle.bcprov" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="org.bouncycastle.bcprov.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.hierynomus.sshj" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.hierynomus.sshj.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.jcraft.jzlib" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.jcraft.jzlib.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="net.i2p.crypto.eddsa" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="net.i2p.crypto.eddsa.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+</site>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
new file mode 100644
index 000000000..ad80282d3
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
@@ -0,0 +1,120 @@
+<?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.2.2.qualifier" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-product org.springframework.boot.ide.branding.sts4
+--launcher.defaultAction openFile
+</programArgs>
+      <vmArgs>-Dosgi.requiredJavaVersion=1.8
+-Xms256m
+-Xmx1024m
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
+--add-modules=ALL-SYSTEM
+      </vmArgs>
+      <vmArgsLin>
+      </vmArgsLin>
+      <vmArgsMac>-XstartOnFirstThread
+-Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns
+      </vmArgsMac>
+      <vmArgsWin>
+      </vmArgsWin>
+   </launcherArgs>
+
+   <windowImages i16="/org.springframework.boot.ide.branding/sts4-16.png" i32="/org.springframework.boot.ide.branding/sts4-32.png" i48="/orgorg.springframework.boot.ide.branding/sts4-48.png" i64="/org.springframework.boot.ide.branding/sts4-64.png" i128="/org.springframework.boot.ide.branding/sts4-128.png"/>
+
+   <splash
+      location="org.springframework.boot.ide.branding"
+      startupProgressRect="0,225,455,15"
+      startupMessageRect="7,220,441,20"
+      startupForegroundColor="c1d72e" />
+
+   <launcher name="SpringToolSuite4">
+      <macosx icon="../org.springframework.boot.ide.branding/sts4.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="../org.springframework.boot.ide.branding/sts4.ico"/>
+         <bmp/>
+      </win>
+      <linux icon="../org.springframework.boot.ide.branding/sts4.xpm"/>
+   </launcher>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.platform"/>
+      <feature id="org.eclipse.pde" installMode="root"/>
+
+      <feature id="org.eclipse.buildship" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
+      <feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
+
+      <feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
+      <feature id="org.eclipse.help" installMode="root"/>
+
+      <feature id="org.eclipse.jdt" installMode="root"/>
+      <feature id="org.eclipse.jgit" installMode="root"/>
+      <feature id="org.eclipse.jgit.lfs" installMode="root"/>
+
+      <feature id="org.eclipse.m2e.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"/>
+      <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/>
+
+      <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.json_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.jsdt.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.jsdt.chromium.debug.feature" installMode="root"/>
+
+      <feature id="org.eclipse.jst.server_adapters.ext.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.server_adapters.feature" installMode="root"/>
+
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.epp.mpc" installMode="root"/>
+
+      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/>
+      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/>
+      <feature id="org.sonatype.m2e.egit.feature" installMode="root"/>
+      <feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/>
+      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/>
+      <feature id="m2e.chromatic.feature" installMode="root"/>
+
+      <feature id="net.mihai-nita.ansicon" installMode="root"/>
+
+      <feature id="org.springsource.ide.eclipse.commons.quicksearch.feature" installMode="root"/>
+      <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
+
+      <feature id="org.springframework.boot.ide.branding.feature"/>
+      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
+   </features>
+
+   <configurations>
+   	  <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}"/>
+   	  <property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
+
+   	  <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   	  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+   	  <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+   	  <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+   	  <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+   	  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+   	  <plugin id="org.eclipse.update.configurator" autoStart="false" startLevel="4" />
+   </configurations>
+
+</product>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e412/p2.inf
new file mode 100644
index 000000000..0e4c36737
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/p2.inf
@@ -0,0 +1,30 @@
+instructions.configure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+ 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-06);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06);\
+ 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-06);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.eclipse.org/releases/2019-06);\
+ 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.e412/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml
new file mode 100644
index 000000000..e8a196d82
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.2.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>org.springframework.boot.ide.product</artifactId>
+
+	<packaging>eclipse-repository</packaging>
+
+	<properties>
+		<dist.accessKey>${accessKey}</dist.accessKey>
+		<dist.secretKey>${secretKey}</dist.secretKey>
+	</properties>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.5.2</version>
+				<executions>
+					<execution>
+						<id>default-install</id>
+						<phase>none</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includeAllDependencies>false</includeAllDependencies>
+				</configuration>
+			</plugin>
+			  
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-publisher-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<publishArtifacts>true</publishArtifacts>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<executionEnvironment>JavaSE-9</executionEnvironment>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+						<phase>package</phase>
+					</execution>
+					<execution>
+						<id>archive-products</id>
+						<goals>
+							<goal>archive-products</goal>
+						</goals>
+						<phase>verify</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<products>
+						<product>
+							<id>org.springframework.boot.ide.branding.sts4</id>
+							<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
+							<rootFolders>
+								<macosx>SpringToolSuite4.app</macosx>
+							</rootFolders>
+							<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
+						</product>
+					</products>
+					<formats>
+						<linux>tar.gz</linux>
+						<macosx>tar.gz</macosx>
+					</formats>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.6.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+					        <executable>java</executable>
+							<arguments>
+								<argument>-jar</argument>
+								<argument>${project.build.directory}/../../common/eclipse-distribution-license-file-generator.jar</argument>
+								<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/plugins/</argument>
+								<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt</argument>
+								<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/</argument>
+								<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt</argument>
+								<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/</argument>
+								<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+
+					<execution>
+						<id>osx-app-signing</id>
+						<phase>package</phase>
+						<configuration>
+							<skip>${skip.osx.signing}</skip>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+								<exec executable="codesign" failonerror="true">
+									<arg value="--verbose"/>
+								    <arg value="--keychain"/>
+								    <arg value="${env.KEYCHAIN}"/>
+								    <arg value="-s"/>
+								    <arg value="Developer ID Application: Trevor Marshall"/>
+								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
+								</exec>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>osx-dmg-creation</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+
+								<exec executable="/usr/local/bin/appdmg" failonerror="true">
+									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}.json"/>
+									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
+								</exec>
+
+								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
+								
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>osx-dmg-signing</id>
+						<phase>verify</phase>
+						<configuration>
+							<skip>${skip.osx.signing}</skip>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
+
+								<exec executable="codesign" failonerror="true">
+									<arg value="--verbose"/>
+								    <arg value="--keychain"/>
+								    <arg value="${env.KEYCHAIN}"/>
+								    <arg value="-s"/>
+								    <arg value="Developer ID Application: Trevor Marshall"/>
+								    <arg value="${dmgName}"/>
+								</exec>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-product-bundles</id>
+						<phase>deploy</phase>
+						<configuration>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
+
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+
+									<delete bucketName="${dist.bucket}">
+										<fileset dir="${dist.path.product}">
+											<include name="spring-tool-suite-4*.zip" />
+											<include name="spring-tool-suite-4*.zip.md5" />
+											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz" />
+											<include name="spring-tool-suite-4*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.dmg" />
+											<include name="spring-tool-suite-4*.dmg.md5" />
+											<include name="spring-tool-suite-4*.dmg.sha1" />
+										</fileset>
+									</delete>
+
+									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
+										publicRead="true">
+										<fileset dir="${project.build.directory}/products">
+											<include name="spring-tool-suite-4*.zip" />
+											<include name="spring-tool-suite-4*.zip.md5" />
+											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz" />
+											<include name="spring-tool-suite-4*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.dmg" />
+											<include name="spring-tool-suite-4*.dmg.md5" />
+											<include name="spring-tool-suite-4*.dmg.sha1" />
+										</fileset>
+									</upload>
+
+								</s3>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>update-nightly-downloads</id>
+						<phase>deploy</phase>
+						<configuration>
+							<skip>${skip.update-nightly-download-page}</skip>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"/>
+		
+								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
+								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
+								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
+
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
+										toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
+									</upload>
+								</s3>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>zip-sts-repository</id>
+						<phase>install</phase>
+						<configuration>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
+								<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
+
+								<zip zipfile="${project.build.directory}/repository/${dist.file.name}" filesonly="true">
+									<zipfileset
+										dir="${project.build.directory}/repository">
+										<exclude name="*.zip" />
+										<exclude name="**/*.gz" />
+									</zipfileset>
+								</zip>
+
+								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-sts-repository</id>
+						<phase>deploy</phase>
+						<configuration>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+
+									<delete bucketName="${dist.bucket}">
+										<fileset dir="${dist.path.repo}">
+											<include name="p2.index" />
+											<include name="site.xml" />
+											<include name="content.jar" />
+											<include name="artifacts.xml.xz" />
+											<include name="content.jar" />
+											<include name="content.xml.xz" />
+											<include name="plugins/**" />
+											<include name="features/**" />
+											<include name="binary/**" />
+											<include name="*.zip" />
+											<include name="*.sha1" />
+											<include name="*.md5" />
+										</fileset>
+									</delete>
+
+									<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
+										<fileset
+											dir="${project.build.directory}/repository">
+											<include name="**/*" />
+											<include name="**" />
+										</fileset>
+									</upload>
+
+								</s3>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework.build</groupId>
+						<artifactId>org.springframework.build.aws.ant</artifactId>
+						<version>3.1.0.RELEASE</version>
+					</dependency>
+					<dependency>
+						<groupId>net.java.dev.jets3t</groupId>
+						<artifactId>jets3t</artifactId>
+						<version>0.8.1</version>
+					</dependency>
+					<dependency>
+						<groupId>ant-contrib</groupId>
+						<artifactId>ant-contrib</artifactId>
+						<version>20020829</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+		</plugins>
+
+	</build>
+</project>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/spring-tool-suite-4-dmg-config-e4.12.json b/eclipse-distribution/org.springframework.boot.ide.product.e412/spring-tool-suite-4-dmg-config-e4.12.json
new file mode 100644
index 000000000..c86b0023f
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/spring-tool-suite-4-dmg-config-e4.12.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"
+}