From 4a3c3e7a7e70abbec59b70b38602a26255d2ca34 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 11 Nov 2018 07:00:26 +0700 Subject: [PATCH 01/16] 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 --- .hgignore | 1 + .../org.idempiere.maven.to.p2/pom.xml | 304 ++---------------- 2 files changed, 26 insertions(+), 279 deletions(-) diff --git a/.hgignore b/.hgignore index bce765a476..31dc9e41f1 100644 --- a/.hgignore +++ b/.hgignore @@ -9,6 +9,7 @@ org.adempiere.webstore/bin org.idempiere.hazelcast.service.config/bin */target runtime-server.product +org.idempiere.fitnesse.server/FitNesseRoot syntax: regexp ^adempiere$ ^org\.adempiere\.install/lib$ 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 b231173ea6..fd6c31364b 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 @@ -774,284 +774,6 @@ 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;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 - - org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version} @@ -1651,6 +1372,31 @@ it also resolve issue confilic between eclipse runtime and tycho build + + com.googlecode.maven-download-plugin + download-maven-plugin + + + replace-source-of-org.apache.aries.spifly.dynamic.bundle + package + + wget + + + + ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.0.14.jar + false + ${project.build.directory}/repository/plugins + true + true + 5 + + + + + org.eclipse.tycho.extras From ce85c722611f867f0dba61b6cb12378a66c674e5 Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 13 Nov 2018 12:01:10 +0700 Subject: [PATCH 02/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (zk8.6) update zk to zk8.6 --- .../server.product.launch | 4 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 3 +- .../org.idempiere.maven.to.p2/pom.xml | 25 ++- .../org.idempiere.p2.targetplatform.target | 168 +++++++++--------- org.idempiere.parent/pom.xml | 2 +- org.idempiere.zk-feature/feature.xml | 7 + org.idempiere.zk.extra/.classpath | 1 + org.idempiere.zk.extra/META-INF/MANIFEST.MF | 59 +++--- org.idempiere.zk.extra/build.properties | 3 +- org.idempiere.zk.extra/pom.xml | 11 +- 10 files changed, 164 insertions(+), 119 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index e35a28c593..c94d776ec9 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index b6a27d5fe0..2e902b8f4c 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -154,7 +154,8 @@ 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.activation;bundle-version="1.1.0" + javax.activation;bundle-version="1.1.0", + zkwebfragment 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 fd6c31364b..466f3f6ad9 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 @@ -10,7 +10,7 @@ org.idempiere.maven.to.p2 pom - https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.0.zip + https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0/zk-bin-osgi-8.6.0.zip 1.1.3.v20160715 8.5.33 @@ -914,6 +914,16 @@ it also resolve issue confilic between eclipse runtime and tycho build zcommon.source + + org.zkoss.zk:zkwebfragment:jar:sources:${zk.version} + false + false + + zkwebfragment;version="${zk.version}";roots:="." + zkwebfragment + zkwebfragment.source + + org.javassist:javassist:jar:sources:${zk.javassist.src.version} false @@ -1010,6 +1020,15 @@ it also resolve issue confilic between eclipse runtime and tycho build zcommon + + org.zkoss.zk:zkwebfragment:${zk.version} + false + false + + zkwebfragment + zkwebfragment + + @@ -1345,6 +1364,10 @@ it also resolve issue confilic between eclipse runtime and tycho build ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zweb.osgi.jar ${project.build.directory}/repository/plugins/zweb_${zk.version}.jar + + ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkwebfragment.osgi.jar + ${project.build.directory}/repository/plugins/zkwebfragment_${zk.version}.jar + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index b7e6cd38bd..e60160ef4d 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -764,6 +764,14 @@ + + + + + + + + @@ -792,82 +800,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -924,6 +862,8 @@ + + @@ -940,6 +880,10 @@ + + + + @@ -950,10 +894,32 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1012,8 +978,30 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1027,6 +1015,7 @@ + @@ -1045,35 +1034,38 @@ + + + + + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index d59b3a8290..897dc38df0 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -15,7 +15,7 @@ UTF-8 9.4.12.v20180830 6.7.0 - 8.5.0 + 8.6.0 3.23.1-GA 3.1.1 1.4.1 diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml index 4eb4cc381a..ed142ded2e 100644 --- a/org.idempiere.zk-feature/feature.xml +++ b/org.idempiere.zk-feature/feature.xml @@ -101,4 +101,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath index 85036c7cc4..92d760e60b 100644 --- a/org.idempiere.zk.extra/.classpath +++ b/org.idempiere.zk.extra/.classpath @@ -13,5 +13,6 @@ + diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index abb07d53ed..0f0aa50b81 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Bundle-ClassPath: ., lib/closure-compiler.jar, lib/gmapsz.jar, lib/timelinez.jar, - lib/timeplotz.jar + lib/timeplotz.jar, + lib/iceblue_c.jar Export-Package: com.google.common.annotations, com.google.common.base, com.google.common.cache, @@ -96,15 +97,18 @@ Export-Package: com.google.common.annotations, org.zkoss.gmaps, org.zkoss.gmaps.event, org.zkoss.theme.breeze, + org.zkoss.theme.iceblue_c, org.zkoss.zul.impl, web.breeze.js.zkex.grid.css, web.breeze.js.zkex.inp.css, web.breeze.js.zkex.layout.css, web.breeze.js.zkex.menu.css, + web.breeze.js.zkmax.barscanner.css, web.breeze.js.zkmax.big.css, web.breeze.js.zkmax.inp.css, web.breeze.js.zkmax.inp.ext, web.breeze.js.zkmax.layout.css, + web.breeze.js.zkmax.med.css, web.breeze.js.zkmax.nav.css, web.breeze.js.zkmax.wgt.css, web.breeze.js.zul.box.css, @@ -121,37 +125,48 @@ Export-Package: com.google.common.annotations, web.breeze.zkex.img.colorbox, web.breeze.zkmax.css, web.breeze.zkmax.img.big, - web.breeze.zkmax.img.inp, - web.breeze.zkmax.img.tablet, web.breeze.zkmax.img.tablet.big, web.breeze.zkmax.img.tablet.colorbox, - web.breeze.zkmax.img.tablet.grid, - web.breeze.zkmax.img.tablet.inp, web.breeze.zkmax.img.tablet.layout, - web.breeze.zkmax.img.tablet.menu, - web.breeze.zkmax.img.tablet.paging, - web.breeze.zkmax.img.tablet.popup, - web.breeze.zkmax.img.tablet.tab, - web.breeze.zkmax.img.tablet.tree, - web.breeze.zkmax.img.tablet.wnd, web.breeze.zul.css, web.breeze.zul.img, - web.breeze.zul.img.button, web.breeze.zul.img.common, - web.breeze.zul.img.errbox, web.breeze.zul.img.grid, - web.breeze.zul.img.input, - web.breeze.zul.img.layout, - web.breeze.zul.img.menu, web.breeze.zul.img.misc, web.breeze.zul.img.msgbox, - web.breeze.zul.img.paging, - web.breeze.zul.img.popup, web.breeze.zul.img.slider, - web.breeze.zul.img.splt, - web.breeze.zul.img.tab, - web.breeze.zul.img.tree, - web.breeze.zul.img.wnd, + web.iceblue_c.js.zkex.grid.css, + web.iceblue_c.js.zkex.inp.css, + web.iceblue_c.js.zkex.layout.css, + web.iceblue_c.js.zkex.menu.css, + web.iceblue_c.js.zkmax.barscanner.css, + web.iceblue_c.js.zkmax.big.css, + web.iceblue_c.js.zkmax.inp.css, + web.iceblue_c.js.zkmax.inp.ext, + web.iceblue_c.js.zkmax.layout.css, + web.iceblue_c.js.zkmax.med.css, + web.iceblue_c.js.zkmax.nav.css, + web.iceblue_c.js.zkmax.wgt.css, + web.iceblue_c.js.zul.box.css, + web.iceblue_c.js.zul.db.css, + web.iceblue_c.js.zul.grid.css, + web.iceblue_c.js.zul.inp.css, + web.iceblue_c.js.zul.layout.css, + web.iceblue_c.js.zul.menu.css, + web.iceblue_c.js.zul.mesh.css, + web.iceblue_c.js.zul.sel.css, + web.iceblue_c.js.zul.tab.css, + web.iceblue_c.js.zul.wgt.css, + web.iceblue_c.js.zul.wnd.css, + web.iceblue_c.zkex.img.colorbox, + web.iceblue_c.zkmax.css, + web.iceblue_c.zkmax.img.tablet.layout, + web.iceblue_c.zul.css, + web.iceblue_c.zul.img.common, + web.iceblue_c.zul.img.grid, + web.iceblue_c.zul.img.misc, + web.iceblue_c.zul.img.msgbox, + web.iceblue_c.zul.img.slider, web.js.calendar, web.js.calendar.css, web.js.calendar.img, diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties index 34a18c798b..fdcd8cceab 100644 --- a/org.idempiere.zk.extra/build.properties +++ b/org.idempiere.zk.extra/build.properties @@ -7,4 +7,5 @@ bin.includes = META-INF/,\ lib/closure-compiler.jar,\ lib/gmapsz.jar,\ lib/timelinez.jar,\ - lib/timeplotz.jar + lib/timeplotz.jar,\ + lib/iceblue_c.jar diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml index 5ed5129c3f..b41320c124 100644 --- a/org.idempiere.zk.extra/pom.xml +++ b/org.idempiere.zk.extra/pom.xml @@ -27,7 +27,7 @@ org.zkoss.zkforge gmapsz - 3.0.4 + 3.0.5 org.zkoss.zkforge @@ -47,12 +47,17 @@ org.zkoss.theme breeze - 8.5.0 + ${zk.version} + + + org.zkoss.theme + iceblue_c + ${zk.version} com.google.javascript closure-compiler - v20181008 + v20181028 lib From b6bd9c4a4aff64e0db55a9c07803a689217e2133 Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 13 Nov 2018 16:28:06 +0700 Subject: [PATCH 03/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update jetty 9.4.13.v20181111) get jetty direct from maven so don't neet to wait p2 repository from jetty get asm direct from maven, so don't need to wait update from orbit --- .../server.product.launch | 4 +- .../org.idempiere.maven.to.p2/pom.xml | 282 +++++++++++++++++- .../org.idempiere.p2.targetplatform.target | 120 +++++++- org.idempiere.parent/pom.xml | 1 - 4 files changed, 387 insertions(+), 20 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index c94d776ec9..c1feb011e2 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + 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 466f3f6ad9..927103855d 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 @@ -12,6 +12,7 @@ https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0/zk-bin-osgi-8.6.0.zip + 9.4.13.v20181111 1.1.3.v20160715 8.5.33 8.1.12.v20180117 @@ -32,6 +33,7 @@ 3.1.17 1.2.0 1.3.2 + 7.0 @@ -49,6 +51,10 @@ https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0 p2 + + zkoss + http://mavensync.zkoss.org/maven2 + @@ -126,11 +132,6 @@ true false - org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version} true @@ -147,7 +148,7 @@ false - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14 + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.1 true false @@ -1195,6 +1196,273 @@ it also resolve issue confilic between eclipse runtime and tycho build + + org.idempiere.asm.feature + ${asm.version} + + Idempiere + feature group asm osgi bundle get from maven + Idempiere + GPL v2.1 + true + + + + org.ow2.asm:asm-commons:jar:${asm.version} + true + false + + + org.ow2.asm:asm-tree:jar:${asm.version} + true + false + + + org.ow2.asm:asm:jar:${asm.version} + true + false + + + org.ow2.asm:asm-analysis:jar:${asm.version} + true + false + + + org.ow2.asm:asm-util:jar:${asm.version} + true + false + + + + + + org.idempiere.jetty.feature + ${jetty.version} + + Idempiere + feature group jetty osgi bundle get from maven + Idempiere + GPL v2.1 + true + + + + org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-alpn-client:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-annotations:jar:${jetty.version} + true + false + + + org.eclipse.jetty:apache-jsp:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-client:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-continuation:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-deploy:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-http:jar:${jetty.version} + true + false + + + org.eclipse.jetty.http2:http2-client:jar:${jetty.version} + true + false + + + org.eclipse.jetty.http2:http2-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty.http2:http2-common:jar:${jetty.version} + true + false + + + org.eclipse.jetty.http2:http2-hpack:jar:${jetty.version} + true + false + + + org.eclipse.jetty.http2:http2-http-client-transport:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-io:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-jaas:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-jmx:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-jndi:jar:${jetty.version} + true + false + + + org.eclipse.jetty.osgi:jetty-osgi-boot:jar:${jetty.version} + true + false + + + org.eclipse.jetty.osgi:jetty-osgi-alpn:jar:${jetty.version} + true + false + + + org.eclipse.jetty.osgi:jetty-osgi-boot-jsp:jar:${jetty.version} + true + false + + + org.eclipse.jetty.osgi:jetty-osgi-boot-warurl:jar:${jetty.version} + true + false + + + org.eclipse.jetty.osgi:jetty-httpservice:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-plus:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-proxy:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-rewrite:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-security:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-jaspi:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-servlet:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-servlets:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-util:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-util-ajax:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-webapp:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-xml:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:websocket-api:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:websocket-client:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:websocket-common:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:websocket-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:websocket-servlet:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:javax-websocket-server-impl:jar:${jetty.version} + true + false + + + org.eclipse.jetty.websocket:javax-websocket-client-impl:jar:${jetty.version} + true + false + + + @@ -1409,7 +1677,7 @@ it also resolve issue confilic between eclipse runtime and tycho build - ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.0.14.jar + ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar false ${project.build.directory}/repository/plugins true diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index e60160ef4d..01a78820c0 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -890,8 +890,8 @@ - - + + @@ -1024,12 +1024,12 @@ - - - - - - + + + + + + @@ -1040,6 +1040,16 @@ + + + + + + + + + + @@ -1062,10 +1072,100 @@ + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 897dc38df0..f26b6ba71c 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -13,7 +13,6 @@ 1.2.0 ${tycho.version} UTF-8 - 9.4.12.v20180830 6.7.0 8.6.0 3.23.1-GA From 8193f6be2668be825f03c3d7d45a30bac8becc24 Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 15 Nov 2018 11:52:45 +0700 Subject: [PATCH 04/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update jetty 9.4.13.v20181111) remove jenkins p2 from target platform --- .../org.idempiere.p2.targetplatform.target | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 01a78820c0..b5f5d6448c 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -758,11 +758,6 @@ - - - - - @@ -1169,4 +1164,4 @@ - + \ No newline at end of file From 8fd73c7f1ba69fa29f550ddfcf241d34fb924a5a Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 16 Nov 2018 15:25:56 +0700 Subject: [PATCH 05/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update jetty 9.4.14) https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.14.v20181114 --- .../server.product.launch | 4 +- .../org.idempiere.maven.to.p2/pom.xml | 4 +- .../org.idempiere.p2.targetplatform.target | 192 +++++++++--------- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index c1feb011e2..03c28d8e73 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + 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 927103855d..7af93388cc 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 @@ -12,9 +12,9 @@ https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0/zk-bin-osgi-8.6.0.zip - 9.4.13.v20181111 + 9.4.14.v20181114 1.1.3.v20160715 - 8.5.33 + 8.5.33.1 8.1.12.v20180117 3.1.0.M3 1.2.5 diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index b5f5d6448c..6a3db09037 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1019,14 +1019,94 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1061,106 +1141,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + From 17364a02107a376f70561472f3b20b1af8bfe34f Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 16 Nov 2018 23:53:56 +0700 Subject: [PATCH 06/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update restlet) https://github.com/restlet/restlet-framework-java/blob/2.4/build/tmpl/text/changes.txt --- .../server.product.launch | 4 +- .../org.idempiere.maven.to.p2/pom.xml | 43 ++++++- .../org.idempiere.p2.targetplatform.target | 106 ++++++------------ 3 files changed, 77 insertions(+), 76 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 03c28d8e73..96c43d8f7c 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + 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 7af93388cc..8c28daee3d 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 @@ -21,7 +21,7 @@ 2.5.3 1.60 1.4.0 - 2.9.5 + 2.9.7 3.1.4 1.1.0.Final 5.0.3 @@ -34,6 +34,7 @@ 1.2.0 1.3.2 7.0 + 2.4.1.v20180822-1009 @@ -55,6 +56,11 @@ zkoss http://mavensync.zkoss.org/maven2 + + restlet-2.4 + https://raw.githubusercontent.com/hieplq/idempiere.artifact/master/restlet/2.4 + p2 + @@ -1235,6 +1241,35 @@ it also resolve issue confilic between eclipse runtime and tycho build + + org.idempiere.apache.feature + ${project.version} + + Idempiere + feature group apache util osgi bundle get from maven + Idempiere + GPL v2.1 + true + + + + commons-io:commons-io:jar:2.6 + true + false + + + commons-fileupload:commons-fileupload:jar:1.3.3 + true + false + + + org.apache.httpcomponents:httpclient:jar:4.5.6 + true + false + + + + org.idempiere.jetty.feature ${jetty.version} @@ -1557,6 +1592,12 @@ it also resolve issue confilic between eclipse runtime and tycho build org.krysalis.barcode4j:2.1.0 + + org.restlet:${restlet.version} + + + org.restlet.ext.servlet:${restlet.version} + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 6a3db09037..cb76086b93 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,53 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -767,30 +719,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -917,6 +869,10 @@ + + + + @@ -971,6 +927,8 @@ + + @@ -1127,6 +1085,8 @@ + + @@ -1160,7 +1120,7 @@ - + From bad19fda25141b6537e6442c60ec84c7f6c77c61 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 17 Nov 2018 19:33:01 +0700 Subject: [PATCH 07/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update restlet) correct httpclient get from maven it's httpclient-osgi --- org.adempiere.server-feature/server.product.launch | 4 ++-- org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml | 2 +- .../org.idempiere.p2.targetplatform.target | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 96c43d8f7c..1c4bdb7b6a 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + 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 8c28daee3d..a680bddb65 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 @@ -1263,7 +1263,7 @@ it also resolve issue confilic between eclipse runtime and tycho build false - org.apache.httpcomponents:httpclient:jar:4.5.6 + org.apache.httpcomponents:httpclient-osgi:jar:4.5.6 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 cb76086b93..dc8f06ebde 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 @@ - + @@ -1120,7 +1120,7 @@ - + From 8b18a199afb142f6c89ca1ec469ceb3ec9d13585 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 18 Nov 2018 12:07:54 +0700 Subject: [PATCH 08/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update restlet) restlet: manifest of restlet 2.4.1 isn't yet complete so copy it from release 2.3.12 https://github.com/restlet/restlet-framework-java/issues/1321 --- org.adempiere.install/install.app.launch | 2 +- .../server.product.launch | 4 +- .../org.idempiere.maven.to.p2/pom.xml | 136 ++++++++++++++++-- .../org.idempiere.p2.targetplatform.target | 8 +- 4 files changed, 134 insertions(+), 16 deletions(-) diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index ffbf7268a8..2d7750f9f4 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 1c4bdb7b6a..0618702b3f 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + 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 a680bddb65..5a30d4da4a 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 @@ -34,7 +34,7 @@ 1.2.0 1.3.2 7.0 - 2.4.1.v20180822-1009 + 2.4.1 @@ -57,9 +57,8 @@ http://mavensync.zkoss.org/maven2 - restlet-2.4 - https://raw.githubusercontent.com/hieplq/idempiere.artifact/master/restlet/2.4 - p2 + restlet-maven + http://maven.restlet.com @@ -826,6 +825,129 @@ it also resolve issue confilic between eclipse runtime and tycho build true false + + org.restlet.osgi:org.restlet:${restlet.version} + true + false + true + + + org.restlet.engine.internal.Activator + org.restlet + org.restlet + ${restlet.version} + org.restlet;uses:="org.restlet.engine.application,org.re + stlet.resource,org.restlet.util,org.restlet.engine,org.restlet.routing, + org.restlet.service,org.restlet.engine.resource,org.restlet.security,or + g.restlet.data,org.restlet.engine.connector,org.restlet.representation, + org.restlet.engine.component,org.restlet.engine.util",org.restlet.data; + uses:="org.restlet.engine.util,org.restlet.util,org.restlet,org.restlet + .engine.security,org.restlet.representation,org.restlet.engine,org.rest + let.routing,org.restlet.engine.io,org.restlet.security,org.restlet.engi + ne.header",org.restlet.engine;uses:="org.restlet.routing,org.restlet.da + ta,org.restlet,org.restlet.representation,org.restlet.engine.log,org.re + stlet.engine.security,org.restlet.engine.io,org.restlet.engine.util,org + .restlet.engine.converter,org.restlet.engine.connector,org.restlet.engi + ne.local,org.restlet.service,org.restlet.util",org.restlet.engine.adapt + er;uses:="org.restlet,org.restlet.data,org.restlet.representation,org.r + estlet.util,org.restlet.engine.header,org.restlet.engine,org.restlet.se + rvice,org.restlet.engine.connector,org.restlet.engine.util,org.restlet. + engine.security,org.restlet.engine.io",org.restlet.engine.application;u + ses:="org.restlet.data,org.restlet,org.restlet.routing,org.restlet.serv + ice,org.restlet.util,org.restlet.engine,org.restlet.representation,org. + restlet.engine.util,org.restlet.engine.io,org.restlet.engine.resource,o + rg.restlet.engine.header",org.restlet.engine.component;uses:="org.restl + et.routing,org.restlet.data,org.restlet,org.restlet.util,org.restlet.en + gine.util,org.restlet.service,org.restlet.engine.log,org.restlet.engine + ,org.restlet.resource,org.restlet.representation,javax.xml.parsers,org. + w3c.dom,org.xml.sax",org.restlet.engine.connector;uses:="org.restlet,or + g.restlet.representation,org.restlet.util,org.restlet.service,org.restl + et.data,org.restlet.engine,org.restlet.engine.util,org.restlet.engine.l + ocal,org.restlet.engine.adapter,javax.net.ssl,com.sun.net.httpserver,or + g.restlet.engine.ssl,org.restlet.engine.log",org.restlet.engine.convert + er;uses:="org.restlet.data,org.restlet.resource,org.restlet.representat + ion,org.restlet.engine.resource,org.restlet.engine,org.restlet,org.rest + let.engine.application,org.restlet.engine.util",org.restlet.engine.head + er;uses:="org.restlet.data,org.restlet.util,org.restlet.representation, + org.restlet.engine.util,org.restlet,org.restlet.engine.security",org.re + stlet.engine.internal;uses:="org.osgi.framework,org.restlet,org.restlet + .engine",org.restlet.engine.io;uses:="org.restlet.representation,org.re + stlet,org.restlet.engine.util,org.restlet.data,org.restlet.engine,org.r + estlet.util",org.restlet.engine.local;uses:="org.restlet.service,org.re + stlet.data,org.restlet.representation,org.restlet,org.restlet.resource, + org.restlet.engine.util,org.restlet.engine.io,org.restlet.util,org.rest + let.engine.connector",org.restlet.engine.log;uses:="org.restlet.engine. + io,org.restlet.engine.util,org.restlet,org.restlet.routing,org.restlet. + service,org.restlet.data,org.restlet.engine",org.restlet.engine.resourc + e;uses:="org.restlet.engine.util,org.restlet,org.restlet.service,org.re + stlet.data,org.restlet.resource,org.restlet.representation,org.restlet. + engine.connector,org.restlet.engine.application",org.restlet.engine.sec + urity;uses:="org.restlet.data,org.restlet.util,org.restlet,org.restlet. + engine,org.restlet.engine.header,org.restlet.engine.util,org.restlet.se + curity",org.restlet.engine.ssl;uses:="javax.net.ssl,org.restlet.data,or + g.restlet.util,org.restlet,org.restlet.engine",org.restlet.engine.util; + uses:="org.restlet.data,org.restlet.engine.io,org.restlet.representatio + n,org.restlet,org.restlet.util,org.restlet.service,org.restlet.engine.l + og,org.w3c.dom.ls,org.xml.sax.helpers,org.xml.sax,org.restlet.engine,or + g.restlet.engine.security,org.restlet.routing",org.restlet.representati + on;uses:="org.restlet.data,org.restlet.engine.io,org.restlet,org.restle + t.util,org.restlet.engine,org.restlet.engine.util",org.restlet.resource + ;uses:="org.restlet.representation,org.restlet,org.restlet.util,org.res + tlet.engine,org.restlet.service,org.restlet.data,org.restlet.engine.uti + l,org.restlet.engine.resource,org.restlet.engine.connector,org.restlet. + engine.local,org.restlet.security",org.restlet.routing;uses:="org.restl + et.data,org.restlet.representation,org.restlet,org.restlet.util,org.res + tlet.resource,org.restlet.engine.header",org.restlet.security;uses:="or + g.restlet.routing,org.restlet.data,org.restlet,javax.security.auth.x500 + ,org.restlet.engine.security,org.restlet.util,org.restlet.engine.util", + org.restlet.service;uses:="org.restlet.data,org.restlet.representation, + org.restlet.engine.application,org.restlet,org.restlet.resource,org.res + tlet.engine.converter,org.restlet.engine,org.restlet.routing,org.restle + t.engine.util,org.restlet.engine.log,org.restlet.engine.resource",org.r + estlet.util;uses:="org.restlet.representation,org.restlet.data,org.rest + let.engine.io,org.restlet,org.restlet.engine.util,org.restlet.routing,o + rg.restlet.service" + com.sun.net.httpserver;resolution:=optional,javax.net.ss + l;resolution:=optional,javax.security.auth.x500;resolution:=optional,ja + vax.xml.parsers;resolution:=optional,org.osgi.framework;resolution:=opt + ional,org.w3c.dom;resolution:=optional,org.w3c.dom.ls;resolution:=optio + nal,org.xml.sax;resolution:=optional,org.xml.sax.helpers;resolution:=op + tional + + + + org.restlet.osgi:org.restlet.ext.servlet:${restlet.version} + true + false + true + + org.restlet.ext.servlet + org.restlet.ext.servlet + ${restlet.version} + org.restlet.ext.servlet;uses:="javax.servlet,org.restlet + .ext.osgi,org.restlet,org.osgi.service.log,org.osgi.service.http,org.re + stlet.representation,org.restlet.ext.servlet.internal,org.restlet.util, + org.restlet.engine,org.restlet.engine.adapter,org.restlet.routing,org.r + estlet.service,org.restlet.data,org.restlet.engine.component,javax.serv + let.http",org.restlet.ext.servlet.internal;uses:="javax.servlet,org.res + tlet.data,org.restlet.engine.io,org.restlet.representation,org.restlet, + org.restlet.util,org.restlet.engine.adapter,javax.servlet.http,org.rest + let.engine.connector,org.restlet.service,org.restlet.engine.local" + javax.servlet;resolution:=optional,javax.servlet.http;re + solution:=optional,org.osgi.service.http;resolution:=optional,org.osgi. + service.log;resolution:=optional,org.restlet;resolution:=optional,org.r + estlet.data;resolution:=optional,org.restlet.engine;resolution:=optiona + l,org.restlet.engine.adapter;resolution:=optional,org.restlet.engine.co + mponent;resolution:=optional,org.restlet.engine.connector;resolution:=o + ptional,org.restlet.engine.io;resolution:=optional,org.restlet.engine.l + ocal;resolution:=optional,org.restlet.ext.osgi;resolution:=optional,org + .restlet.representation;resolution:=optional,org.restlet.routing;resolu + tion:=optional,org.restlet.service;resolution:=optional,org.restlet.uti + l;resolution:=optional + OSGI-INF/*.xml + + - org.zkoss.zul.borderlayout.animation.disabed + org.zkoss.zul.borderlayout.animation.disabled true From 942800418eeb7c967b0b154163e3a07fe19523e1 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 22 Dec 2018 15:49:50 +0700 Subject: [PATCH 10/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (zk8.6.0.1, eclipse-1812, java11, tycho 1.3) still use local repository for maven.to.p2 to continue update library --- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 5 + org.adempiere.base/META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + org.adempiere.install/install.app.launch | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../server.product.launch | 4 +- org.adempiere.server-feature/setup.ini | 2 +- .../setup/configuration/config.ini | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + org.adempiere.ui.zk/META-INF/MANIFEST.MF | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../.settings/org.eclipse.jdt.core.prefs | 10 + .../director/configuration/config.ini | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + .../org.idempiere.p2.targetplatform.target | 662 ++++++++++++------ org.idempiere.p2/category.xml | 12 +- org.idempiere.parent/pom.xml | 52 +- .../.settings/org.eclipse.jdt.core.prefs | 10 + 26 files changed, 622 insertions(+), 282 deletions(-) diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs index 182138f43f..af0840bd4c 100644 --- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs @@ -10,12 +10,15 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -24,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -105,3 +109,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index 244a0ac7ed..728334f6b8 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -124,6 +124,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", 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", - javax.activation;bundle-version="1.1.0" + com.sun.activation.javax.activation;bundle-version="1.2.0" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 2d7750f9f4..902986ab87 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -20,14 +20,14 @@ - + - + diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 0618702b3f..27d3d82a87 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini index 2b0d897bd2..6bfa731164 100644 --- a/org.adempiere.server-feature/setup.ini +++ b/org.adempiere.server-feature/setup.ini @@ -1,5 +1,5 @@ -startup -plugins/org.eclipse.equinox.launcher_1.5.100.v20180827-1352.jar +plugins/org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar -install setup --launcher.XXMaxPermSize diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 7d76a2653b..7512798c27 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar osgi.install.area=setup osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.eclipse.equinox.util,\ @@ -14,7 +14,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.restlet,\ org.apache.servicemix.bundles.cglib,\ com.sun.mail.javax.mail,\ - javax.activation,\ + com.sun.activation.javax.activation,\ org.apache.commons.collections,\ org.apache.ant,\ javax.jms,\ diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 4f20c296d2..16477482fe 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -158,8 +158,8 @@ 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.activation;bundle-version="1.1.0", - zkwebfragment + zkwebfragment, + com.sun.activation.javax.activation;bundle-version="1.2.0" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true Web-ContextPath: webui diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs +++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini index 9813d97456..dc051329de 100644 --- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini +++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar osgi.install.area=director equinox.use.ds=true osgi.bundles=org.eclipse.core.net@start,\ @@ -57,7 +57,6 @@ osgi.bundles=org.eclipse.core.net@start,\ org.hamcrest.core,\ org.junit,\ org.eclipse.osgi.compatibility.state,\ - org.eclipse.osgi.compatibility.plugins,\ org.eclipse.osgi@start,\ org.eclipse.osgi.services,\ org.eclipse.osgi.util,\ diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 25e55c4ce3..7763295307 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,73 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + - - + + + + + + + @@ -129,13 +87,13 @@ - + - + - + - + @@ -167,10 +125,10 @@ - - - - + + + + @@ -254,10 +212,6 @@ - - - - @@ -271,9 +225,7 @@ - - @@ -297,15 +249,13 @@ - + - + - - @@ -366,17 +316,17 @@ - + - - - + + + - + - + @@ -401,8 +351,6 @@ - - @@ -416,14 +364,8 @@ - - - - - - @@ -431,9 +373,7 @@ - - @@ -542,20 +482,8 @@ - - - - - - - - - - - - @@ -572,17 +500,10 @@ - - - - - - - @@ -608,12 +529,6 @@ - - - - - - @@ -640,35 +555,13 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -677,8 +570,6 @@ - - @@ -708,9 +599,7 @@ - - @@ -724,9 +613,9 @@ - + - + @@ -744,24 +633,257 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -772,30 +894,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -890,8 +1012,8 @@ - - + + @@ -922,6 +1044,10 @@ + + + + @@ -976,6 +1102,8 @@ + + @@ -1024,14 +1152,94 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1040,8 +1248,22 @@ + + + + + + + + + + + + + + @@ -1055,25 +1277,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index f9db4be3fe..1e23bd0c55 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -63,22 +63,22 @@ - + - + - + - + - + - + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index b7ef53b2e3..22a5eecd3c 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -10,7 +10,7 @@ Maven parent project for idempiere - 1.2.0 + 1.3.0 ${tycho.version} UTF-8 6.7.0 @@ -25,10 +25,10 @@ RELEASE731 org.idempiere.p2.targetplatform - http://download.eclipse.org/eclipse/updates/4.9 - eclipse-photon-201809 - http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository - orbit-photon-R20180905201904 + http://download.eclipse.org/eclipse/updates/4.10 + eclipse-photon-201810 + http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository + orbit-photon-R20181128170323 https://raw.githubusercontent.com/idempiere/binary.file/master org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group org.adempiere.server.product @@ -322,44 +322,6 @@ true - - - - org.codehaus.plexus - plexus-utils - 3.1.0 - - - org.codehaus.plexus - plexus-compiler-manager - ${codehaus.plexus} - - - org.codehaus.plexus - plexus-compiler-api - ${codehaus.plexus} - - - org.apache.commons - commons-exec - 1.3 - - - org.eclipse.jdt - org.eclipse.jdt.compiler.tool - 1.2.300 - - - org.eclipse.jdt - org.eclipse.jdt.core - ${jdtVersion} - - - org.eclipse.jdt - org.eclipse.jdt.compiler.apt - ${jdtAptVersion} - - org.eclipse.tycho @@ -537,8 +499,8 @@ x86_64 - JavaSE-10 - JavaSE-10 + JavaSE-11 + JavaSE-11 diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 From 45e54b5da0c30a4b02d40a9df3c5daf146194ff8 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 23 Dec 2018 11:08:13 +0700 Subject: [PATCH 11/16] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update lib j2ee take out from jdk) https://github.com/eclipse-ee4j some already release so update, some not yet release so wait https://eclipse-ee4j.github.io/javamail/ https://eclipse-ee4j.github.io/jaf/ --- org.adempiere.base-feature/feature.xml | 44 +++++++++-- org.adempiere.base/META-INF/MANIFEST.MF | 2 +- org.adempiere.install/install.app.launch | 2 +- .../server.product.launch | 2 +- .../setup/configuration/config.ini | 8 +- .../feature.xml | 14 ++-- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 2 +- .../org.idempiere.maven.to.p2/pom.xml | 43 ++++++++--- .../org.idempiere.p2.targetplatform.target | 76 ++++++++++--------- .../META-INF/MANIFEST.MF | 4 +- 10 files changed, 129 insertions(+), 68 deletions(-) diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 18b199739e..7fa0d38e15 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -93,13 +93,6 @@ install-size="0" version="0.0.0"/> - - + + + + + + + + + + - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 27d3d82a87..d0568a4cb9 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 7512798c27..a04de95291 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -13,8 +13,12 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.adempiere.install,\ org.restlet,\ org.apache.servicemix.bundles.cglib,\ - com.sun.mail.javax.mail,\ - com.sun.activation.javax.activation,\ + com.sun.mail.gimap,\ + com.sun.mail.imap,\ + com.sun.mail.jakarta.mail,\ + com.sun.mail.smtp,\ + jakarta.mail.api,\ + com.sun.activation.jakarta.activation,\ org.apache.commons.collections,\ org.apache.ant,\ javax.jms,\ diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 437704be16..7d437fe28d 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -314,13 +314,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 16477482fe..c231b1a7be 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -159,7 +159,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0", org.atmosphere.runtime;bundle-version="0.0.0", zkwebfragment, - com.sun.activation.javax.activation;bundle-version="1.2.0" + com.sun.activation.jakarta.activation;bundle-version="1.2.1" 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 5a30d4da4a..1bcbc33a3c 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 @@ -31,10 +31,11 @@ 2.4 3.2.6 3.1.17 - 1.2.0 - 1.3.2 + 1.2.1 + 1.3.3 7.0 2.4.1 + 1.6.3 @@ -127,13 +128,32 @@ false - javax.annotation:javax.annotation-api:jar:${annotation.version} + jakarta.annotation:jakarta.annotation-api:jar:${annotation.version} true false - - com.sun.mail:javax.mail:jar:1.6.2 + com.sun.mail:jakarta.mail:jar:${javamail.version} + true + false + + + com.sun.mail:smtp:jar:${javamail.version} + true + false + + + com.sun.mail:mailapi:jar:${javamail.version} + true + false + + + com.sun.mail:imap:jar:${javamail.version} + true + false + + + com.sun.mail:gimap:jar:${javamail.version} true false @@ -414,7 +434,7 @@ - com.sun.activation:javax.activation:jar:${activation.version} + com.sun.activation:jakarta.activation:jar:${activation.version} true false @@ -619,7 +639,7 @@ false - javax.ws.rs:javax.ws.rs-api:jar:2.1.1 + jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3 true false @@ -634,7 +654,12 @@ false - javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1 + jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3 + true + false + + + jakarta.persistence:jakarta.persistence-api:jar:2.2.1 true false @@ -1834,7 +1859,7 @@ it also resolve issue confilic between eclipse runtime and tycho build - ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar + ${url.file.srv}/extra.jar/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar false ${project.build.directory}/repository/plugins true diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 7763295307..eaeea91a72 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -431,12 +431,6 @@ - - - - - - @@ -928,10 +922,6 @@ - - - - @@ -974,8 +964,8 @@ - - + + @@ -988,12 +978,12 @@ - - + + - - + + @@ -1277,27 +1267,41 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 4301d2754b..72475ada12 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -78,7 +78,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6", org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17", org.apache.xmlbeans;bundle-version="3.0.1", - 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, @@ -99,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.glassfish.hk2.api;bundle-version="2.5.0", org.glassfish.hk2.locator;bundle-version="2.5.0", org.glassfish.hk2.utils;bundle-version="2.5.0", - org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1" + org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", + javax.ws.rs-api;bundle-version="2.1.3" Bundle-ClassPath: ., WEB-INF/lib/idempiere-xmlbeans.jar Export-Package: org.compiere.model, From 1678d932c02a37955e17e1ca883907e2b01b5380 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 25 Nov 2018 10:21:34 +0700 Subject: [PATCH 12/16] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (hazelcast) https://docs.hazelcast.org/docs/rn/index.html#3-11 keep default configruation copy from release, make separate commit about change from idempiere --- .../hazelcast-template.xml | 185 +++++++++++++----- .../hazelcast.xml | 174 ++++++++++++---- org.idempiere.hazelcast.service/pom.xml | 2 +- 3 files changed, 270 insertions(+), 91 deletions(-) diff --git a/org.adempiere.server-feature/hazelcast-template.xml b/org.adempiere.server-feature/hazelcast-template.xml index 90e8c53bc0..7def213cf7 100644 --- a/org.adempiere.server-feature/hazelcast-template.xml +++ b/org.adempiere.server-feature/hazelcast-template.xml @@ -1,6 +1,6 @@ + - + + - @ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@ - @ADEMPIERE_DB_PASSWORD@ + dev + dev-pass - http://localhost:8080/mancenter - - false - + http://localhost:8080/hazelcast-mancenter 5701 @@ -42,7 +46,7 @@ 0 - + 224.2.2.3 54327 @@ -52,22 +56,40 @@ 127.0.0.1 - + + my-access-key + my-secret-key + + us-west-1 + + ec2.amazonaws.com + + hazelcast-sg + type + hz-nodes + + + us-east1-b,us-east1-c + + + CLIENT_ID + CLIENT_SECRET + TENANT_ID + SUB_ID + HZLCAST001 + GROUP-NAME + + + MY-KUBERNETES-NAMESPACE + MY-SERVICE-NAME + MY-SERVICE-LABEL-NAME + MY-SERVICE-LABEL-VALUE + + + true + hazelcast + - - - my-access-key - my-secret-key - - us-east-1 - ec2.amazonaws.com - - hazelcast-sg - type - hz-nodes - 30 - - @@ -92,6 +114,9 @@ 19 + + + @@ -99,6 +124,9 @@ 0 + + true + - 0 + 1 0 + Maximum number of seconds for each entry to stay in the map. Entries that are + older than and not updated for + will get automatically evicted from the map. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0 + --> 0 - 1800 + Maximum number of seconds for each entry to stay idle in the map. Entries that are + idle(not touched) for more than will get + automatically evicted from the map. Entry is touched if get, put or containsKey is called. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0. + --> + 0 - LRU + NONE - 1000 + 0 - com.hazelcast.map.merge.PutIfAbsentMapMergePolicy + com.hazelcast.spi.merge.PutIfAbsentMergePolicy INDEX-ONLY - - OBJECT - true - - + + mapName + 10 + + 1 SET + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + OBJECT + true + true + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy @@ -276,8 +322,27 @@ 0 0 BINARY + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 100 + 600000 + 0 + 0 + true + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 0 @@ -286,4 +351,26 @@ + + 1 + 0 + HyperLogLogMergePolicy + + + + 100 + 1 + 16 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 1000 + 1 + + + + 2147483647 + true + diff --git a/org.idempiere.hazelcast.service.config/hazelcast.xml b/org.idempiere.hazelcast.service.config/hazelcast.xml index c101dfabb4..7def213cf7 100644 --- a/org.idempiere.hazelcast.service.config/hazelcast.xml +++ b/org.idempiere.hazelcast.service.config/hazelcast.xml @@ -1,6 +1,6 @@ + - + + dev dev-pass - http://localhost:8080/mancenter - - false - + http://localhost:8080/hazelcast-mancenter 5701 @@ -52,22 +56,40 @@ 127.0.0.1 - + + my-access-key + my-secret-key + + us-west-1 + + ec2.amazonaws.com + + hazelcast-sg + type + hz-nodes + + + us-east1-b,us-east1-c + + + CLIENT_ID + CLIENT_SECRET + TENANT_ID + SUB_ID + HZLCAST001 + GROUP-NAME + + + MY-KUBERNETES-NAMESPACE + MY-SERVICE-NAME + MY-SERVICE-LABEL-NAME + MY-SERVICE-LABEL-VALUE + + + true + hazelcast + - - - my-access-key - my-secret-key - - us-east-1 - ec2.amazonaws.com - - hazelcast-sg - type - hz-nodes - 30 - - @@ -92,6 +114,9 @@ 19 + + + @@ -99,6 +124,9 @@ 0 + + true + - 0 + 1 0 + Maximum number of seconds for each entry to stay in the map. Entries that are + older than and not updated for + will get automatically evicted from the map. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0 + --> 0 - 1800 + Maximum number of seconds for each entry to stay idle in the map. Entries that are + idle(not touched) for more than will get + automatically evicted from the map. Entry is touched if get, put or containsKey is called. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0. + --> + 0 - LRU + NONE - 1000 + 0 - com.hazelcast.map.merge.PutIfAbsentMapMergePolicy + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + mapName + 10 + + 1 SET + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + OBJECT + true + true + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy @@ -271,8 +322,27 @@ 0 0 BINARY + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 100 + 600000 + 0 + 0 + true + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 0 @@ -281,4 +351,26 @@ + + 1 + 0 + HyperLogLogMergePolicy + + + + 100 + 1 + 16 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 1000 + 1 + + + + 2147483647 + true + diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml index f609fa56b9..1c95de7dcb 100644 --- a/org.idempiere.hazelcast.service/pom.xml +++ b/org.idempiere.hazelcast.service/pom.xml @@ -26,7 +26,7 @@ com.hazelcast hazelcast - 3.10.6 + 3.11 com.hazelcast From c4a5260effd5819f826d5c38fe62d5cbfd076bcc Mon Sep 17 00:00:00 2001 From: hieplq Date: Mon, 26 Nov 2018 14:45:01 +0700 Subject: [PATCH 13/16] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (hazelcast) set back change from community --- .../hazelcast-template.xml | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/org.adempiere.server-feature/hazelcast-template.xml b/org.adempiere.server-feature/hazelcast-template.xml index 7def213cf7..79c9a70f84 100644 --- a/org.adempiere.server-feature/hazelcast-template.xml +++ b/org.adempiere.server-feature/hazelcast-template.xml @@ -32,10 +32,14 @@ http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"> - dev - dev-pass + @ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@ + http://localhost:8080/hazelcast-mancenter + + + false + 5701 @@ -46,7 +50,7 @@ 0 - + 224.2.2.3 54327 @@ -90,6 +94,20 @@ hazelcast + + + my-access-key + my-secret-key + + us-east-1 + ec2.amazonaws.com + + hazelcast-sg + type + hz-nodes + 30 + + @@ -141,7 +159,7 @@ then all entries of the map will be copied to another JVM for fail-safety. 0 means no backup. --> - 1 + 0 - 0 + 1800 - NONE + LRU - 0 + 1000 INDEX-ONLY - + + + OBJECT + true + 9.4.14.v20181114 1.1.3.v20160715 @@ -173,7 +173,7 @@ false - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.1 + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2 true false @@ -1845,31 +1845,6 @@ it also resolve issue confilic between eclipse runtime and tycho build - - com.googlecode.maven-download-plugin - download-maven-plugin - - - replace-source-of-org.apache.aries.spifly.dynamic.bundle - package - - wget - - - - ${url.file.srv}/extra.jar/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar - false - ${project.build.directory}/repository/plugins - true - true - 5 - - - - - org.eclipse.tycho.extras diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index eaeea91a72..4443809c1c 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 @@ - + @@ -922,6 +922,16 @@ + + + + + + + + + + @@ -964,6 +974,8 @@ + + @@ -972,6 +984,8 @@ + + @@ -1002,8 +1016,8 @@ - - + + @@ -1267,41 +1281,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 22a5eecd3c..3812775b0e 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -14,7 +14,7 @@ ${tycho.version} UTF-8 6.7.0 - 8.6.0 + 8.6.0.1 3.23.1-GA 3.1.1 1.4.1