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
false
+
+ org.restlet.osgi:org.restlet:${restlet.version}
+
+ 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}
+
+ 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
+
+