From 6896270447853c52f30f9edfd65866bc87c36ead Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 28 Aug 2020 08:19:14 +0200
Subject: [PATCH] Argeo Studio now requires Java 11.

---
 ide/features/org.argeo.slc.studio/feature.xml   |  8 +++++++-
 .../org.argeo.slc.ide.osgi.ui/.classpath        |  2 +-
 .../META-INF/MANIFEST.MF                        |  2 +-
 ide/plugins/org.argeo.slc.studio.ui/.classpath  |  2 +-
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../org.argeo.slc.studio.product                | 17 ++++++++++-------
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ide/features/org.argeo.slc.studio/feature.xml b/ide/features/org.argeo.slc.studio/feature.xml
index 778e9c449..06c3bdd03 100644
--- a/ide/features/org.argeo.slc.studio/feature.xml
+++ b/ide/features/org.argeo.slc.studio/feature.xml
@@ -4,7 +4,7 @@
       label="Argeo IDE"
       version="2.1.0.qualifier"
       provider-name="Argeo GmbH"
-      plugin="org.argeo.slc.studio.branding"
+      plugin="org.argeo.slc.studio.ui"
       image="icons/argeo-icon-100104-256.png">
 
    <description url="http://projects.argeo.org/slc/">
@@ -61,4 +61,10 @@ and limitations under the License.
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.junit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/ide/plugins/org.argeo.slc.ide.osgi.ui/.classpath b/ide/plugins/org.argeo.slc.ide.osgi.ui/.classpath
index 01836c484..c3ba59e4c 100644
--- a/ide/plugins/org.argeo.slc.ide.osgi.ui/.classpath
+++ b/ide/plugins/org.argeo.slc.ide.osgi.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ide/plugins/org.argeo.slc.ide.osgi.ui/META-INF/MANIFEST.MF b/ide/plugins/org.argeo.slc.ide.osgi.ui/META-INF/MANIFEST.MF
index ddd6a9836..e4851fff1 100644
--- a/ide/plugins/org.argeo.slc.ide.osgi.ui/META-INF/MANIFEST.MF
+++ b/ide/plugins/org.argeo.slc.ide.osgi.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE UI
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.argeo.slc.ide.osgi.ui;singleton:=true
 Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/ide/plugins/org.argeo.slc.studio.ui/.classpath b/ide/plugins/org.argeo.slc.studio.ui/.classpath
index 01836c484..c3ba59e4c 100644
--- a/ide/plugins/org.argeo.slc.studio.ui/.classpath
+++ b/ide/plugins/org.argeo.slc.studio.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ide/plugins/org.argeo.slc.studio.ui/META-INF/MANIFEST.MF b/ide/plugins/org.argeo.slc.studio.ui/META-INF/MANIFEST.MF
index 4cc7e06c6..661a3f479 100644
--- a/ide/plugins/org.argeo.slc.studio.ui/META-INF/MANIFEST.MF
+++ b/ide/plugins/org.argeo.slc.studio.ui/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.ui,
  org.eclipse.ui.console,
  org.eclipse.ui.navigator.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.argeo.slc.studio.ui
 Export-Package: org.argeo.slc.studio.ui
diff --git a/ide/plugins/org.argeo.slc.studio.ui/org.argeo.slc.studio.product b/ide/plugins/org.argeo.slc.studio.ui/org.argeo.slc.studio.product
index 82fe34d0a..b1937c68a 100644
--- a/ide/plugins/org.argeo.slc.studio.ui/org.argeo.slc.studio.product
+++ b/ide/plugins/org.argeo.slc.studio.ui/org.argeo.slc.studio.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Argeo Studio" uid="org.argeo.slc.studio" id="org.argeo.slc.studio.ui.product" application="org.eclipse.ui.ide.workbench" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Argeo Studio" uid="org.argeo.slc.studio" id="org.argeo.slc.studio.ui.product" application="org.eclipse.ui.ide.workbench" version="2.1.17.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.argeo.slc.studio.ui/img/argeo-ITSE.png"/>
@@ -14,6 +14,8 @@
    </configIni>
 
    <launcherArgs>
+      <vmArgs>-Xms256m -Xmx2048m
+      </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
@@ -21,11 +23,11 @@
    <windowImages i16="/org.argeo.slc.studio.ui/icons/argeo-icon-16.png" i32="/org.argeo.slc.studio.ui/icons/argeo-icon-32.png" i48="/org.argeo.slc.studio.ui/icons/argeo-icon-48.png" i64="/org.argeo.slc.studio.ui/icons/argeo-icon-64.png" i128="/org.argeo.slc.studio.ui/icons/argeo-icon-128.png" i256="/org.argeo.slc.studio.ui/icons/argeo-icon-256.png"/>
 
    <splash
-      location="org.argeo.slc.studio.branding"
+      location="org.argeo.slc.studio.ui"
       startupProgressRect="0,295,600,5"
       startupMessageRect="5,270,600,20"
       startupForegroundColor="00294b" />
-   <launcher name="ArgeoStudio">
+   <launcher name="argeo-studio">
       <linux icon="/org.argeo.slc.studio.ui/icons/argeo-icon-256.xpm"/>
       <win useIco="false">
          <bmp/>
@@ -33,16 +35,16 @@
    </launcher>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</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>
         <url>https://www.gnu.org/licenses/gpl-3.0.txt</url>
         <text>
    Argeo Studio - IDE and management tool focused on Argeo-based application development and deployment
-Copyright (C) 2007-2019  Argeo GmbH
+Copyright (C) 2007-2020  Argeo GmbH
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -92,6 +94,7 @@ along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <property name="osgi.requiredJavaVersion" value="11" />
    </configurations>
 
    <preferencesInfo>
-- 
2.39.2