From 671bc4ed9c4c641d7907da8a6fee14ccfc338f74 Mon Sep 17 00:00:00 2001 From: hieplq Date: Wed, 24 Oct 2018 13:58:02 +0700 Subject: [PATCH] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (sync launch) move temp folder inside workspace_loc to avoid conflict when hava some dev environment dev/idempiere_home1 dev/idempiere_home2 --- org.adempiere.install/install.app.launch | 4 ++-- org.adempiere.server-feature/server.product.launch | 6 +++--- org.adempiere.server-feature/setup/configuration/config.ini | 1 + .../org.idempiere.p2.targetplatform.target | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index b31b58fc95..e675e5fb13 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -13,7 +13,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index f9cd3f424e..52d3742550 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -13,7 +13,7 @@ - + @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 20b8a93d82..f93d65ad02 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -14,6 +14,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.restlet,\ org.apache.servicemix.bundles.cglib,\ com.sun.mail.javax.mail,\ + com.sun.activation.javax.activation,\ org.apache.commons.collections,\ org.apache.ant,\ javax.jms,\ diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 6464478a4c..b97f77192e 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,4 +1,4 @@ - + @@ -1044,7 +1044,7 @@ - +