You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/04/16 13:10:54 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6609] Upgrade to Pax Web
7.2.15 and Jetty 9.4.28.v20200408
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new c1ccb04 [KARAF-6609] Upgrade to Pax Web 7.2.15 and Jetty 9.4.28.v20200408
c1ccb04 is described below
commit c1ccb040473d91b4f8be2b31c13a7e9eb7fd11bf
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Apr 14 14:10:41 2020 +0200
[KARAF-6609] Upgrade to Pax Web 7.2.15 and Jetty 9.4.28.v20200408
(cherry picked from commit 0b46b1141835db8aa7d160563e6540ac004bac05)
---
itests/test/src/test/java/org/apache/karaf/itests/WebTest.java | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java
index 237d407..42ec425 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java
@@ -83,7 +83,7 @@ public class WebTest extends BaseTest {
System.out.println(buffer.toString());
assertContains("Hello World!", buffer.toString());
- System.out.println(executeCommand("web:uninstall 125"));
+ System.out.println(executeCommand("web:uninstall 126"));
listOutput = executeCommand("web:list");
System.out.println(listOutput);
while (listOutput.contains("/test")) {
diff --git a/pom.xml b/pom.xml
index a813a2b..558a944 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,7 +264,7 @@
<httpclient.version>4.5.6</httpclient.version>
<jansi.version>1.18</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jetty.version>9.4.22.v20191022</jetty.version>
+ <jetty.version>9.4.28.v20200408</jetty.version>
<jline.version>3.14.1</jline.version>
<junit.version>4.13</junit.version>
<jsw.version>3.2.3</jsw.version>
@@ -284,7 +284,7 @@
<pax.base.version>1.5.1</pax.base.version>
<pax.swissbox.version>1.8.3</pax.swissbox.version>
<pax.url.version>2.6.2</pax.url.version>
- <pax.web.version>7.2.14</pax.web.version>
+ <pax.web.version>7.2.15</pax.web.version>
<pax.tinybundle.version>3.0.0</pax.tinybundle.version>
<pax.jdbc.version>1.4.4</pax.jdbc.version>
<pax.jms.version>1.0.6</pax.jms.version>