gradle-and-eclipse-rcp-diff

diff --git a/com.diffplug.rcpdemo/rcpdemo.product b/com.diffplug.rcpdemo/rcpdemo.product
index d04163a..6403dd2 100644
--- a/com.diffplug.rcpdemo/rcpdemo.product
+++ b/com.diffplug.rcpdemo/rcpdemo.product
@@ -39,55 +39,40 @@
       <plugin id="com.diffplug.rcpdemo"/>
       <plugin id="com.diffplug.talks.rxjava_and_swt"/>
       <plugin id="com.google.guava"/>
-      <plugin id="io.reactivex.rxjava"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.servlet"/>
-      <plugin id="javax.xml"/>
+      <plugin id="io.reactivex.rxjava"/>
+      <plugin id="org.apache.felix.scr"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.bidi"/>
       <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.ds"/>
+      <plugin id="org.eclipse.equinox.event"/>
       <plugin id="org.eclipse.equinox.launcher"/>
       <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.aix.ppc" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.aix.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.solaris.sparc" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.solaris.x86" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
       <plugin id="org.eclipse.swt"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.aix.ppc" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.aix.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.hpux.ia64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc64le" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.s390" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.s390x" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.solaris.sparc" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.solaris.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+      <plubin id="org.eclipse.ui" />
    </plugins>
 
 
diff --git a/gradle.properties b/gradle.properties
index ac24286..476debe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,19 +7,16 @@ org=diffplug
 
 # Build requirements
 VER_JAVA=1.8
-VER_GOOMPH=3.8.0
+VER_GOOMPH=3.13.0
 VER_BND_PLATFORM=1.5.0
 VER_SPOTLESS=3.5.1
 
 # The version of PDE (and eclipse platform plugins)
-GOOMPH_PDE_VER=4.5.2
+GOOMPH_PDE_VER=4.7.2
 # Uncomment these to use a non-official release (e.g. nightly)
 #GOOMPH_PDE_UDPATE_SITE=
 #GOOMPH_PDE_ID=
 
-# Testing
-VER_JUNIT=4.12
-
 # Compile
 VER_DURIAN=1.2.0
 VER_DURIAN_RX=2.0.0
diff --git a/target.p2/build.gradle b/target.p2/build.gradle
index 9872cbc..a085abe 100644
--- a/target.p2/build.gradle
+++ b/target.p2/build.gradle
@@ -4,7 +4,9 @@ import com.diffplug.gradle.pde.EclipseRelease
 apply plugin: 'com.diffplug.gradle.p2.asmaven'
 p2AsMaven {
 	group 'eclipse-deps', {
-		repoEclipse '4.5.2'
+		repoEclipse '4.7.2'
+		feature 'org.eclipse.rcp'
+		feature 'org.eclipse.e4.rcp'
 		feature 'org.eclipse.equinox.executable'
 		feature 'org.eclipse.rcp.configuration'
 		feature 'org.eclipse.platform'