From 49d0076c58dad3680bb457046c803e8dca1cb511 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 23 Dec 2018 12:26:44 +0700 Subject: [PATCH] IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update lib zk 8.6.0.1 ) https://issues.apache.org/jira/browse/ARIES-1859 https://tracker.zkoss.org/browse/ZK-4127 --- .../server.product.launch | 6 +- .../org.idempiere.maven.to.p2/pom.xml | 29 +------ .../org.idempiere.p2.targetplatform.target | 76 +++++++++---------- org.idempiere.parent/pom.xml | 2 +- 4 files changed, 44 insertions(+), 69 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index d0568a4cb9..be584c4c44 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -22,13 +22,13 @@ - + - - + + 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 1bcbc33a3c..5f139a8e69 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.6.0/zk-bin-osgi-8.6.0.zip + https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip 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