Switch over to R3.33 builds, newer CBI plug-ins and Platform

Change-Id: Ic5ddc212ec1bed7fa14fd86fb6827f7addb11294
diff --git a/pom.xml b/pom.xml
index 39e44b1..828ac72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>org.eclipse.wtp</groupId>
   <artifactId>wtp-aggregator</artifactId>
-  <version>3.32.0-SNAPSHOT</version>
+  <version>3.33.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
 
diff --git a/publish/pom.xml b/publish/pom.xml
index e89d80c..5abbaca 100644
--- a/publish/pom.xml
+++ b/publish/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.wtp</groupId>
     <artifactId>wtp-aggregator</artifactId>
-    <version>3.32.0-SNAPSHOT</version>
+    <version>3.33.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.webtools</groupId>
diff --git a/webtools.repositories/pom.xml b/webtools.repositories/pom.xml
index 2c7e37b..a57e47d 100644
--- a/webtools.repositories/pom.xml
+++ b/webtools.repositories/pom.xml
@@ -24,7 +24,7 @@
 

   <groupId>org.eclipse.webtools</groupId>

   <artifactId>repositories</artifactId>

-  <version>3.32.0-SNAPSHOT</version>

+  <version>3.33.0-SNAPSHOT</version>

   <packaging>pom</packaging>

 

   <modules>

diff --git a/webtools.repositories/repository/pom.xml b/webtools.repositories/repository/pom.xml
index 878b4b9..8b3227f 100644
--- a/webtools.repositories/repository/pom.xml
+++ b/webtools.repositories/repository/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.webtools</groupId>
 		<artifactId>repositories</artifactId>
-		<version>3.32.0-SNAPSHOT</version>
+		<version>3.33.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.webtools</groupId>
 	<artifactId>repository</artifactId>
diff --git a/webtools.repositories/repositoryunittests/pom.xml b/webtools.repositories/repositoryunittests/pom.xml
index be1d6d2..8001723 100644
--- a/webtools.repositories/repositoryunittests/pom.xml
+++ b/webtools.repositories/repositoryunittests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.webtools</groupId>
 		<artifactId>repositories</artifactId>
-		<version>3.32.0-SNAPSHOT</version>
+		<version>3.33.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.webtools</groupId>
 	<artifactId>repositoryunittests</artifactId>
diff --git a/wtp-parent/pom.xml b/wtp-parent/pom.xml
index aad3197..577ba11 100644
--- a/wtp-parent/pom.xml
+++ b/wtp-parent/pom.xml
@@ -28,7 +28,7 @@
     <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url>

     <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>

 

-    <cbi-plugins.version>1.3.2</cbi-plugins.version>

+    <cbi-plugins.version>1.4.3</cbi-plugins.version>

     <cbi-repo.url>https://repo.eclipse.org/content/repositories/cbi/</cbi-repo.url>

     <!-- switch to use  ${cbi-repo.url}

     <cbi-snapshot-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshot-repo.url>

@@ -46,7 +46,7 @@
 

     <!-- this folder is a composite of the last 2 builds; you might want to override to build against a single specific subfolder -->

     <!-- <platform-repo.url>https://download.eclipse.org/eclipse/updates/I-builds/</platform-repo.url> -->

-    <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.30-I-builds/</platform-repo.url>

+    <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.31-I-builds/</platform-repo.url>

 

     <!-- NOTE: sometimes an S build is newer than its closest I build so it's worth checking this from time to time -->

     <!-- "latest" I-build -->

@@ -59,7 +59,7 @@
     <simrel-maven.url>https://download.eclipse.org/oomph/simrel-maven/nightly/latest/</simrel-maven.url>

 

     <!-- match https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target -->

-    <jetty-repo.url>https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.3/</jetty-repo.url>

+    <jetty-repo.url>https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest/</jetty-repo.url>

     <graphiti-repo.url>https://download.eclipse.org/graphiti/updates/0.19.1/</graphiti-repo.url>

     <!-- Old, before Ed Merks: <dtp-repo.url>https://download.eclipse.org/datatools/updates/1.14.300-SNAPSHOT/repository/</dtp-repo.url> -->

     <dtp-repo.url>https://download.eclipse.org/datatools/updates/nightly/latest</dtp-repo.url>