From d14338729b39ffc3fd8384f269f0686fc34b7d32 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 7 Jan 2019 13:22:58 +0100 Subject: [PATCH] IDEMPIERE-3808:collect info to move idempiere to jdk-11. Fix jdk target environment. --- org.adempiere.base.callout/META-INF/MANIFEST.MF | 4 ++-- org.adempiere.base.process/META-INF/MANIFEST.MF | 3 ++- org.adempiere.base/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 ++- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 3 ++- org.adempiere.extend/META-INF/MANIFEST.MF | 3 ++- org.adempiere.install/META-INF/MANIFEST.MF | 3 ++- org.adempiere.payment.processor/META-INF/MANIFEST.MF | 4 ++-- org.adempiere.pipo.handlers/META-INF/MANIFEST.MF | 3 ++- org.adempiere.pipo/META-INF/MANIFEST.MF | 4 +++- org.adempiere.plugin.utils/META-INF/MANIFEST.MF | 3 ++- org.adempiere.replication.server/META-INF/MANIFEST.MF | 3 ++- org.adempiere.replication/META-INF/MANIFEST.MF | 3 ++- org.adempiere.report.jasper.library/META-INF/MANIFEST.MF | 3 ++- org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF | 3 ++- org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF | 5 ++--- org.adempiere.report.jasper/META-INF/MANIFEST.MF | 3 ++- org.adempiere.server-feature/server.product | 2 +- org.adempiere.server/META-INF/MANIFEST.MF | 3 ++- org.adempiere.ui.swing/META-INF/MANIFEST.MF | 3 ++- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 3 ++- org.adempiere.ui/META-INF/MANIFEST.MF | 3 ++- org.adempiere.webstore.resource/META-INF/MANIFEST.MF | 3 ++- org.adempiere.webstore.servlet/META-INF/MANIFEST.MF | 3 ++- org.adempiere.webstore/META-INF/MANIFEST.MF | 8 ++------ org.apache.ecs/META-INF/MANIFEST.MF | 3 ++- org.compiere.db.oracle.provider/META-INF/MANIFEST.MF | 4 ++-- org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF | 3 ++- org.idempiere.felix.webconsole/META-INF/MANIFEST.MF | 3 ++- org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF | 3 ++- org.idempiere.fitnesse.server/META-INF/MANIFEST.MF | 3 ++- org.idempiere.fitrecorder/META-INF/MANIFEST.MF | 3 ++- .../META-INF/MANIFEST.MF | 3 ++- org.idempiere.hazelcast.service/META-INF/MANIFEST.MF | 3 ++- .../.settings/org.eclipse.jdt.core.prefs | 4 +--- org.idempiere.p2/server.product | 2 +- org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF | 3 ++- org.idempiere.webservices/META-INF/MANIFEST.MF | 3 ++- org.idempiere.zk.extra/META-INF/MANIFEST.MF | 3 ++- 40 files changed, 77 insertions(+), 53 deletions(-) diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF index a28e419b59..2499b1342b 100644 --- a/org.adempiere.base.callout/META-INF/MANIFEST.MF +++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Callout Bundle-SymbolicName: org.adempiere.base.callout Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Eclipse-RegisterBuddy: org.adempiere.base Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml @@ -12,4 +13,3 @@ Export-Package: org.compiere.model Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.base.callout Bundle-Vendor: iDempiere Community - diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF index deee8ecf0e..2e8ea96783 100644 --- a/org.adempiere.base.process/META-INF/MANIFEST.MF +++ b/org.adempiere.base.process/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Processes Bundle-SymbolicName: org.adempiere.base.process Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Export-Package: org.adempiere.process, org.compiere.process, diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index c1fc94ce23..5ddb17242f 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -56,6 +56,7 @@ Export-Package: bsh, org.idempiere.broadcast, org.idempiere.distributed, org.idempiere.model +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: com.sun.mail.smtp;version="1.5", javax.jms;version="1.1.0", @@ -127,4 +128,3 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", com.sun.activation.jakarta.activation;bundle-version="1.2.1" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community -Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF index 120592614d..70e730f091 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Bundle-Localization: plugin -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet Eclipse-LazyStart: true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF index 52bbe9a684..a3cbfec86a 100644 --- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF @@ -1,7 +1,8 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Bundle-Name: %bundleName Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: @@ -17,4 +18,3 @@ Import-Package: javax.servlet;version="2.3",javax.servlet.http;version Bundle-ManifestVersion: 2 Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servletbridge - diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF index e1bf44cd26..96a73a166e 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF @@ -1,7 +1,8 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Bundle-Name: %bundleName Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF index dba15125fe..074bc1b5a7 100644 --- a/org.adempiere.extend/META-INF/MANIFEST.MF +++ b/org.adempiere.extend/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: iDempiere extend Bundle-SymbolicName: org.adempiere.extend;singleton:=true Bundle-Version: 6.2.0.qualifier Eclipse-RegisterBuddy: org.adempiere.tools -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Export-Package: compiere.model, test Fragment-Host: org.adempiere.base;bundle-version="0.0.0" diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF index c20aee1d93..5367e11d7e 100644 --- a/org.adempiere.install/META-INF/MANIFEST.MF +++ b/org.adempiere.install/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier Export-Package: org.adempiere.install, org.compiere.install Require-Bundle: org.adempiere.base;bundle-version="0.0.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: javax.mail;version="1.5", javax.mail.internet;version="1.5", org.apache.tools.ant, diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF index 7cd6220ac4..c0fcdf1555 100644 --- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF +++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Payment Processor Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: ., lib/jpayment.jar, @@ -11,4 +12,3 @@ Bundle-ClassPath: ., lib/Verisign.jar Automatic-Module-Name: org.adempiere.payment.processor Bundle-Vendor: iDempiere Community - diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF index 1f5ba425b7..a9c1159ba4 100644 --- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Handlers Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: . diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF index 50e4e62fe2..6abd85372b 100644 --- a/org.adempiere.pipo/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Core Bundle-SymbolicName: org.adempiere.pipo;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: org.apache.commons.codec, org.apache.commons.codec.binary, org.apache.tools.ant, @@ -20,3 +21,4 @@ Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.pipo Bundle-Vendor: iDempiere Community +Bundle-ActivationPolicy: lazy diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index a2d010588b..a156910950 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Plugin Utils Bundle-SymbolicName: org.adempiere.plugin.utils Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: org.adempiere.base, org.adempiere.util, org.apache.xerces.dom;version="2.9.0", diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF index 7c48ea5ba5..cffd679b07 100644 --- a/org.adempiere.replication.server/META-INF/MANIFEST.MF +++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Server Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.server;bundle-version="0.0.0", org.adempiere.replication;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF index 05619bb1ae..81a4f3d468 100644 --- a/org.adempiere.replication/META-INF/MANIFEST.MF +++ b/org.adempiere.replication/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Bundle-SymbolicName: org.adempiere.replication;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Export-Package: org.adempiere.process.rpl, org.adempiere.process.rpl.exp, diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF index eb6f48d652..c3520ecd64 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Library Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1" Bundle-ClassPath: ., lib/castor-core.jar, diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF index 44e0ea035e..743b4470c1 100644 --- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: JasperReports Swing Client Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.ui.swing;bundle-version="0.0.0", org.adempiere.report.jasper;bundle-version="0.0.0" diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF index e81aa03a1a..31f33210f1 100644 --- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: iDempiere JasperReport Web App Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true Bundle-Version: 6.2.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Web-ContextPath: JasperReportFiles Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", @@ -14,5 +15,3 @@ Import-Package: javax.servlet;version="2.5.0", Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.report.jasper.webapp Bundle-Vendor: iDempiere Community - - diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF index f5a97d41ac..b208a9d22f 100644 --- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere JasperReport integration Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: net.sourceforge.barbecue, org.apache.commons.codec, org.apache.commons.codec.binary, diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 31e69ec391..dfde27e5f0 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -24,7 +24,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index 98fbbb32a2..7671c0c50e 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0", org.eclipse.jetty.apache-jsp;bundle-version="0.0.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Web-ContextPath: / Bundle-ClassPath: ., WEB-INF/lib/jnlp-jardiff.jar, diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index d29e0abceb..eedaa7c415 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -75,7 +75,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.jfree.chart-osgi;bundle-version="1.0.19" Eclipse-ExtensibleAPI: true Eclipse-RegisterBuddy: org.adempiere.base -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: groovy.beans;version="2.5.3", groovy.cli;version="2.5.3", groovy.grape;version="2.5.3", diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index f29b1bcc2d..6a42b6b4a0 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Web Client Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: groovy.transform.stc;version="2.4.7", javax.annotation, javax.annotation.processing, diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index 490633ed8e..abc439692f 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere UI base Bundle-SymbolicName: org.adempiere.ui;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.xerces;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0" diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF index af9d7d5617..affb0a3ca7 100644 --- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.adempiere.webstore.resource Bundle-Version: 6.2.0.qualifier Bundle-Vendor: Adempiere.org Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: org.compiere.wstore Jetty-WarPatchFragmentFolderPath: / Bundle-ClassPath: . diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF index f21f8688d2..d3418dff68 100644 --- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: iDempiere Web Store Servlets Bundle-SymbolicName: org.adempiere.webstore.servlet Bundle-Version: 6.2.0.qualifier Bundle-Vendor: Adempiere.org -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Export-Package: org.compiere.wstore Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Import-Package: javax.servlet, diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF index 348aede99d..eaff385794 100644 --- a/org.adempiere.webstore/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.report.jasper.webapp;bundle-version="0.0.0", org.eclipse.jdt.core;bundle-version="3.15.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Web-ContextPath: wstore Import-Package: javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", @@ -84,8 +85,3 @@ Bundle-Activator: org.adempiere.webstore.Activator Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.webstore Bundle-Vendor: iDempiere Community - - - - - diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF index 533cf2e804..8cc26efcf0 100644 --- a/org.apache.ecs/META-INF/MANIFEST.MF +++ b/org.apache.ecs/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.apache.ecs Bundle-Version: 6.2.0.qualifier Bundle-Activator: org.apache.ecs.Activator Bundle-ActivationPolicy: lazy -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: org.osgi.framework;version="1.3.0" Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml", org.apache.ecs.filter;uses:="org.apache.ecs", diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index d99c40a5ad..7041cb7cbc 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Oracle Provider Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.install;bundle-version="0.0.0" Bundle-ClassPath: ., @@ -19,4 +20,3 @@ Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator Service-Component: OSGI-INF/oracleprovider.xml Automatic-Module-Name: org.compiere.db.oracle.provider Bundle-Vendor: iDempiere Community - diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 34d55d5cc2..d5e91cbc32 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Postgresql Provider Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Bundle-ClassPath: ., lib/c3p0.jar, lib/mchange-commons-java.jar, diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF index 696c8f259e..ef1e0d91dc 100644 --- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF +++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole Bundle-Version: 6.2.0.qualifier Bundle-Activator: org.idempiere.felix.webconsole.Activator Bundle-ActivationPolicy: lazy -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", javax.servlet.jsp;version="2.1.0", diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF index 5f158efd38..eff20d0518 100644 --- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.fitnesse.fixture Bundle-Version: 6.2.0.qualifier Bundle-Activator: org.idempiere.fitnesse.fixture.Activator Bundle-ActivationPolicy: lazy -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: fit, fit.decorator, fit.decorator.exceptions, diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF index c8a3b8517f..d1447a5b1a 100644 --- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.fitnesse.server Bundle-Version: 6.2.0.qualifier Bundle-Activator: org.idempiere.fitnesse.server.Activator Bundle-ActivationPolicy: lazy -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", org.adempiere.base, diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF index d657c5a60f..9b8c6f71cd 100644 --- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF +++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF @@ -8,7 +8,8 @@ Import-Package: org.adempiere.base, org.adempiere.plugin.utils, org.compiere.model, org.osgi.framework;version="1.3.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Service-Component: plugin.xml Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Bundle-ActivationPolicy: lazy diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF index aeae89c6e4..bdabed3ee2 100644 --- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: iDempiere Hazelcast Service Configuration Bundle-SymbolicName: org.idempiere.hazelcast.service.config Bundle-Version: 6.2.0.qualifier Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.hazelcast.service.config Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF index ac5ad6a359..decfbdd568 100644 --- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF @@ -30,7 +30,8 @@ Bundle-ClassPath: ., lib/hazelcast-aws.jar, lib/hazelcast.jar Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Bundle: org.eclipse.osgi Automatic-Module-Name: org.idempiere.hazelcast.service Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs index a54bb93cad..836736bf7a 100644 --- a/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=10 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=10 diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product index fc9c7f16a5..4d428a7067 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -24,7 +24,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF index 2f5815bc40..300cea8c23 100644 --- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF +++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.ui.zk.selenium Bundle-Version: 6.2.0.qualifier Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator Bundle-ActivationPolicy: lazy -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Import-Package: fit, fit.decorator, fit.decorator.exceptions, diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 9044b1dcf2..06511daa46 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: iDempiere Webservices Bundle-SymbolicName: org.idempiere.webservices;singleton:=true Bundle-Version: 6.2.0.qualifier Bundle-Activator: org.idempiere.webservices.Activator -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Service-Component: OSGI-INF/ws_modelfactory.xml Import-Package: javax.activation, javax.jws;version="1.1.0", diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index d70b8e3837..fbba421215 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: extra zk library Bundle-SymbolicName: org.idempiere.zk.extra Bundle-Version: 6.2.0.qualifier -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Bundle-ClassPath: ., lib/breeze.jar, lib/calendar.jar,