midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3808:collect info to move idempiere to jdk-11 (spifly source for debug) 

https://issues.apache.org/jira/browse/ARIES-1859
ignore fitnesse output when run
org.springframework.http isn't modify
This commit is contained in:
hieplq 2018-11-11 07:00:26 +07:00
parent 3052c91c9b
commit 4a3c3e7a7e
2 changed files with 26 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -9,6 +9,7 @@ org.adempiere.webstore/bin
org.idempiere.hazelcast.service.config/bin org.idempiere.hazelcast.service.config/bin
*/target */target
runtime-server.product runtime-server.product
org.idempiere.fitnesse.server/FitNesseRoot
syntax: regexp syntax: regexp
^adempiere$ ^adempiere$
^org\.adempiere\.install/lib$ ^org\.adempiere\.install/lib$

304
org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
View File

@ -774,284 +774,6 @@
<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}</id> <id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}</id>
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<override>true</override>
<instructions>
<!--export keep same original, copy here because tool will remake it-->
<Export-Package>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"</Export-Package>
<!--refe: note 1-->
<Import-Package>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;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;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;resolution:=optional,javax.xml.ws.handler;resolution:=opti
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
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
</Import-Package>
<!-- <!--
note 1: about javax.activity,javax.jws and javax.xml.ws note 1: about javax.activity,javax.jws and javax.xml.ws
javax.jws is depricate package, so need replace with javax.jws-api javax.jws is depricate package, so need replace with javax.jws-api
@ -1069,7 +791,6 @@ same for javax.xml.ws.*
it also resolve issue confilic between eclipse runtime and tycho build it also resolve issue confilic between eclipse runtime and tycho build
--> -->
</instructions>
</artifact> </artifact>
<artifact> <artifact>
<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}</id> <id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}</id>
@ -1651,6 +1372,31 @@ it also resolve issue confilic between eclipse runtime and tycho build
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<executions>
<execution>
<id>replace-source-of-org.apache.aries.spifly.dynamic.bundle</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<!-- binary of org.apache.aries.spifly.dynamic.bundle combine from org.apache.aries.spifly.core-internal org.apache.aries.spifly.weaver-internal and org.apache.aries.spifly.dynamic.bundle but on maven source come only org.apache.aries.spifly.dynamic.bundle
so i recreate source bundle to help debug
https://issues.apache.org/jira/browse/ARIES-1859 -->
<url>${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.0.14.jar</url>
<unpack>false</unpack>
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
<skipCache>true</skipCache>
<overwrite>true</overwrite>
<retries>5</retries>
</configuration>
</execution>
</executions>
</plugin>
<!-- update P2 after add zk lib --> <!-- update P2 after add zk lib -->
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>