IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (web service/tycho ok, eclipse conflic)

use javax.activation bundle from eclipse can resolve issue conflic between tycho buil/eclipse build/eclipse runtime

org.adempiere.base/META-INF/MANIFEST.MF

@@ -58,7 +58,6 @@ Export-Package: bsh,
  org.idempiere.model
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: com.sun.mail.smtp;version="1.5",
- javax.activation;version="1.1.0",
  javax.jms;version="1.1.0",
  javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
@@ -124,6 +123,7 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  groovy,
  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"
+ org.apache.poi.poi-ooxml;bundle-version="3.15.0",
+ javax.activation;bundle-version="1.1.0"
 Automatic-Module-Name: org.adempiere.base
 Bundle-Vendor: iDempiere Community

org.adempiere.target.platform-feature/feature.xml

@@ -253,13 +253,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.sun.activation.javax.activation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.aopalliance"
          download-size="0"

org.adempiere.ui.zk/META-INF/MANIFEST.MF

@@ -5,8 +5,10 @@ Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
 Bundle-Version: 5.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Import-Package: groovy.transform.stc;version="2.4.7",
- javax.activation;version="1.1.0",
+ javax.annotation,
  javax.annotation.processing,
+ javax.annotation.security,
+ javax.annotation.sql,
  javax.servlet,
  javax.servlet.annotation;version="3.1.0",
  javax.servlet.http,
@@ -152,7 +154,7 @@ 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.annotation-api;bundle-version="1.3.2"
+ javax.activation;bundle-version="1.1.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Web-ContextPath: webui

org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml

@@ -125,38 +125,6 @@
 											<id>com.sun.mail:javax.mail:jar:1.6.2</id>
 											<source>true</source>
 											<transitive>false</transitive>
-											<override>true</override>
-											<instructions>
-<!--keep same original, copy here because tool will remake it-->
-											    <DynamicImport-Package>*</DynamicImport-Package>
-<!--Export-Package keep same original, copy here because tool will remake it-->
-											    <Export-Package>javax.mail;version="1.6";uses:="javax.activation,javax
- .mail.event,javax.mail.search",javax.mail.event;version="1.6";uses:="
- javax.mail",javax.mail.internet;version="1.6";uses:="javax.activation
- ,javax.mail",javax.mail.search;version="1.6";uses:="javax.mail",javax
- .mail.util;version="1.6";uses:="javax.activation,javax.mail.internet"
- ,com.sun.mail.imap;version="1.6.2";uses:="com.sun.mail.iap,com.sun.ma
- il.imap.protocol,com.sun.mail.util,javax.activation,javax.mail,javax.
- mail.event,javax.mail.internet,javax.mail.search",com.sun.mail.imap.p
- rotocol;version="1.6.2";uses:="com.sun.mail.iap,com.sun.mail.imap,com
- .sun.mail.util,javax.mail,javax.mail.internet,javax.mail.search",com.
- sun.mail.iap;version="1.6.2";uses:="com.sun.mail.util",com.sun.mail.p
- op3;version="1.6.2";uses:="com.sun.mail.util,javax.mail,javax.mail.in
- ternet",com.sun.mail.smtp;version="1.6.2";uses:="com.sun.mail.util,ja
- vax.mail,javax.mail.internet",com.sun.mail.util;version="1.6.2";uses:
- ="javax.mail,javax.mail.internet,javax.net.ssl",com.sun.mail.util.log
- ging;version="1.6.2";uses:="javax.mail",com.sun.mail.handlers;version
- ="1.6.2";uses:="javax.activation"</Export-Package>
-<!--refe:note 1-->
-											    <Import-Package>javax.security.sasl;resolution:=optional,com.sun.mail.
- iap;version="[1.6,2)",com.sun.mail.imap;version="[1.6,2)",com.sun.mai
- l.util;version="[1.6,2)",javax.activation;version="${activation.version}",javax.crypto,javax.crypto.s
- pec,javax.mail;version="[1.6,2)",javax.mail.event;version="[1.6,2)",j
- avax.mail.internet;version="[1.6,2)",javax.mail.search;version="[1.6,
- 2)",javax.mail.util;version="[1.6,2)",javax.net,javax.net.ssl,javax.s
- ecurity.auth.callback,javax.security.auth.x500,javax.xml.transform,ja
- vax.xml.transform.stream,sun.security.util;resolution:=optional</Import-Package>
-											</instructions>
 										</artifact>
 										<!-- <artifact> <id>org.ow2.asm:asm-commons:jar:6.0</id> <source>true</source> 
 											<transitive>false</transitive> </artifact> <artifact> <id>org.ow2.asm:asm-tree:jar:6.0</id> 
@@ -658,16 +626,6 @@
 											<id>javax.xml.soap:javax.xml.soap-api:jar:1.4.0</id>
 											<source>true</source>
 											<transitive>false</transitive>
-											<override>true</override>
-											<instructions>
-<!--export keep same original, copy here because tool will remake it-->
-											    <Export-Package>javax.xml.soap;uses:="javax.activation,javax.xml.names
- pace,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom";version
- ="1.4.0"</Export-Package>
-<!--refe: note 1-->
-											    <Import-Package>javax.activation;version="${activation.version}",javax.xml.namespace,javax.xml.transfo
- rm,javax.xml.transform.dom,org.w3c.dom</Import-Package>
-											</instructions>
 										</artifact>
 										<artifact>
 											<id>javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1</id>
@@ -733,303 +691,6 @@
 											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:${springframework.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
-                                            <override>true</override>
-											<instructions>
-<Export-Package>org.springframework.cache;version="4.3.19.RELEASE",org
- .springframework.cache.annotation;version="4.3.19.RELEASE";uses:="org
- .springframework.cache,org.springframework.cache.interceptor,org.spri
- ngframework.context.annotation,org.springframework.core.annotation,or
- g.springframework.core.type",org.springframework.cache.concurrent;ver
- sion="4.3.19.RELEASE";uses:="org.springframework.beans.factory,org.sp
- ringframework.cache,org.springframework.cache.support,org.springframe
- work.core.serializer.support",org.springframework.cache.config;versio
- n="4.3.19.RELEASE";uses:="org.springframework.beans.factory.xml",org.
- springframework.cache.interceptor;version="4.3.19.RELEASE";uses:="org
- .aopalliance.intercept,org.apache.commons.logging,org.springframework
- .aop,org.springframework.aop.framework,org.springframework.aop.suppor
- t,org.springframework.beans.factory,org.springframework.cache,org.spr
- ingframework.context",org.springframework.cache.support;version="4.3.
- 19.RELEASE";uses:="org.springframework.beans.factory,org.springframew
- ork.cache",org.springframework.context;version="4.3.19.RELEASE";uses:
- ="org.springframework.beans,org.springframework.beans.factory,org.spr
- ingframework.beans.factory.config,org.springframework.core,org.spring
- framework.core.env,org.springframework.core.io,org.springframework.co
- re.io.support,org.springframework.util",org.springframework.context.a
- ccess;version="4.3.19.RELEASE";uses:="org.springframework.beans,org.s
- pringframework.beans.factory,org.springframework.beans.factory.access
- ,org.springframework.context,org.springframework.jndi",org.springfram
- ework.context.annotation;version="4.3.19.RELEASE";uses:="javax.manage
- ment,org.apache.commons.logging,org.springframework.beans,org.springf
- ramework.beans.factory,org.springframework.beans.factory.annotation,o
- rg.springframework.beans.factory.config,org.springframework.beans.fac
- tory.parsing,org.springframework.beans.factory.support,org.springfram
- ework.beans.factory.xml,org.springframework.context,org.springframewo
- rk.context.support,org.springframework.core,org.springframework.core.
- annotation,org.springframework.core.env,org.springframework.core.io,o
- rg.springframework.core.io.support,org.springframework.core.type,org.
- springframework.core.type.classreading,org.springframework.core.type.
- filter,org.springframework.instrument.classloading,org.springframewor
- k.jmx.export.annotation,org.springframework.jmx.support,org.springfra
- mework.stereotype,org.w3c.dom",org.springframework.context.config;ver
- sion="4.3.19.RELEASE";uses:="org.springframework.beans.factory.xml",o
- rg.springframework.context.event;version="4.3.19.RELEASE";uses:="org.
- aopalliance.intercept,org.apache.commons.logging,org.springframework.
- beans.factory,org.springframework.context,org.springframework.core,or
- g.springframework.core.annotation,org.springframework.util",org.sprin
- gframework.context.expression;version="4.3.19.RELEASE";uses:="org.spr
- ingframework.asm,org.springframework.beans,org.springframework.beans.
- factory,org.springframework.beans.factory.config,org.springframework.
- core,org.springframework.expression,org.springframework.expression.sp
- el,org.springframework.expression.spel.standard,org.springframework.e
- xpression.spel.support",org.springframework.context.i18n;version="4.3
- .19.RELEASE",org.springframework.context.support;version="4.3.19.RELE
- ASE";uses:="groovy.lang,org.apache.commons.logging,org.springframewor
- k.beans,org.springframework.beans.factory,org.springframework.beans.f
- actory.config,org.springframework.beans.factory.groovy,org.springfram
- ework.beans.factory.support,org.springframework.beans.factory.xml,org
- .springframework.context,org.springframework.core,org.springframework
- .core.convert,org.springframework.core.convert.support,org.springfram
- ework.core.env,org.springframework.core.io,org.springframework.core.i
- o.support,org.springframework.util",org.springframework.context.weavi
- ng;version="4.3.19.RELEASE";uses:="org.apache.commons.logging,org.spr
- ingframework.beans,org.springframework.beans.factory,org.springframew
- ork.beans.factory.config,org.springframework.core,org.springframework
- .instrument.classloading",org.springframework.ejb.access;version="4.3
- .19.RELEASE";uses:="javax.ejb,javax.naming,org.aopalliance.intercept,
- org.springframework.beans.factory,org.springframework.core,org.spring
- framework.jndi",org.springframework.ejb.config;version="4.3.19.RELEAS
- E";uses:="org.springframework.beans.factory.xml",org.springframework.
- ejb.interceptor;version="4.3.19.RELEASE";uses:="javax.annotation,java
- x.ejb,javax.interceptor,org.springframework.beans.factory,org.springf
- ramework.beans.factory.access,org.springframework.beans.factory.annot
- ation",org.springframework.format;version="4.3.19.RELEASE";uses:="org
- .springframework.core.convert.converter",org.springframework.format.a
- nnotation;version="4.3.19.RELEASE",org.springframework.format.datetim
- e;version="4.3.19.RELEASE";uses:="org.springframework.context.support
- ,org.springframework.core.convert.converter,org.springframework.forma
- t,org.springframework.format.annotation",org.springframework.format.d
- atetime.joda;version="4.3.19.RELEASE";uses:="org.joda.time,org.joda.t
- ime.format,org.springframework.beans.factory,org.springframework.cont
- ext.support,org.springframework.format,org.springframework.format.ann
- otation",org.springframework.format.datetime.standard;version="4.3.19
- .RELEASE";uses:="org.springframework.beans.factory,org.springframewor
- k.context.support,org.springframework.format,org.springframework.form
- at.annotation",org.springframework.format.number;version="4.3.19.RELE
- ASE";uses:="org.springframework.context.support,org.springframework.f
- ormat,org.springframework.format.annotation",org.springframework.form
- at.number.money;version="4.3.19.RELEASE";uses:="javax.money,javax.mon
- ey.format,org.springframework.context.support,org.springframework.for
- mat,org.springframework.format.annotation",org.springframework.format
- .support;version="4.3.19.RELEASE";uses:="org.springframework.beans.fa
- ctory,org.springframework.context,org.springframework.core.convert.su
- pport,org.springframework.format,org.springframework.util",org.spring
- framework.instrument.classloading;version="4.3.19.RELEASE";uses:="org
- .springframework.core",org.springframework.instrument.classloading.gl
- assfish;version="4.3.19.RELEASE";uses:="org.springframework.instrumen
- t.classloading",org.springframework.instrument.classloading.jboss;ver
- sion="4.3.19.RELEASE";uses:="org.springframework.instrument.classload
- ing",org.springframework.instrument.classloading.tomcat;version="4.3.
- 19.RELEASE";uses:="org.springframework.instrument.classloading",org.s
- pringframework.instrument.classloading.weblogic;version="4.3.19.RELEA
- SE";uses:="org.springframework.instrument.classloading",org.springfra
- mework.instrument.classloading.websphere;version="4.3.19.RELEASE";use
- s:="org.springframework.instrument.classloading",org.springframework.
- jmx;version="4.3.19.RELEASE";uses:="org.springframework.core",org.spr
- ingframework.jmx.access;version="4.3.19.RELEASE";uses:="javax.managem
- ent,org.aopalliance.intercept,org.apache.commons.logging,org.springfr
- amework.beans.factory,org.springframework.core,org.springframework.jm
- x,org.springframework.jmx.support",org.springframework.jmx.export;ver
- sion="4.3.19.RELEASE";uses:="javax.management,javax.management.modelm
- bean,org.springframework.beans.factory,org.springframework.jmx,org.sp
- ringframework.jmx.export.assembler,org.springframework.jmx.export.nam
- ing,org.springframework.jmx.support",org.springframework.jmx.export.a
- nnotation;version="4.3.19.RELEASE";uses:="org.springframework.beans.f
- actory,org.springframework.core.annotation,org.springframework.jmx.ex
- port,org.springframework.jmx.export.metadata,org.springframework.jmx.
- support",org.springframework.jmx.export.assembler;version="4.3.19.REL
- EASE";uses:="javax.management,javax.management.modelmbean,org.springf
- ramework.beans.factory,org.springframework.core,org.springframework.j
- mx.export.metadata",org.springframework.jmx.export.metadata;version="
- 4.3.19.RELEASE";uses:="javax.management.modelmbean,org.springframewor
- k.jmx,org.springframework.jmx.support",org.springframework.jmx.export
- .naming;version="4.3.19.RELEASE";uses:="javax.management,org.apache.c
- ommons.logging,org.springframework.beans.factory,org.springframework.
- core.io,org.springframework.jmx.export.metadata",org.springframework.
- jmx.export.notification;version="4.3.19.RELEASE";uses:="javax.managem
- ent,javax.management.modelmbean,org.springframework.beans.factory,org
- .springframework.jmx",org.springframework.jmx.support;version="4.3.19
- .RELEASE";uses:="javax.management,javax.management.remote,org.apache.
- commons.logging,org.springframework.beans.factory,org.springframework
- .jmx",org.springframework.jndi;version="4.3.19.RELEASE";uses:="javax.
- naming,org.apache.commons.logging,org.springframework.aop,org.springf
- ramework.beans.factory,org.springframework.core,org.springframework.c
- ore.env",org.springframework.jndi.support;version="4.3.19.RELEASE";us
- es:="org.springframework.beans,org.springframework.beans.factory,org.
- springframework.core,org.springframework.jndi",org.springframework.re
- moting;version="4.3.19.RELEASE";uses:="org.springframework.core",org.
- springframework.remoting.rmi;version="4.3.19.RELEASE";uses:="javax.na
- ming,org.aopalliance.intercept,org.apache.commons.logging,org.omg.COR
- BA,org.springframework.beans.factory,org.springframework.core,org.spr
- ingframework.jndi,org.springframework.remoting,org.springframework.re
- moting.support",org.springframework.remoting.soap;version="4.3.19.REL
- EASE";uses:="javax.xml.namespace,org.springframework.remoting",org.sp
- ringframework.remoting.support;version="4.3.19.RELEASE";uses:="com.su
- n.net.httpserver,org.aopalliance.intercept,org.apache.commons.logging
- ,org.springframework.beans.factory",org.springframework.scheduling;ve
- rsion="4.3.19.RELEASE";uses:="org.springframework.core,org.springfram
- ework.core.task",org.springframework.scheduling.annotation;version="4
- .3.19.RELEASE";uses:="org.aopalliance.aop,org.apache.commons.logging,
- org.springframework.aop,org.springframework.aop.framework.autoproxy,o
- rg.springframework.aop.interceptor,org.springframework.aop.support,or
- g.springframework.beans.factory,org.springframework.beans.factory.con
- fig,org.springframework.beans.factory.support,org.springframework.con
- text,org.springframework.context.annotation,org.springframework.conte
- xt.event,org.springframework.core,org.springframework.core.annotation
- ,org.springframework.core.type,org.springframework.scheduling.config,
- org.springframework.util,org.springframework.util.concurrent",org.spr
- ingframework.scheduling.concurrent;version="4.3.19.RELEASE";uses:="ja
- vax.naming,org.apache.commons.logging,org.springframework.beans.facto
- ry,org.springframework.core.task,org.springframework.jndi,org.springf
- ramework.scheduling,org.springframework.util,org.springframework.util
- .concurrent",org.springframework.scheduling.config;version="4.3.19.RE
- LEASE";uses:="org.springframework.beans.factory,org.springframework.b
- eans.factory.config,org.springframework.beans.factory.support,org.spr
- ingframework.beans.factory.xml,org.springframework.core.task,org.spri
- ngframework.scheduling,org.springframework.scheduling.support,org.w3c
- .dom",org.springframework.scheduling.support;version="4.3.19.RELEASE"
- ;uses:="org.apache.commons.logging,org.springframework.beans.factory,
- org.springframework.beans.support,org.springframework.scheduling,org.
- springframework.util",org.springframework.scripting;version="4.3.19.R
- ELEASE";uses:="org.springframework.core",org.springframework.scriptin
- g.bsh;version="4.3.19.RELEASE";uses:="bsh,org.springframework.beans.f
- actory,org.springframework.core,org.springframework.scripting",org.sp
- ringframework.scripting.config;version="4.3.19.RELEASE";uses:="org.sp
- ringframework.beans.factory.config,org.springframework.beans.factory.
- support,org.springframework.beans.factory.xml",org.springframework.sc
- ripting.groovy;version="4.3.19.RELEASE";uses:="groovy.lang,org.codeha
- us.groovy.control,org.codehaus.groovy.control.customizers,org.springf
- ramework.beans.factory,org.springframework.scripting",org.springframe
- work.scripting.jruby;version="4.3.19.RELEASE";uses:="org.jruby.except
- ions,org.springframework.beans.factory,org.springframework.core,org.s
- pringframework.scripting",org.springframework.scripting.support;versi
- on="4.3.19.RELEASE";uses:="javax.script,org.apache.commons.logging,or
- g.springframework.aop,org.springframework.aop.target.dynamic,org.spri
- ngframework.beans.factory,org.springframework.beans.factory.config,or
- g.springframework.context,org.springframework.core,org.springframewor
- k.core.io,org.springframework.core.io.support,org.springframework.scr
- ipting",org.springframework.stereotype;version="4.3.19.RELEASE",org.s
- pringframework.ui;version="4.3.19.RELEASE",org.springframework.ui.con
- text;version="4.3.19.RELEASE";uses:="org.springframework.context",org
- .springframework.ui.context.support;version="4.3.19.RELEASE";uses:="o
- rg.apache.commons.logging,org.springframework.beans.factory,org.sprin
- gframework.context,org.springframework.ui.context",org.springframewor
- k.validation;version="4.3.19.RELEASE";uses:="org.apache.commons.loggi
- ng,org.springframework.beans,org.springframework.context.support,org.
- springframework.core,org.springframework.core.convert,org.springframe
- work.format",org.springframework.validation.annotation;version="4.3.1
- 9.RELEASE",org.springframework.validation.beanvalidation;version="4.3
- .19.RELEASE";uses:="javax.validation,javax.validation.metadata,org.ao
- palliance.aop,org.aopalliance.intercept,org.hibernate.validator.spi.r
- esourceloading,org.springframework.aop.framework.autoproxy,org.spring
- framework.beans,org.springframework.beans.factory,org.springframework
- .beans.factory.config,org.springframework.context,org.springframework
- .core,org.springframework.core.io,org.springframework.validation",org
- .springframework.validation.support;version="4.3.19.RELEASE";uses:="o
- rg.springframework.ui"</Export-Package>
-<Import-Package>bsh;version="[2,3)";resolution:=optional,com.sun.net.h
- ttpserver;resolution:=optional,groovy.lang;version="[2.4,3)";resoluti
- on:=optional,javax.annotation;version="${annotation.version}";resolution:=optional,javax.ejb;resoluti
- on:=optional,javax.enterprise.concurrent;resolution:=optional,javax.i
- nterceptor;resolution:=optional,javax.management;resolution:=optional
- ,javax.management.modelmbean;resolution:=optional,javax.management.op
- enmbean;resolution:=optional,javax.management.remote;resolution:=opti
- onal,javax.money;resolution:=optional,javax.money.format;resolution:=
- optional,javax.naming;resolution:=optional,javax.rmi;resolution:=opti
- onal,javax.script;resolution:=optional,javax.validation;resolution:=o
- ptional,javax.validation.bootstrap;resolution:=optional,javax.validat
- ion.metadata;resolution:=optional,javax.xml.namespace;resolution:=opt
- ional,javax.xml.ws;resolution:=optional,org.aopalliance.aop;version="
- [1,2)";resolution:=optional,org.aopalliance.intercept;version="[1,2)"
- ;resolution:=optional,org.apache.commons.logging;version="[1.1.1,2)";
- resolution:=optional,org.aspectj.weaver.loadtime;version="[1.8.6,2)";
- resolution:=optional,org.codehaus.groovy.control;version="[2.4,3)";re
- solution:=optional,org.codehaus.groovy.control.customizers;version="[
- 2.4,3)";resolution:=optional,org.hibernate.validator;version="[4,6)";
- resolution:=optional,org.hibernate.validator.messageinterpolation;ver
- sion="[4,6)";resolution:=optional,org.hibernate.validator.method;vers
- ion="[4,6)";resolution:=optional,org.hibernate.validator.spi.resource
- loading;version="[4,6)";resolution:=optional,org.joda.time;version="[
- 2,3)";resolution:=optional,org.joda.time.format;version="[2,3)";resol
- ution:=optional,org.jruby;version="[1.7,2)";resolution:=optional,org.
- jruby.ast;version="[1.7,2)";resolution:=optional,org.jruby.exceptions
- ;version="[1.7,2)";resolution:=optional,org.jruby.javasupport;version
- ="[1.7,2)";resolution:=optional,org.jruby.runtime;version="[1.7,2)";r
- esolution:=optional,org.jruby.runtime.builtin;version="[1.7,2)";resol
- ution:=optional,org.omg.CORBA;resolution:=optional,org.springframewor
- k.aop;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springf
- ramework.aop.config;version="[4.3.19.RELEASE,4.4)";resolution:=option
- al,org.springframework.aop.framework;version="[4.3.19.RELEASE,4.4)";r
- esolution:=optional,org.springframework.aop.framework.adapter;version
- ="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework.aop.
- interceptor;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.s
- pringframework.aop.scope;version="[4.3.19.RELEASE,4.4)";resolution:=o
- ptional,org.springframework.aop.support;version="[4.3.19.RELEASE,4.4)
- ";resolution:=optional,org.springframework.aop.support.annotation;ver
- sion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework.
- aop.target;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.sp
- ringframework.aop.target.dynamic;version="[4.3.19.RELEASE,4.4)";resol
- ution:=optional,org.springframework.aop.framework.autoproxy;version="
- [4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework.asm;ve
- rsion="[4.3.19.RELEASE,4.4)",org.springframework.beans;version="[4.3.
- 19.RELEASE,4.4)",org.springframework.beans.annotation;version="[4.3.1
- 9.RELEASE,4.4)",org.springframework.beans.factory;version="[4.3.19.RE
- LEASE,4.4)",org.springframework.beans.factory.access;version="[4.3.19
- .RELEASE,4.4)",org.springframework.beans.factory.annotation;version="
- [4.3.19.RELEASE,4.4)",org.springframework.beans.factory.config;versio
- n="[4.3.19.RELEASE,4.4)",org.springframework.beans.factory.parsing;ve
- rsion="[4.3.19.RELEASE,4.4)",org.springframework.beans.factory.suppor
- t;version="[4.3.19.RELEASE,4.4)",org.springframework.beans.factory.xm
- l;version="[4.3.19.RELEASE,4.4)",org.springframework.beans.factory.gr
- oovy;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springfr
- amework.beans.propertyeditors;version="[4.3.19.RELEASE,4.4)",org.spri
- ngframework.beans.support;version="[4.3.19.RELEASE,4.4)",org.springfr
- amework.cglib.core;version="[4.3.19.RELEASE,4.4)",org.springframework
- .cglib.proxy;version="[4.3.19.RELEASE,4.4)",org.springframework.cglib
- .transform;version="[4.3.19.RELEASE,4.4)",org.springframework.core;ve
- rsion="[4.3.19.RELEASE,4.4)",org.springframework.core.annotation;vers
- ion="[4.3.19.RELEASE,4.4)",org.springframework.core.convert;version="
- [4.3.19.RELEASE,4.4)",org.springframework.core.convert.converter;vers
- ion="[4.3.19.RELEASE,4.4)",org.springframework.core.convert.support;v
- ersion="[4.3.19.RELEASE,4.4)",org.springframework.core.env;version="[
- 4.3.19.RELEASE,4.4)",org.springframework.core.io;version="[4.3.19.REL
- EASE,4.4)",org.springframework.core.io.support;version="[4.3.19.RELEA
- SE,4.4)",org.springframework.core.serializer.support;version="[4.3.19
- .RELEASE,4.4)";resolution:=optional,org.springframework.core.task;ver
- sion="[4.3.19.RELEASE,4.4)",org.springframework.core.task.support;ver
- sion="[4.3.19.RELEASE,4.4)",org.springframework.core.type;version="[4
- .3.19.RELEASE,4.4)",org.springframework.core.type.classreading;versio
- n="[4.3.19.RELEASE,4.4)",org.springframework.core.type.filter;version
- ="[4.3.19.RELEASE,4.4)",org.springframework.expression;version="[4.3.
- 19.RELEASE,4.4)";resolution:=optional,org.springframework.expression.
- spel;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springfr
- amework.expression.spel.standard;version="[4.3.19.RELEASE,4.4)";resol
- ution:=optional,org.springframework.expression.spel.support;version="
- [4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework.instru
- ment;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springfr
- amework.objenesis;version="[4.3.19.RELEASE,4.4)";resolution:=optional
- ,org.springframework.util;version="[4.3.19.RELEASE,4.4)",org.springfr
- amework.util.concurrent;version="[4.3.19.RELEASE,4.4)",org.springfram
- ework.util.xml;version="[4.3.19.RELEASE,4.4)",org.w3c.dom;resolution:
- =optional,org.xml.sax;resolution:=optional,com.ibm.websphere.manageme
- nt;resolution:=optional,edu.emory.mathcs.backport.java.util.concurren
- t;version="[3,4)";resolution:=optional,javax.inject;resolution:=optio
- nal,javax.jms;resolution:=optional,javax.persistence;resolution:=opti
- onal,javax.persistence.spi;resolution:=optional,org.hibernate.validat
- or.resourceloading;version="[4,6)";resolution:=optional,org.springfra
- mework.cglib.reflect;version="[4.3.19.RELEASE,4.4)",org.springframewo
- rk.orm.jpa.support;version="[4.3.19.RELEASE,4.4)";resolution:=optiona
- l</Import-Package>
-											</instructions>
 										</artifact>
 										<artifact>
 											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:sources:${springframework.version}</id>
@@ -1303,12 +964,12 @@
  nnel.socket.nio;resolution:=optional,io.netty.handler.codec.http;reso
  lution:=optional,io.netty.handler.ssl;resolution:=optional,io.netty.h
  andler.timeout;resolution:=optional,io.netty.util.concurrent;resoluti
- on:=optional,javax.activation;version="${activation.version}";resolution:=optional,javax.el;resolutio
+ on:=optional,javax.activation;resolution:=optional,javax.el;resolutio
  n:=optional,javax.faces.application;resolution:=optional,javax.faces.
  component;resolution:=optional,javax.faces.context;resolution:=option
  al,javax.faces.event;resolution:=optional,javax.imageio;resolution:=o
  ptional,javax.imageio.metadata;resolution:=optional,javax.imageio.str
- eam;resolution:=optional,javax.jws;version="1.1.0";resolution:=optional,javax.mail.in
+ eam;resolution:=optional,javax.jws;resolution:=optional,javax.mail.in
  ternet;resolution:=optional,javax.portlet;resolution:=optional,javax.
  servlet,javax.servlet.http,javax.servlet.annotation;resolution:=optio
  nal,javax.servlet.jsp.tagext;resolution:=optional,javax.validation;re
@@ -1319,8 +980,8 @@
  resolution:=optional,javax.xml.transform.dom;resolution:=optional,jav
  ax.xml.transform.sax;resolution:=optional,javax.xml.transform.stax;re
  solution:=optional,javax.xml.transform.stream;resolution:=optional,ja
- vax.xml.ws;version="${xml.ws.export.version}";resolution:=optional,javax.xml.ws.handler;version="${xml.ws.export.version}";resolution:=opti
+ vax.xml.ws;resolution:=optional,javax.xml.ws.handler;resolution:=opti
- onal,javax.xml.ws.soap;version="${xml.ws.export.version}";resolution:=optional,okhttp3;resolution:=optio
+ onal,javax.xml.ws.soap;resolution:=optional,okhttp3;resolution:=optio
  nal,org.aopalliance.aop;version="[1,2)",org.aopalliance.intercept;ver
  sion="[1,2)",org.apache.commons.fileupload;version="[1.3,2)";resoluti
  on:=optional,org.apache.commons.fileupload.disk;version="[1.3,2)";res
@@ -1431,127 +1092,6 @@ it also resolve issue confilic between eclipse runtime and tycho build
 											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:${springframework.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
-                                            <override>true</override>
-											<instructions>
-<!--export keep same original, copy here because tool will remake it-->
-											    <Export-Package>org.springframework.cache.caffeine;version="4.3.19.REL
- EASE";uses:="com.github.benmanes.caffeine.cache,org.springframework.c
- ache,org.springframework.cache.support",org.springframework.cache.ehc
- ache;version="4.3.19.RELEASE";uses:="net.sf.ehcache,net.sf.ehcache.bo
- otstrap,net.sf.ehcache.config,net.sf.ehcache.constructs.blocking,net.
- sf.ehcache.event,org.apache.commons.logging,org.springframework.beans
- .factory,org.springframework.cache,org.springframework.cache.transact
- ion,org.springframework.core.io",org.springframework.cache.guava;vers
- ion="4.3.19.RELEASE";uses:="com.google.common.cache,org.springframewo
- rk.cache,org.springframework.cache.support",org.springframework.cache
- .jcache;version="4.3.19.RELEASE";uses:="javax.cache,org.springframewo
- rk.beans.factory,org.springframework.cache,org.springframework.cache.
- support,org.springframework.cache.transaction",org.springframework.ca
- che.jcache.config;version="4.3.19.RELEASE";uses:="org.springframework
- .cache.annotation,org.springframework.cache.interceptor,org.springfra
- mework.cache.jcache.interceptor,org.springframework.context.annotatio
- n",org.springframework.cache.jcache.interceptor;version="4.3.19.RELEA
- SE";uses:="javax.cache.annotation,org.aopalliance.intercept,org.apach
- e.commons.logging,org.springframework.aop,org.springframework.aop.sup
- port,org.springframework.beans.factory,org.springframework.cache,org.
- springframework.cache.interceptor",org.springframework.cache.transact
- ion;version="4.3.19.RELEASE";uses:="org.springframework.beans.factory
- ,org.springframework.cache,org.springframework.cache.support",org.spr
- ingframework.mail;version="4.3.19.RELEASE";uses:="org.springframework
- .core",org.springframework.mail.javamail;version="4.3.19.RELEASE";use
- s:="javax.activation,javax.mail,javax.mail.internet,org.springframewo
- rk.beans.factory,org.springframework.core.io,org.springframework.mail
- ",org.springframework.scheduling.commonj;version="4.3.19.RELEASE";use
- s:="commonj.timers,commonj.work,javax.naming,org.springframework.bean
- s.factory,org.springframework.context,org.springframework.core.task,o
- rg.springframework.jndi,org.springframework.scheduling,org.springfram
- ework.util,org.springframework.util.concurrent",org.springframework.s
- cheduling.quartz;version="4.3.19.RELEASE";uses:="javax.sql,org.apache
- .commons.logging,org.quartz,org.quartz.impl.jdbcjobstore,org.quartz.s
- impl,org.quartz.spi,org.springframework.beans.factory,org.springframe
- work.beans.support,org.springframework.context,org.springframework.co
- re,org.springframework.core.io,org.springframework.core.task,org.spri
- ngframework.scheduling,org.springframework.transaction,org.springfram
- ework.util,org.springframework.util.concurrent",org.springframework.u
- i.freemarker;version="4.3.19.RELEASE";uses:="freemarker.cache,freemar
- ker.template,org.apache.commons.logging,org.springframework.beans.fac
- tory,org.springframework.context,org.springframework.core.io",org.spr
- ingframework.ui.jasperreports;version="4.3.19.RELEASE";uses:="net.sf.
- jasperreports.engine",org.springframework.ui.velocity;version="4.3.19
- .RELEASE";uses:="org.apache.commons.collections,org.apache.commons.lo
- gging,org.apache.velocity.app,org.apache.velocity.exception,org.apach
- e.velocity.runtime.resource,org.apache.velocity.runtime.resource.load
- er,org.springframework.beans.factory,org.springframework.context,org.
- springframework.core.io"</Export-Package>
-<!--refe: note 1-->
-											    <Import-Package>com.github.benmanes.caffeine.cache;resolution:=optiona
- l,javax.cache.processor;resolution:=optional,com.google.common.cache;
- resolution:=optional,com.google.common.util.concurrent;resolution:=op
- tional,commonj.timers;version="[1.1.0,2)";resolution:=optional,common
- j.work;version="[1.1.0,2)";resolution:=optional,freemarker.cache;vers
- ion="[2.3,3)";resolution:=optional,freemarker.template;version="[2.3,
- 3)";resolution:=optional,javax.activation;version="${activation.version}";resolution:=optional,javax.
- cache;resolution:=optional,javax.cache.annotation;resolution:=optiona
- l,javax.cache.spi;resolution:=optional,javax.mail;resolution:=optiona
- l,javax.mail.internet;resolution:=optional,javax.naming;resolution:=o
- ptional,javax.sql;resolution:=optional,net.sf.ehcache;version="[2,3)"
- ;resolution:=optional,net.sf.ehcache.bootstrap;version="[2,3)";resolu
- tion:=optional,net.sf.ehcache.config;version="[2,3)";resolution:=opti
- onal,net.sf.ehcache.constructs.blocking;version="[2,3)";resolution:=o
- ptional,net.sf.ehcache.event;version="[2,3)";resolution:=optional,net
- .sf.jasperreports.engine;version="[6,7)";resolution:=optional,net.sf.
- jasperreports.engine.data;version="[6,7)";resolution:=optional,net.sf
- .jasperreports.engine.export;version="[6,7)";resolution:=optional,org
- .aopalliance.aop;resolution:=optional,org.aopalliance.intercept;resol
- ution:=optional,org.apache.commons.collections;version="[3,4)";resolu
- tion:=optional,org.apache.commons.logging;version="[1.1.1,2)";resolut
- ion:=optional,org.apache.velocity;version="[1.7,2)";resolution:=optio
- nal,org.apache.velocity.app;version="[1.7,2)";resolution:=optional,or
- g.apache.velocity.context;version="[1.7,2)";resolution:=optional,org.
- apache.velocity.exception;version="[1.7,2)";resolution:=optional,org.
- apache.velocity.runtime;version="[1.7,2)";resolution:=optional,org.ap
- ache.velocity.runtime.log;version="[1.7,2)";resolution:=optional,org.
- apache.velocity.runtime.resource;version="[1.7,2)";resolution:=option
- al,org.apache.velocity.runtime.resource.loader;version="[1.7,2)";reso
- lution:=optional,org.quartz;version="[2,3)";resolution:=optional,org.
- quartz.impl;version="[2,3)";resolution:=optional,org.quartz.impl.jdbc
- jobstore;version="[2,3)";resolution:=optional,org.quartz.impl.trigger
- s;version="[2,3)";resolution:=optional,org.quartz.simpl;version="[2,3
- )";resolution:=optional,org.quartz.spi;version="[2,3)";resolution:=op
- tional,org.quartz.utils;version="[2,3)";resolution:=optional,org.quar
- tz.xml;version="[2,3)";resolution:=optional,org.springframework.aop;v
- ersion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframewor
- k.aop.framework;version="[4.3.19.RELEASE,4.4)";resolution:=optional,o
- rg.springframework.aop.support;version="[4.3.19.RELEASE,4.4)";resolut
- ion:=optional,org.springframework.beans;version="[4.3.19.RELEASE,4.4)
- ";resolution:=optional,org.springframework.beans.factory;version="[4.
- 3.19.RELEASE,4.4)";resolution:=optional,org.springframework.beans.sup
- port;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springfr
- amework.cache;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org
- .springframework.cache.annotation;version="[4.3.19.RELEASE,4.4)";reso
- lution:=optional,org.springframework.cache.interceptor;version="[4.3.
- 19.RELEASE,4.4)";resolution:=optional,org.springframework.cache.suppo
- rt;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springfram
- ework.context;version="[4.3.19.RELEASE,4.4)",org.springframework.cont
- ext.annotation;version="[4.3.19.RELEASE,4.4)",org.springframework.cor
- e;version="[4.3.19.RELEASE,4.4)",org.springframework.core.annotation;
- version="[4.3.19.RELEASE,4.4)",org.springframework.core.io;version="[
- 4.3.19.RELEASE,4.4)",org.springframework.core.io.support;version="[4.
- 3.19.RELEASE,4.4)",org.springframework.core.task;version="[4.3.19.REL
- EASE,4.4)",org.springframework.jdbc.datasource;version="[4.3.19.RELEA
- SE,4.4)";resolution:=optional,org.springframework.jdbc.support;versio
- n="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework.jnd
- i;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframe
- work.scheduling;version="[4.3.19.RELEASE,4.4)";resolution:=optional,o
- rg.springframework.scheduling.support;version="[4.3.19.RELEASE,4.4)";
- resolution:=optional,org.springframework.transaction;version="[4.3.19
- .RELEASE,4.4)";resolution:=optional,org.springframework.transaction.s
- upport;version="[4.3.19.RELEASE,4.4)";resolution:=optional,org.spring
- framework.util;version="[4.3.19.RELEASE,4.4)",org.springframework.uti
- l.concurrent;version="[4.3.19.RELEASE,4.4)",net.sf.ehcache.store;vers
- ion="[2,3)";resolution:=optional,org.springframework.context.expressi
- on;version="[4.3.19.RELEASE,4.4)"</Import-Package>
-											</instructions>
 										</artifact>
 										<artifact>
 											<id>org.springframework:spring-jcl:jar:5.1.1.RELEASE</id>

org.idempiere.webservices/META-INF/MANIFEST.MF

@@ -6,8 +6,7 @@ Bundle-Version: 5.1.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Service-Component: OSGI-INF/ws_modelfactory.xml
-Import-Package: javax.activation;version="1.1.0",
+Import-Package: javax.activation,
- javax.annotation;version="1.3.2",
  javax.jws;version="1.1.0",
  javax.jws.soap;version="1.1.0",
  javax.mail;version="1.4.1",
@@ -92,8 +91,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  javax.xml.soap-api;bundle-version="1.4.0",
  org.apache.axis;bundle-version="1.4.0",
  javax.xml.soap;bundle-version="1.3.0",
- javax.annotation-api;bundle-version="1.3.2",
+ jaxws-api;bundle-version="2.3.1",
- jaxws-api;bundle-version="2.3.1"
+ javax.annotation-api;bundle-version="1.3.2"
 Bundle-ClassPath: .,
  WEB-INF/lib/idempiere-xmlbeans.jar
 Export-Package: org.compiere.model,