From bce0ae0611b46c651365978488ecd21270711b04 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 28 Dec 2018 23:14:02 +0100 Subject: [PATCH] IDEMPIERE-3808 - setup launchers with java 11 --- .../model.generator.launch | 18 ++++++++------ .../packinfolder.app.launch | 24 ++++++++++++------- .../sign.database.build.launch | 15 ++++++++---- .../synchronize-terminology.app.launch | 17 +++++++++---- .../translation.app.launch | 17 +++++++++---- .../src/org/compiere/util/Login.java | 4 ++-- .../install.console.app.launch | 9 ++++--- .../server.product.functionaltest.launch | 10 ++++---- .../server.product.launch | 6 ++--- .../swingclient.product.launch | 17 +++++++------ 10 files changed, 87 insertions(+), 50 deletions(-) diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 9fd9f58794..8517318b57 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -2,32 +2,36 @@ - + - + - + - + - + + + + + - - + + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 70d4457fd7..59452c515f 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -2,32 +2,38 @@ - + - + - - - + + + + + + + + - + - - + + + - + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 36060fe89b..96a7dbc451 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -13,18 +13,25 @@ - + + + + - + + + + + - - + + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index d6eefa3f11..0fe75da3ca 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -10,21 +10,28 @@ - + - + + + + - + + + + + - - + + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index aa2ed159cb..9201753ed0 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -10,21 +10,28 @@ - + - + + + + - + + + + + - - + + diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java index 860480a28a..ecf9b1d878 100644 --- a/org.adempiere.base/src/org/compiere/util/Login.java +++ b/org.adempiere.base/src/org/compiere/util/Login.java @@ -121,13 +121,13 @@ public class Login { // Java System version check String jVersion = System.getProperty("java.version"); - if (jVersion.startsWith("1.8.0") || jVersion.startsWith("9.") || jVersion.startsWith("10.")) + if (jVersion.startsWith("1.8.0") || jVersion.startsWith("9.") || jVersion.startsWith("10.") || jVersion.startsWith("11.")) return true; // Error Message StringBuilder msg = new StringBuilder(); msg.append(System.getProperty("java.vm.name")).append(" - ").append(jVersion); - msg.append(" <> 1.8.0 | 9 | 10"); + msg.append(" <> 1.8.0 | 9 | 10 | 11"); // if (isClient) JOptionPane.showMessageDialog(null, msg.toString(), diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index d1878f48b5..73cf7a940b 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -13,15 +13,18 @@ - - + + + + + - + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 5c4ba9f3fa..bf5f5c885b 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -13,22 +13,22 @@ - + - + - + - - + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 2c47b70d58..72276ec015 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -19,7 +19,7 @@ - + @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch index 29a6652993..63528b283d 100644 --- a/org.adempiere.ui.swing-feature/swingclient.product.launch +++ b/org.adempiere.ui.swing-feature/swingclient.product.launch @@ -2,33 +2,36 @@ - + - + - + - + + + + - + - - + +