From 942800418eeb7c967b0b154163e3a07fe19523e1 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 22 Dec 2018 15:49:50 +0700 Subject: [PATCH] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (zk8.6.0.1, eclipse-1812, java11, tycho 1.3) still use local repository for maven.to.p2 to continue update library --- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 5 + org.adempiere.base/META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + org.adempiere.install/install.app.launch | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../server.product.launch | 4 +- org.adempiere.server-feature/setup.ini | 2 +- .../setup/configuration/config.ini | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + org.adempiere.ui.zk/META-INF/MANIFEST.MF | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../director/configuration/config.ini | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../org.idempiere.p2.targetplatform.target | 662 ++++++++++++------ org.idempiere.p2/category.xml | 12 +- org.idempiere.parent/pom.xml | 52 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + 26 files changed, 622 insertions(+), 282 deletions(-) diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs index 182138f43f..af0840bd4c 100644 --- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs @@ -10,12 +10,15 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -24,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -105,3 +109,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index 244a0ac7ed..728334f6b8 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -124,6 +124,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", javax.xml;bundle-version="1.3.4", org.apache.poi.poi;bundle-version="3.15.0", org.apache.poi.poi-ooxml;bundle-version="3.15.0", - javax.activation;bundle-version="1.1.0" + com.sun.activation.javax.activation;bundle-version="1.2.0" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 2d7750f9f4..902986ab87 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -20,14 +20,14 @@ - + - + diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 0618702b3f..27d3d82a87 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini index 2b0d897bd2..6bfa731164 100644 --- a/org.adempiere.server-feature/setup.ini +++ b/org.adempiere.server-feature/setup.ini @@ -1,5 +1,5 @@ -startup -plugins/org.eclipse.equinox.launcher_1.5.100.v20180827-1352.jar +plugins/org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar -install setup --launcher.XXMaxPermSize diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 7d76a2653b..7512798c27 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar osgi.install.area=setup osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.eclipse.equinox.util,\ @@ -14,7 +14,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.restlet,\ org.apache.servicemix.bundles.cglib,\ com.sun.mail.javax.mail,\ - javax.activation,\ + com.sun.activation.javax.activation,\ org.apache.commons.collections,\ org.apache.ant,\ javax.jms,\ diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 4f20c296d2..16477482fe 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -158,8 +158,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.commons.io;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0", org.atmosphere.runtime;bundle-version="0.0.0", - javax.activation;bundle-version="1.1.0", - zkwebfragment + zkwebfragment, + com.sun.activation.javax.activation;bundle-version="1.2.0" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true Web-ContextPath: webui diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs +++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini index 9813d97456..dc051329de 100644 --- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini +++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar osgi.install.area=director equinox.use.ds=true osgi.bundles=org.eclipse.core.net@start,\ @@ -57,7 +57,6 @@ osgi.bundles=org.eclipse.core.net@start,\ org.hamcrest.core,\ org.junit,\ org.eclipse.osgi.compatibility.state,\ - org.eclipse.osgi.compatibility.plugins,\ org.eclipse.osgi@start,\ org.eclipse.osgi.services,\ org.eclipse.osgi.util,\ diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 25e55c4ce3..7763295307 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,73 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + - - + + + + + + + @@ -129,13 +87,13 @@ - + - + - + - + @@ -167,10 +125,10 @@ - - - - + + + + @@ -254,10 +212,6 @@ - - - - @@ -271,9 +225,7 @@ - - @@ -297,15 +249,13 @@ - + - + - - @@ -366,17 +316,17 @@ - + - - - + + + - + - + @@ -401,8 +351,6 @@ - - @@ -416,14 +364,8 @@ - - - - - - @@ -431,9 +373,7 @@ - - @@ -542,20 +482,8 @@ - - - - - - - - - - - - @@ -572,17 +500,10 @@ - - - - - - - @@ -608,12 +529,6 @@ - - - - - - @@ -640,35 +555,13 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -677,8 +570,6 @@ - - @@ -708,9 +599,7 @@ - - @@ -724,9 +613,9 @@ - + - + @@ -744,24 +633,257 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -772,30 +894,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -890,8 +1012,8 @@ - - + + @@ -922,6 +1044,10 @@ + + + + @@ -976,6 +1102,8 @@ + + @@ -1024,14 +1152,94 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1040,8 +1248,22 @@ + + + + + + + + + + + + + + @@ -1055,25 +1277,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index f9db4be3fe..1e23bd0c55 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -63,22 +63,22 @@ - + - + - + - + - + - + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index b7ef53b2e3..22a5eecd3c 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -10,7 +10,7 @@ Maven parent project for idempiere - 1.2.0 + 1.3.0 ${tycho.version} UTF-8 6.7.0 @@ -25,10 +25,10 @@ RELEASE731 org.idempiere.p2.targetplatform - http://download.eclipse.org/eclipse/updates/4.9 - eclipse-photon-201809 - http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository - orbit-photon-R20180905201904 + http://download.eclipse.org/eclipse/updates/4.10 + eclipse-photon-201810 + http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository + orbit-photon-R20181128170323 https://raw.githubusercontent.com/idempiere/binary.file/master org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group org.adempiere.server.product @@ -322,44 +322,6 @@ true - - - - org.codehaus.plexus - plexus-utils - 3.1.0 - - - org.codehaus.plexus - plexus-compiler-manager - ${codehaus.plexus} - - - org.codehaus.plexus - plexus-compiler-api - ${codehaus.plexus} - - - org.apache.commons - commons-exec - 1.3 - - - org.eclipse.jdt - org.eclipse.jdt.compiler.tool - 1.2.300 - - - org.eclipse.jdt - org.eclipse.jdt.core - ${jdtVersion} - - - org.eclipse.jdt - org.eclipse.jdt.compiler.apt - ${jdtAptVersion} - - org.eclipse.tycho @@ -537,8 +499,8 @@ x86_64 - JavaSE-10 - JavaSE-10 + JavaSE-11 + JavaSE-11 diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11