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 @@ - +