diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index cc7a8d75f0..0ade05e04b 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -365,13 +365,6 @@ version="0.0.0" unpack="false"/> - - - - - - + + diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index c914069787..25fc81b991 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -58,12 +58,13 @@ 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", javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", - javax.xml.bind, + javax.xml.bind;version="2.3.0", junit.framework;version="3.8.2";resolution:=optional, junit.textui;version="3.8.2";resolution:=optional, net.sf.cglib.proxy, @@ -123,8 +124,6 @@ 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", - com.sun.activation.javax.activation;bundle-version="1.2.0", - jaxb-api;bundle-version="2.3.1" + org.apache.poi.poi-ooxml;bundle-version="3.15.0" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 85c3c588ed..ba43ff9976 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -2,7 +2,7 @@ - + @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 8e69e34d29..35e0997f41 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -162,13 +162,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 167d1785ec..200abf7ced 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -5,15 +5,14 @@ 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.annotation, + javax.activation;version="1.1.0", javax.annotation.processing, - javax.annotation.security;version="1.2.0", - javax.annotation.sql;version="1.2.0", javax.servlet, javax.servlet.annotation;version="3.1.0", javax.servlet.http, javax.servlet.jsp.resources;version="2.3.0", javax.servlet.resources;version="3.1.0", + javax.xml.bind;version="2.3.0", net.sf.jasperreports.engine, net.sf.jasperreports.engine.export, net.sf.jasperreports.engine.util, @@ -153,8 +152,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", - com.sun.activation.javax.activation;bundle-version="1.2.0", - jaxb-api;bundle-version="2.3.1" + javax.annotation-api;bundle-version="1.3.2" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true Web-ContextPath: webui 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 a4273a355e..b8a9e390c6 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 @@ -27,8 +27,11 @@ 20171018 1.7.25 2.3.1 + 2.4 3.2.6 - 1.2.1 + 3.1.17 + 1.2.0 + 1.3.2 @@ -113,14 +116,47 @@ false - javax.annotation:javax.annotation-api:jar:1.3.2 + javax.annotation:javax.annotation-api:jar:${annotation.version} true false + com.sun.mail:javax.mail:jar:1.6.2 true false + true + + + * + + 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" + + 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 + - com.sun.activation:javax.activation:jar:1.2.0 + com.sun.activation:javax.activation:jar:${activation.version} true false @@ -436,6 +472,26 @@ jaxws-api ${xml.ws.version} + + javax.xml.ws;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.bind.anno + tation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,j + avax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom",javax.xml.ws.handl + er;version="${xml.ws.export.version}";uses:="javax.xml.namespace,javax.xml.ws",javax.xml.ws.handler.soap + ;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.w + s.handler",javax.xml.ws.http;version="${xml.ws.export.version}";uses:="javax.xml.ws",javax.xml.ws.soap;version="${xml.ws.export.version}";u + ses:="javax.xml.soap,javax.xml.ws,javax.xml.ws.spi",javax.xml.ws.spi;version="${xml.ws.export.version}"; + uses:="javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.x + ml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom",jav + ax.xml.ws.spi.http;version="${xml.ws.export.version}",javax.xml.ws.wsaddressing;version="${xml.ws.export.version}";uses:="javax.xml.bind.an + notation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c + .dom" + + org.glassfish.hk2.osgiresourcelocator + + javax.xml.bind;version="[2.3,3)",javax.xml.bind.annota + tion;version="[2.3,3)",javax.xml.namespace,javax.xml.soap;version="[1 + .4,2)",javax.xml.transform,javax.xml.transform.stream,org.w3c.dom + osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9.0))" @@ -526,11 +582,6 @@ true false - - org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.version} - true - false - org.apache.cxf:cxf-rt-rs-service-description:jar:${apache.cxf.version} true @@ -547,12 +598,19 @@ false - org.apache.cxf:cxf-rt-databinding-xmlbeans:jar:3.1.17 + org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.databinding.version} + true false - org.apache.cxf:cxf-rt-bindings-object:jar:3.1.17 + org.apache.cxf:cxf-rt-databinding-xmlbeans:jar:${apache.cxf.databinding.version} + true + false + + + org.apache.cxf:cxf-rt-bindings-object:jar:${apache.cxf.databinding.version} true false @@ -600,6 +658,16 @@ javax.xml.soap:javax.xml.soap-api:jar:1.4.0 true false + true + + + javax.xml.soap;uses:="javax.activation,javax.xml.names + pace,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom";version + ="1.4.0" + + javax.activation;version="${activation.version}",javax.xml.namespace,javax.xml.transfo + rm,javax.xml.transform.dom,org.w3c.dom + javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1 @@ -612,14 +680,48 @@ false - org.springframework:spring-beans:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:${springframework.version} + false false - org.springframework:spring-core:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:sources:${springframework.version} + false false + true + + + + + + org.apache.servicemix.bundles.spring-beans.source + spring-expression.source + org.apache.servicemix.bundles.spring-beans;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:jar:${springframework.version} + false + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-core.source + spring-expression.source + org.apache.servicemix.bundles.spring-core;version="${springframework.version}";roots:="." + - org.springframework:spring-context:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:${springframework.version} + false + false + true + +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" +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 + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-context.source + spring-expression.source + org.apache.servicemix.bundles.spring-context;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:jar:${springframework.version} + false false - org.springframework:spring-asm:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-expression.source + spring-expression.source + org.apache.servicemix.bundles.spring-expression;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-aop.source + spring-aop.source + org.apache.servicemix.bundles.spring-aop;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:jar:${springframework.version} + false false - org.springframework:spring-expression:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:sources:${springframework.version} + false false + true + + + + + + org.apache.servicemix.bundles.spring-web.source + spring-web.source + org.apache.servicemix.bundles.spring-web;version="${springframework.version}";roots:="." + - org.springframework:spring-aop:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version} + false false + true + + + org.springframework.http;version="4.3.19.RELEASE";uses + :="org.springframework.core.io,org.springframework.core.io.support,or + g.springframework.util",org.springframework.http.client;version="4.3. + 19.RELEASE";uses:="com.squareup.okhttp,io.netty.channel,io.netty.chan + nel.socket,io.netty.handler.ssl,okhttp3,org.apache.http.client,org.ap + ache.http.client.config,org.apache.http.client.methods,org.apache.htt + p.impl.client,org.apache.http.impl.nio.client,org.apache.http.nio.cli + ent,org.apache.http.protocol,org.springframework.beans.factory,org.sp + ringframework.core.task,org.springframework.http,org.springframework. + util.concurrent",org.springframework.http.client.support;version="4.3 + .19.RELEASE";uses:="org.apache.commons.logging,org.springframework.be + ans.factory,org.springframework.http,org.springframework.http.client" + ,org.springframework.http.converter;version="4.3.19.RELEASE";uses:="j + avax.imageio,org.apache.commons.logging,org.springframework.core,org. + springframework.core.convert,org.springframework.core.io,org.springfr + amework.core.io.support,org.springframework.http,org.springframework. + util",org.springframework.http.converter.feed;version="4.3.19.RELEASE + ";uses:="com.rometools.rome.feed,com.rometools.rome.feed.atom,com.rom + etools.rome.feed.rss,org.springframework.http,org.springframework.htt + p.converter",org.springframework.http.converter.json;version="4.3.19. + RELEASE";uses:="com.fasterxml.jackson.annotation,com.fasterxml.jackso + n.core,com.fasterxml.jackson.databind,com.fasterxml.jackson.databind. + cfg,com.fasterxml.jackson.databind.deser,com.fasterxml.jackson.databi + nd.introspect,com.fasterxml.jackson.databind.jsontype,com.fasterxml.j + ackson.databind.ser,com.fasterxml.jackson.databind.util,com.google.gs + on,com.google.gson.reflect,org.springframework.beans.factory,org.spri + ngframework.beans.factory.config,org.springframework.context,org.spri + ngframework.http,org.springframework.http.converter",org.springframew + ork.http.converter.protobuf;version="4.3.19.RELEASE";uses:="com.googl + e.protobuf,org.springframework.http,org.springframework.http.converte + r",org.springframework.http.converter.support;version="4.3.19.RELEASE + ";uses:="org.springframework.http.converter",org.springframework.http + .converter.xml;version="4.3.19.RELEASE";uses:="com.fasterxml.jackson. + databind,javax.xml.bind,javax.xml.stream,javax.xml.transform,org.spri + ngframework.http,org.springframework.http.converter,org.springframewo + rk.http.converter.json,org.springframework.oxm",org.springframework.h + ttp.server;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servle + t.http,org.springframework.http",org.springframework.remoting.caucho; + version="4.3.19.RELEASE";uses:="com.caucho.burlap.client,com.caucho.h + essian.client,com.caucho.hessian.io,com.caucho.hessian.server,com.sun + .net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance.inte + rcept,org.springframework.beans.factory,org.springframework.remoting, + org.springframework.remoting.support,org.springframework.web",org.spr + ingframework.remoting.httpinvoker;version="4.3.19.RELEASE";uses:="com + .sun.net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance. + intercept,org.apache.commons.logging,org.apache.http,org.apache.http. + client,org.apache.http.client.config,org.apache.http.client.methods,o + rg.springframework.beans.factory,org.springframework.remoting,org.spr + ingframework.remoting.rmi,org.springframework.remoting.support,org.sp + ringframework.web",org.springframework.remoting.jaxws;version="4.3.19 + .RELEASE";uses:="com.sun.net.httpserver,javax.jws,javax.xml.namespace + ,javax.xml.soap,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.soap,o + rg.aopalliance.intercept,org.apache.commons.logging,org.springframewo + rk.beans.factory,org.springframework.core.io,org.springframework.remo + ting.soap",org.springframework.web;version="4.3.19.RELEASE";uses:="ja + vax.servlet,javax.servlet.annotation,javax.servlet.http,org.springfra + mework.http",org.springframework.web.accept;version="4.3.19.RELEASE"; + uses:="javax.servlet,org.springframework.beans.factory,org.springfram + ework.core.io,org.springframework.http,org.springframework.web,org.sp + ringframework.web.context,org.springframework.web.context.request,org + .springframework.web.util",org.springframework.web.bind;version="4.3. + 19.RELEASE";uses:="javax.servlet,org.springframework.beans,org.spring + framework.core,org.springframework.validation,org.springframework.web + .multipart,org.springframework.web.util",org.springframework.web.bind + .annotation;version="4.3.19.RELEASE";uses:="org.springframework.core. + annotation,org.springframework.http,org.springframework.stereotype",o + rg.springframework.web.bind.annotation.support;version="4.3.19.RELEAS + E";uses:="org.springframework.core,org.springframework.http,org.sprin + gframework.http.converter,org.springframework.ui,org.springframework. + web.bind,org.springframework.web.bind.annotation,org.springframework. + web.bind.support,org.springframework.web.context.request",org.springf + ramework.web.bind.support;version="4.3.19.RELEASE";uses:="javax.valid + ation,org.springframework.beans,org.springframework.core,org.springfr + amework.core.convert,org.springframework.validation,org.springframewo + rk.web.bind,org.springframework.web.context,org.springframework.web.c + ontext.request",org.springframework.web.client;version="4.3.19.RELEAS + E";uses:="org.springframework.core,org.springframework.core.task,org. + springframework.http,org.springframework.http.client,org.springframew + ork.http.client.support,org.springframework.http.converter,org.spring + framework.util.concurrent,org.springframework.web.util",org.springfra + mework.web.client.support;version="4.3.19.RELEASE";uses:="org.apache. + commons.logging,org.springframework.http.client,org.springframework.w + eb.client",org.springframework.web.context;version="4.3.19.RELEASE";u + ses:="javax.servlet,org.apache.commons.logging,org.springframework.be + ans.factory,org.springframework.context,org.springframework.core.env, + org.springframework.web",org.springframework.web.context.annotation;v + ersion="4.3.19.RELEASE";uses:="org.springframework.context.annotation + ,org.springframework.core.annotation",org.springframework.web.context + .request;version="4.3.19.RELEASE";uses:="javax.faces.context,javax.se + rvlet,javax.servlet.http,org.apache.log4j,org.springframework.beans.f + actory,org.springframework.beans.factory.config,org.springframework.h + ttp,org.springframework.ui",org.springframework.web.context.request.a + sync;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servlet.http + ,org.springframework.beans.factory,org.springframework.core.task,org. + springframework.web.context.request",org.springframework.web.context. + support;version="4.3.19.RELEASE";uses:="groovy.lang,javax.servlet,jav + ax.servlet.http,org.apache.commons.logging,org.springframework.beans, + org.springframework.beans.factory,org.springframework.beans.factory.c + onfig,org.springframework.beans.factory.groovy,org.springframework.be + ans.factory.support,org.springframework.beans.factory.xml,org.springf + ramework.context,org.springframework.context.annotation,org.springfra + mework.context.support,org.springframework.core.env,org.springframewo + rk.core.io,org.springframework.core.io.support,org.springframework.ui + .context,org.springframework.web.context",org.springframework.web.cor + s;version="4.3.19.RELEASE";uses:="javax.servlet.http,org.springframew + ork.http,org.springframework.http.server,org.springframework.util,org + .springframework.web.util",org.springframework.web.filter;version="4. + 3.19.RELEASE";uses:="javax.servlet,javax.servlet.http,org.apache.comm + ons.logging,org.apache.log4j,org.springframework.beans,org.springfram + ework.beans.factory,org.springframework.context,org.springframework.c + ore.env,org.springframework.http,org.springframework.http.converter,o + rg.springframework.web.context,org.springframework.web.cors",org.spri + ngframework.web.jsf;version="4.3.19.RELEASE";uses:="javax.faces.appli + cation,javax.faces.context,javax.faces.event,org.springframework.bean + s.factory,org.springframework.web.context",org.springframework.web.js + f.el;version="4.3.19.RELEASE";uses:="javax.el,org.apache.commons.logg + ing,org.springframework.beans.factory,org.springframework.beans.facto + ry.access.el,org.springframework.web.context",org.springframework.web + .method;version="4.3.19.RELEASE";uses:="org.apache.commons.logging,or + g.springframework.beans.factory,org.springframework.context,org.sprin + gframework.core,org.springframework.core.annotation,org.springframewo + rk.http,org.springframework.util",org.springframework.web.method.anno + tation;version="4.3.19.RELEASE";uses:="javax.servlet,org.apache.commo + ns.logging,org.springframework.beans,org.springframework.beans.factor + y.config,org.springframework.core,org.springframework.core.convert,or + g.springframework.util,org.springframework.web.bind,org.springframewo + rk.web.bind.support,org.springframework.web.context.request,org.sprin + gframework.web.method,org.springframework.web.method.support,org.spri + ngframework.web.util",org.springframework.web.method.support;version= + "4.3.19.RELEASE";uses:="org.apache.commons.logging,org.springframewor + k.core,org.springframework.core.convert,org.springframework.http,org. + springframework.ui,org.springframework.web.bind.support,org.springfra + mework.web.context.request,org.springframework.web.method,org.springf + ramework.web.util",org.springframework.web.multipart;version="4.3.19. + RELEASE";uses:="javax.servlet.http,org.springframework.core,org.sprin + gframework.core.io,org.springframework.http,org.springframework.util" + ,org.springframework.web.multipart.commons;version="4.3.19.RELEASE";u + ses:="javax.servlet,javax.servlet.http,org.apache.commons.fileupload, + org.apache.commons.fileupload.disk,org.apache.commons.logging,org.spr + ingframework.core.io,org.springframework.util,org.springframework.web + .context,org.springframework.web.multipart",org.springframework.web.m + ultipart.support;version="4.3.19.RELEASE";uses:="javax.servlet,javax. + servlet.http,org.springframework.beans.propertyeditors,org.springfram + ework.core,org.springframework.http,org.springframework.http.server,o + rg.springframework.util,org.springframework.web.filter,org.springfram + ework.web.multipart",org.springframework.web.util;version="4.3.19.REL + EASE";uses:="javax.servlet,javax.servlet.http,javax.servlet.jsp.tagex + t,org.apache.commons.logging,org.springframework.http,org.springframe + work.util" + + com.squareup.okhttp.internal.http;resolution:=optional + ,javax.net.ssl,okhttp3.internal.http;resolution:=optional,com.caucho. + burlap.client;version="[4,5)";resolution:=optional,com.caucho.burlap. + io;version="[4,5)";resolution:=optional,com.caucho.burlap.server;vers + ion="[4,5)";resolution:=optional,com.caucho.hessian;version="[4,5)";r + esolution:=optional,com.caucho.hessian.client;version="[4,5)";resolut + ion:=optional,com.caucho.hessian.io;version="[4,5)";resolution:=optio + nal,com.caucho.hessian.server;version="[4,5)";resolution:=optional,co + m.fasterxml.jackson.annotation;version="[2,3)";resolution:=optional,c + om.fasterxml.jackson.core;version="[2,3)";resolution:=optional,com.fa + sterxml.jackson.core.util;version="[2,3)";resolution:=optional,com.fa + sterxml.jackson.databind;version="[2,3)";resolution:=optional,com.fas + terxml.jackson.databind.cfg;version="[2,3)";resolution:=optional,com. + fasterxml.jackson.databind.deser;version="[2,3)";resolution:=optional + ,com.fasterxml.jackson.databind.introspect;version="[2,3)";resolution + :=optional,com.fasterxml.jackson.databind.jsontype;version="[2,3)";re + solution:=optional,com.fasterxml.jackson.databind.module;version="[2, + 3)";resolution:=optional,com.fasterxml.jackson.databind.ser;version=" + [2,3)";resolution:=optional,com.fasterxml.jackson.databind.type;versi + on="[2,3)";resolution:=optional,com.fasterxml.jackson.databind.util;v + ersion="[2,3)";resolution:=optional,com.fasterxml.jackson.dataformat. + xml;version="[2,3)";resolution:=optional,com.google.gson;version="[2. + 3,3)";resolution:=optional,com.google.gson.reflect;version="[2.3,3)"; + resolution:=optional,com.google.protobuf;version="[2.6,3)";resolution + :=optional,com.googlecode.protobuf.format;resolution:=optional,com.sq + uareup.okhttp;version="[2.4,3)";resolution:=optional,com.rometools.ro + me.feed;version="[1.5,2)";resolution:=optional,com.rometools.rome.fee + d.atom;version="[1.5,2)";resolution:=optional,com.rometools.rome.feed + .rss;version="[1.5,2)";resolution:=optional,com.rometools.rome.io;ver + sion="[1.5,2)";resolution:=optional,com.sun.net.httpserver;resolution + :=optional,groovy.lang;version="[2.4,3)";resolution:=optional,io.nett + y.bootstrap;resolution:=optional,io.netty.buffer;resolution:=optional + ,io.netty.channel;resolution:=optional,io.netty.channel.nio;resolutio + n:=optional,io.netty.channel.socket;resolution:=optional,io.netty.cha + 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 + 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 + 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 + solution:=optional,javax.xml.bind;resolution:=optional,javax.xml.bind + .annotation;resolution:=optional,javax.xml.namespace;resolution:=opti + onal,javax.xml.parsers;resolution:=optional,javax.xml.soap;resolution + :=optional,javax.xml.stream;resolution:=optional,javax.xml.transform; + 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 + onal,javax.xml.ws.soap;version="${xml.ws.export.version}";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 + olution:=optional,org.apache.commons.fileupload.servlet;version="[1.3 + ,2)";resolution:=optional,org.apache.commons.logging;version="[1.1.1, + 2)",org.apache.http;version="[4,5)";resolution:=optional,org.apache.h + ttp.client;version="[4,5)";resolution:=optional,org.apache.http.clien + t.config;version="[4,5)";resolution:=optional,org.apache.http.client. + methods;version="[4,5)";resolution:=optional,org.apache.http.client.p + rotocol;version="[4,5)";resolution:=optional,org.apache.http.concurre + nt;version="[4,5)";resolution:=optional,org.apache.http.config;versio + n="[4,5)";resolution:=optional,org.apache.http.conn;version="[4,5)";r + esolution:=optional,org.apache.http.conn.socket;version="[4,5)";resol + ution:=optional,org.apache.http.conn.ssl;version="[4,5)";resolution:= + optional,org.apache.http.entity;version="[4,5)";resolution:=optional, + org.apache.http.impl.client;version="[4,5)";resolution:=optional,org. + apache.http.impl.conn;version="[4,5)";resolution:=optional,org.apache + .http.impl.nio.client;version="[4,5)";resolution:=optional,org.apache + .http.message;version="[4,5)";resolution:=optional,org.apache.http.ni + o.client;version="[4,5)";resolution:=optional,org.apache.http.nio.ent + ity;version="[4,5)";resolution:=optional,org.apache.http.params;versi + on="[4,5)";resolution:=optional,org.apache.http.protocol;version="[4, + 5)";resolution:=optional,org.apache.http.util;version="[4,5)";resolut + ion:=optional,org.apache.log4j;version="[1.2,2)";resolution:=optional + ,org.springframework.aop.framework;version="[4.3.19.RELEASE,4.4)",org + .springframework.aop.support;version="[4.3.19.RELEASE,4.4)",org.sprin + gframework.beans;version="[4.3.19.RELEASE,4.4)",org.springframework.b + eans.factory;version="[4.3.19.RELEASE,4.4)",org.springframework.beans + .factory.access;version="[4.3.19.RELEASE,4.4)",org.springframework.be + ans.factory.access.el;version="[4.3.19.RELEASE,4.4)",org.springframew + ork.beans.factory.annotation;version="[4.3.19.RELEASE,4.4)",org.sprin + gframework.beans.factory.config;version="[4.3.19.RELEASE,4.4)",org.sp + ringframework.beans.factory.groovy;version="[4.3.19.RELEASE,4.4)",org + .springframework.beans.factory.support;version="[4.3.19.RELEASE,4.4)" + ,org.springframework.beans.factory.xml;version="[4.3.19.RELEASE,4.4)" + ,org.springframework.beans.propertyeditors;version="[4.3.19.RELEASE,4 + .4)",org.springframework.context;version="[4.3.19.RELEASE,4.4)",org.s + pringframework.context.access;version="[4.3.19.RELEASE,4.4)",org.spri + ngframework.context.annotation;version="[4.3.19.RELEASE,4.4)",org.spr + ingframework.context.i18n;version="[4.3.19.RELEASE,4.4)",org.springfr + amework.context.support;version="[4.3.19.RELEASE,4.4)",org.springfram + ework.core;version="[4.3.19.RELEASE,4.4)",org.springframework.core.an + notation;version="[4.3.19.RELEASE,4.4)",org.springframework.core.conv + ert;version="[4.3.19.RELEASE,4.4)",org.springframework.core.env;versi + on="[4.3.19.RELEASE,4.4)",org.springframework.core.io;version="[4.3.1 + 9.RELEASE,4.4)",org.springframework.core.io.support;version="[4.3.19. + RELEASE,4.4)",org.springframework.core.task;version="[4.3.19.RELEASE, + 4.4)",org.springframework.format.support;version="[4.3.19.RELEASE,4.4 + )";resolution:=optional,org.springframework.jndi;version="[4.3.19.REL + EASE,4.4)";resolution:=optional,org.springframework.oxm;version="[4.3 + .19.RELEASE,4.4)";resolution:=optional,org.springframework.remoting;v + ersion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframewor + k.remoting.rmi;version="[4.3.19.RELEASE,4.4)";resolution:=optional,or + g.springframework.remoting.soap;version="[4.3.19.RELEASE,4.4)";resolu + tion:=optional,org.springframework.remoting.support;version="[4.3.19. + RELEASE,4.4)";resolution:=optional,org.springframework.stereotype;ver + sion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework. + ui;version="[4.3.19.RELEASE,4.4)",org.springframework.ui.context;vers + ion="[4.3.19.RELEASE,4.4)",org.springframework.ui.context.support;ver + sion="[4.3.19.RELEASE,4.4)",org.springframework.util;version="[4.3.19 + .RELEASE,4.4)",org.springframework.util.comparator;version="[4.3.19.R + ELEASE,4.4)",org.springframework.util.concurrent;version="[4.3.19.REL + EASE,4.4)",org.springframework.validation;version="[4.3.19.RELEASE,4. + 4)",org.springframework.validation.annotation;version="[4.3.19.RELEAS + E,4.4)",org.springframework.validation.support;version="[4.3.19.RELEA + SE,4.4)",org.xml.sax;resolution:=optional,org.xml.sax.helpers;resolut + ion:=optional,org.w3c.dom;resolution:=optional,org.joda.time;version= + "[2,3)";resolution:=optional,org.joda.time.format;version="[2,3)";res + olution:=optional + + + - org.springframework:spring-web:jar:${springframework.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version} + false false + true + + + + + + org.apache.servicemix.bundles.spring-context-support.source + spring-context-support.source + org.apache.servicemix.bundles.spring-context-support;version="${springframework.version}";roots:="." + - org.springframework.osgi:spring-osgi-extender:jar:${spring.osgi.version} - true + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:${springframework.version} + false false + true + + + 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" + + 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)" + - org.springframework.osgi:spring-osgi-core:jar:${spring.osgi.version} - true - false - - - org.springframework.osgi:spring-osgi-io:jar:${spring.osgi.version} + org.springframework:spring-jcl:jar:5.1.1.RELEASE true false diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index c61a3349e0..6cde96a11b 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,4 +1,4 @@ - + @@ -46,7 +46,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -761,7 +761,7 @@ - + @@ -978,8 +978,8 @@ - - + + @@ -1050,35 +1050,31 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 5f61fb708a..aa14d109a9 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -20,7 +20,7 @@ 3.1.1 1.4.1 1.0.0 - 3.1.4.RELEASE + 4.3.19.RELEASE_1 8.1.12.v20180117 RELEASE731 diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index cb398ab5be..112dd38a4a 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -6,12 +6,15 @@ 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, - javax.annotation, +Import-Package: javax.activation;version="1.1.0", + 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", javax.mail.internet;version="1.5", javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", + javax.xml.bind;version="2.3.0", net.sf.jasperreports.engine, net.sf.jasperreports.engine.base, net.sf.jasperreports.engine.util, @@ -60,7 +63,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.neethi;bundle-version="3.1.1", org.apache.ws.xmlschema.core;bundle-version="2.2.3", org.apache.commons.discovery;bundle-version="0.5.0", - javax.ws.rs.jsr311-api;bundle-version="1.1.1", stax2-api;bundle-version="4.1.0", org.apache.cxf.cxf-rt-frontend-jaxrs;bundle-version="3.2.6", org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.2.6", @@ -70,31 +72,28 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.2.6", org.apache.cxf.cxf-rt-transports-http;bundle-version="3.2.6", org.apache.cxf.cxf-rt-wsdl;bundle-version="3.2.6", - jaxws-api;bundle-version="0.0.0", - org.springframework.aop;bundle-version="3.1.4", - org.springframework.beans;bundle-version="3.1.4", - org.springframework.core;bundle-version="3.1.4", - org.springframework.expression;bundle-version="3.1.4", - org.springframework.osgi.core;bundle-version="1.2.1", - org.springframework.osgi.extender;bundle-version="1.2.1", - org.springframework.osgi.io;bundle-version="1.2.1", - org.springframework.web;bundle-version="3.1.4", - org.springframework.asm;bundle-version="3.1.4", - org.springframework.context;bundle-version="3.1.4", org.aopalliance;bundle-version="1.0.0", org.apache.xml.resolver;bundle-version="1.2.0", org.apache.cxf.cxf-rt-transports-http-jetty;bundle-version="3.2.6", org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.2.6", org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6", - javax.wsdl;bundle-version="1.6.2", - org.apache.axis;bundle-version="1.4.0", - javax.xml.soap;bundle-version="1.3.0", - javax.xml.rpc;bundle-version="1.1.0", org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17", org.apache.xmlbeans;bundle-version="3.0.1", - javax.jws;bundle-version="2.0.0", - org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.2.6", - javax.ws.rs-api;bundle-version="2.1.99" + javax.ws.rs-api;bundle-version="2.1.99", + org.apache.servicemix.bundles.spring-aop, + org.apache.servicemix.bundles.spring-beans, + org.apache.servicemix.bundles.spring-context, + org.apache.servicemix.bundles.spring-context-support, + org.apache.servicemix.bundles.spring-core, + org.apache.servicemix.bundles.spring-expression, + org.springframework.spring-jcl;bundle-version="5.1.1", + org.apache.servicemix.bundles.spring-web, + org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", + 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" Bundle-ClassPath: ., WEB-INF/lib/idempiere-xmlbeans.jar Export-Package: org.compiere.model,