From 48a2639cd2331736918da5edd53921e871e45991 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber <mober.at+eclipse@gmail.com>
Date: Mon, 12 Jun 2017 22:46:04 +0200
Subject: [PATCH] Bug 516330 - Releng: Restore Tycho-0.22 for Building with
 Java 7

- Make Mars the defaut target to build against to support Java 7
  along with cdt native serial for a full build
- Cleanup: Fix indentation
- Add Oxygen Profile

Change-Id: I21b1e9b0fb905c8c50889e9697f4d11231685945
Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>
---
 admin/pom-config.xml | 95 +++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index a0c4383d5e9..2790374c6f0 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -37,8 +37,10 @@
     
     <properties>
         <!-- Define version id's to be used in the plugins section -->
-        <tycho-version>1.0.0</tycho-version>
-        <tycho-extras-version>1.0.0</tycho-extras-version>
+        <!-- We stick to tycho-0.22 since it supports Java 7 for building -->
+        <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
+        <tycho-version>0.22.0</tycho-version>
+        <tycho-extras-version>0.22.0</tycho-extras-version>
         <maven-resources-version>2.7</maven-resources-version>
         <maven-antrun-version>1.8</maven-antrun-version>
         <gmaven-version>1.5</gmaven-version>
@@ -57,14 +59,16 @@
         <terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
         <sdk-version>4.7</sdk-version>
         
-        <!-- Set up the default target platform to build against -->
+        <!-- Set up Mars as the default target platform to build against, -->
+        <!-- Because it supports Java 7, but also already has the cdt.native.serial plugin. -->
+        <!-- Also, PTP o.e.remote-2.0 from Mars is the oldes remote version that we can support. -->
         <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
-        <platform-site>http://download.eclipse.org/eclipse/updates/4.7milestones</platform-site>
-        <platform-release-site>http://download.eclipse.org/staging/oxygen</platform-release-site>
-        <orbit-site>http://download.eclipse.org/tools/orbit/S-builds/S20170505151127/repository</orbit-site>
-        <cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
-        <rse-site>http://download.eclipse.org/tm/updates/4.3milestones</rse-site>
-        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
+        <platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
+        <platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
+        <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
+        <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
+        <rse-site>http://download.eclipse.org/tm/updates/4.0</rse-site>
+        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones</remote-site>
         <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
         <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
       </properties>
@@ -128,82 +132,99 @@
                 <enabled>true</enabled>
             </releases>
         </pluginRepository>
-        <pluginRepository>                                                                                         
-            <id>cbi</id>                                                                                         
-            <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>                                             
+        <pluginRepository>
+            <id>cbi</id>
+            <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>cbi-snapshots</id>
+            <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
         </pluginRepository>
-		<pluginRepository>
-			<id>cbi-snapshots</id>
-			<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
-		</pluginRepository>
     </pluginRepositories>
 
     <profiles>
         <profile>
-            <!-- Eclipse 3.8.x (Juno) -->
+            <!-- Eclipse 3.8.2 (Juno), CDT 8.4.0 (Luna SR0) -->
             <id>juno</id>
             
             <properties>
                 <terminal-stream>juno</terminal-stream>
                 <sdk-version>3.8</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/${terminal-stream}</platform-release-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-site>
+                <platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site>
+                <platform-release-site>http://download.eclipse.org/releases/juno</platform-release-site>
+                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-site>
                 <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
             </properties>
         </profile>
         <profile>
-            <!-- Eclipse 4.3.x (Kepler) -->
+            <!-- Eclipse 4.3.2 (Kepler SR2), CDT 8.4.0 (Luna SR0) -->
             <id>kepler</id>
             
             <properties>
                 <terminal-stream>kepler</terminal-stream>
                 <sdk-version>4.3</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/${terminal-stream}</platform-release-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</orbit-site>
+                <platform-site>http://download.eclipse.org/eclipse/updates/4.3</platform-site>
+                <platform-release-site>http://download.eclipse.org/releases/kepler</platform-release-site>
+                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</orbit-site>
                 <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
             </properties>
         </profile>
         <profile>
-            <!-- Eclipse 4.4.x (Luna) -->
+            <!-- Eclipse 4.4.2 (Luna SR2), CDT 8.6.0 (Luna SR2) -->
             <id>luna</id>
             
             <properties>
                 <terminal-stream>luna</terminal-stream>
                 <sdk-version>4.4</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/${terminal-stream}</platform-release-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.5</cdt-site>
+                <platform-site>http://download.eclipse.org/eclipse/updates/4.4</platform-site>
+                <platform-release-site>http://download.eclipse.org/releases/luna</platform-release-site>
+                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
+                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
             </properties>
         </profile>
         <profile>
-            <!-- Eclipse 4.5.x (Mars) -->
+            <!-- Eclipse 4.5.2 (Mars.2), CDT 8.8.1 (Mars.2) -->
             <id>mars</id>
             
             <properties>
                 <terminal-stream>mars</terminal-stream>
                 <sdk-version>4.5</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/${terminal-stream}</platform-release-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/</orbit-site>
+                <platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
+                <platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
+                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository</orbit-site>
                 <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
             </properties>
         </profile>
         <profile>
-            <!-- Eclipse 4.6.x (Neon) -->
+            <!-- Eclipse 4.6.3 (Neon.3), CDT 9.2.1 (Neon.3) -->
             <id>neon</id>
             
             <properties>
                 <terminal-stream>neon</terminal-stream>
                 <sdk-version>4.6</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/${terminal-stream}</platform-release-site>
-				<orbit-site>http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository</orbit-site>
+                <platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
+                <platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
+                <orbit-site>http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository</orbit-site>
+                <rse-site>http://download.eclipse.org/tm/updates/4.2</rse-site>
+                <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones</remote-site>
                 <cdt-site>http://download.eclipse.org/tools/cdt/releases/9.2</cdt-site>
             </properties>
         </profile>
+        <profile>
+            <!-- Eclipse 4.7 (Oxygen), CDT 9.3 -->
+            <id>oxygen</id>
+            
+            <properties>
+                <terminal-stream>oxygen</terminal-stream>
+                <sdk-version>4.7</sdk-version>
+                <platform-site>http://download.eclipse.org/eclipse/updates/4.7</platform-site>
+                <platform-release-site>http://download.eclipse.org/releases/oxygen</platform-release-site>
+                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
+                <rse-site>http://download.eclipse.org/tm/updates/4.3milestones</rse-site>
+                <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
+                <cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
+            </properties>
+        </profile>
 	</profiles>
     
     <build>