From 6bdede763bae65808c771d3b756f9c67b587d19d Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 15 Apr 2018 16:50:51 +0700 Subject: [PATCH] IDEMPIERE-3688:update jetty to 9.4.9 (test for maven build only) --- org.adempiere.server-feature/pom.xml | 2 +- .../server.product.launch | 4 +- org.idempiere.maven.to.p2/pom.xml | 36 +- .../org.idempiere.p2.targetplatform.target | 1882 ++--------------- org.idempiere.parent/pom.xml | 6 +- 5 files changed, 149 insertions(+), 1781 deletions(-) diff --git a/org.adempiere.server-feature/pom.xml b/org.adempiere.server-feature/pom.xml index c0202ff40f..e554646e6f 100644 --- a/org.adempiere.server-feature/pom.xml +++ b/org.adempiere.server-feature/pom.xml @@ -136,7 +136,7 @@ org.mortbay.jetty.alpn alpn-boot - 8.1.12.v20180117 + ${jetty.alpn-boot.version} ../ diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 8348388f58..7a0f558cc4 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/pom.xml b/org.idempiere.maven.to.p2/pom.xml index c2d76cf873..c917ff5c64 100644 --- a/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/pom.xml @@ -11,6 +11,13 @@ pom https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552 + + 1.1.3.v20160715 + 8.5.24.2 + 8.1.12.v20180117 + 3.1.0.M3 + + @@ -46,18 +53,18 @@ false - org.mortbay.jasper:apache-jsp:jar:8.5.23 + org.mortbay.jasper:apache-jsp:jar:${jetty.jsp.version} false false - org.mortbay.jasper:apache-el:jar:8.5.23 + org.mortbay.jasper:apache-el:jar:${jetty.jsp.version} true false - org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:3.1.0.M3 + org.eclipse.jetty.toolchain:jetty-osgi-servlet-api:jar:${jetty.osgi.servlet.api.version} true false @@ -211,11 +218,6 @@ true false - - org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version} - true - false - org.eclipse.jetty.alpn:alpn-api:jar:1.1.3.v20160715 true @@ -246,6 +248,16 @@ true false + + org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version} + true + false + + + org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version} + true + false + + 8.1.12.v20180117 org.idempiere.p2.targetplatform