From bdd6ee179e64103e9f85bbe5a7d67ad5b857259e Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Mon, 28 Nov 2022 10:17:06 -0500
Subject: [PATCH] releng: Make Trace Compass RCP use Java 17 by default

- Update default tracing.product for Java 17
- Save current tracing.product file in directory legacy-e4.23-e4.25 for
legacy builds later/equal than e4.23 but before e4.26
- Remove staging/tracing.product
- Remove Solaris entry in product files

Change-Id: Ib57698df51e27688201d14a5e0cec1457548549d
Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/197339
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
---
 .../{staging => legacy-e4.23-e4.25}/tracing.product | 13 ++++++-------
 .../legacy/tracing.product                          |  1 -
 .../tracing.product                                 | 13 ++++++-------
 3 files changed, 12 insertions(+), 15 deletions(-)
 rename rcp/org.eclipse.tracecompass.rcp.product/{staging => legacy-e4.23-e4.25}/tracing.product (97%)

diff --git a/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product
similarity index 97%
rename from rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product
rename to rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product
index cc9e063c9a..16a01b73ca 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/staging/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product
@@ -26,11 +26,11 @@ SPDX-License-Identifier: EPL-2.0
       </programArgs>
       <programArgsLin>--launcher.GTK_version 3
       </programArgsLin>
-      <vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
+      <vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
       </vmArgsLin>
-      <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=17 -Dorg.eclipse.swt.internal.carbon.smallFonts
+      <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=11 -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
+      <vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
       </vmArgsWin>
    </launcherArgs>
 
@@ -48,10 +48,9 @@ SPDX-License-Identifier: EPL-2.0
    </launcher>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
    </vm>
 
    <license>
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product
index 953b3c292b..372267fc74 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product
@@ -50,7 +50,6 @@ SPDX-License-Identifier: EPL-2.0
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
-      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
    </vm>
 
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
index 94a8d42280..567c125339 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -26,11 +26,11 @@ SPDX-License-Identifier: EPL-2.0
       </programArgs>
       <programArgsLin>--launcher.GTK_version 3
       </programArgsLin>
-      <vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
+      <vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
       </vmArgsLin>
-      <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=11 -Dorg.eclipse.swt.internal.carbon.smallFonts
+      <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=17 -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
+      <vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
       </vmArgsWin>
    </launcherArgs>
 
@@ -48,10 +48,9 @@ SPDX-License-Identifier: EPL-2.0
    </launcher>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
-      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
    </vm>
 
    <license>