diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index f665e43600..8a7c21e050 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -519,4 +519,11 @@ fragment="true" unpack="false"/> + + diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF index e45f24bac4..849739dc3a 100644 --- a/org.adempiere.base.callout/META-INF/MANIFEST.MF +++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Callout Bundle-SymbolicName: org.adempiere.base.callout Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF index 534ae77089..88f59b31c7 100644 --- a/org.adempiere.base.process/META-INF/MANIFEST.MF +++ b/org.adempiere.base.process/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Processes Bundle-SymbolicName: org.adempiere.base.process Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 c76cb1124f..07be0a6ba8 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -56,7 +56,7 @@ Export-Package: bsh, org.idempiere.broadcast, org.idempiere.distributed, org.idempiere.model -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: com.sun.mail.smtp;version="1.5", javax.activation, javax.jms;version="1.1.0", 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 386a2f5295..9b661ecd27 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,6 @@ Manifest-Version: 1.0 Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 4abb73c17b..6d031b6968 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,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-Name: %bundleName Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF index d9c1048624..6668a3fe90 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 ceda5def1c..ba11ebf651 100644 --- a/org.adempiere.extend/META-INF/MANIFEST.MF +++ b/org.adempiere.extend/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere extend Bundle-SymbolicName: org.adempiere.extend;singleton:=true Bundle-Version: 5.1.0.qualifier Eclipse-RegisterBuddy: org.adempiere.tools -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 8f5f3d7bcf..bc835d83d8 100644 --- a/org.adempiere.install/META-INF/MANIFEST.MF +++ b/org.adempiere.install/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.1.0.qualifier Export-Package: org.adempiere.install, org.compiere.install Require-Bundle: org.adempiere.base;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 1f6770f6e6..0847426594 100644 --- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF +++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Payment Processor Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: ., lib/jpayment.jar, diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF index 2ee9482851..2df52340c9 100644 --- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Handlers Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 99bdcea10e..e0e8b54275 100644 --- a/org.adempiere.pipo/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Core Bundle-SymbolicName: org.adempiere.pipo;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: org.apache.commons.codec, org.apache.commons.codec.binary, org.apache.tools.ant, diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index 51af16672e..3bfbd17f2b 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Plugin Utils Bundle-SymbolicName: org.adempiere.plugin.utils Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 0c5f5a3550..fc24b55364 100644 --- a/org.adempiere.replication.server/META-INF/MANIFEST.MF +++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Server Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 d05fac3d72..a7618b6e83 100644 --- a/org.adempiere.replication/META-INF/MANIFEST.MF +++ b/org.adempiere.replication/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Bundle-SymbolicName: org.adempiere.replication;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 a306ae4ff2..897e3350f2 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Library Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 7e3fcae3af..9e1d872a61 100644 --- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JasperReports Swing Client Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 2d4f58a1a2..7cdef40acd 100644 --- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere JasperReport Web App Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true Bundle-Version: 5.1.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Web-ContextPath: JasperReportFiles Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF index b16ae90a47..d125486454 100644 --- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere JasperReport integration Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: net.sourceforge.barbecue, org.apache.commons.codec, org.apache.commons.codec.binary, diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index 34fe6aaa65..d4f528f91c 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.1.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" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 3732c9d8ce..15c00dcdf2 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -75,7 +75,7 @@ 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 -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 9fa575bc81..0ddba8ca3a 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Web Client Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: groovy.transform.stc;version="2.4.7", javax.activation, javax.annotation, diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index 48b6b332d4..20ef8e21cd 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere UI base Bundle-SymbolicName: org.adempiere.ui;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 edc34c59d9..5eee9819e9 100644 --- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.adempiere.webstore.resource Bundle-Version: 5.1.0.qualifier Bundle-Vendor: Adempiere.org Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 628d0bfd74..f1d7e0b901 100644 --- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere Web Store Servlets Bundle-SymbolicName: org.adempiere.webstore.servlet Bundle-Version: 5.1.0.qualifier Bundle-Vendor: Adempiere.org -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 ffdd71221e..211827af85 100644 --- a/org.adempiere.webstore/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.1.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" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Web-ContextPath: wstore Import-Package: javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF index 7f6a2ea845..35d1d61ccb 100644 --- a/org.apache.ecs/META-INF/MANIFEST.MF +++ b/org.apache.ecs/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.apache.ecs Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.apache.ecs.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 66bb756587..94192a6e48 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Oracle Provider Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.install;bundle-version="0.0.0" Bundle-ClassPath: ., diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 672e1442ff..7e7b423349 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Postgresql Provider Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 6229082ff1..3b0b3a8b1e 100644 --- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF +++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.felix.webconsole.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 bfb79a950a..8c39f9953c 100644 --- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.fitnesse.fixture Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.fitnesse.fixture.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 982fb586b3..44c578117e 100644 --- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.fitnesse.server Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.fitnesse.server.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 96aadd47b1..4d26c8d430 100644 --- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF +++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Import-Package: org.adempiere.base, org.adempiere.plugin.utils, org.compiere.model, org.osgi.framework;version="1.3.0" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 59d4fba5f8..a7978c0f2d 100644 --- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: iDempiere Hazelcast Service Configuration Bundle-SymbolicName: org.idempiere.hazelcast.service.config Bundle-Version: 5.1.0.qualifier Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.hazelcast.service.config diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF index aaa40a3436..c209bd8127 100644 --- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF @@ -30,6 +30,6 @@ Bundle-ClassPath: ., lib/hazelcast-aws.jar, lib/hazelcast.jar Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.eclipse.osgi Automatic-Module-Name: org.idempiere.hazelcast.service diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index 68d60c46ba..3ff99d0a69 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -518,6 +518,11 @@ true false + + javax.jws:javax.jws-api:jar:1.1 + true + false + org.codehaus.woodstox:stax2-api:jar:4.1 true diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 89c6753dd0..1740dc5bed 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1025,6 +1025,8 @@ + + diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF index 5c381acc1a..4098d7121b 100644 --- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF +++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.ui.zk.selenium Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" 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 75031ac957..2d078ea4fb 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere Webservices Bundle-SymbolicName: org.idempiere.webservices;singleton:=true Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.webservices.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Service-Component: OSGI-INF/ws_modelfactory.xml Import-Package: javax.activation, javax.annotation, diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index dbe3042b28..9f82ebcacd 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: extra zk library Bundle-SymbolicName: org.idempiere.zk.extra Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-10 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-ClassPath: ., lib/breeze.jar, lib/calendar.jar,