From bad19fda25141b6537e6442c60ec84c7f6c77c61 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 17 Nov 2018 19:33:01 +0700 Subject: [PATCH] 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 @@ - +