This is an automated email from the ASF dual-hosted git repository.
rxl pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit cbf5bb2fc45611acea3ccbf7c2cf655bd18612eb
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Mon Jun 29 22:44:44 2020 -0700
Update Jetty to 9.4.29 (#7235)
* Update Jetty to 9.4.29
* Fixed test exception message expectation
* Fixed test
* Fixed difference in extracting exception message
(cherry picked from commit 8a49e46c9488a0d8ddd554ab0217f057fe5cceec)
---
distribution/server/src/assemble/LICENSE.bin.txt | 34 +++++++++++-----------
pom.xml | 2 +-
.../pulsar/broker/admin/AdminApiSchemaTest.java | 3 ++
.../pulsar/broker/service/BrokerServiceTest.java | 8 ++---
.../pulsar/client/admin/PulsarAdminException.java | 2 +-
pulsar-sql/presto-distribution/LICENSE | 12 ++++----
6 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 2eac008..2c15d6e 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -414,23 +414,23 @@ The Apache Software License, Version 2.0
- org.asynchttpclient-async-http-client-2.12.1.jar
- org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar
* Jetty
- - org.eclipse.jetty-jetty-client-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-continuation-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-http-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-io-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-proxy-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-security-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-server-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-servlet-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-servlets-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-util-9.4.20.v20190813.jar
- - org.eclipse.jetty-jetty-xml-9.4.20.v20190813.jar
- -
org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.20.v20190813.jar
- - org.eclipse.jetty.websocket-websocket-api-9.4.20.v20190813.jar
- - org.eclipse.jetty.websocket-websocket-client-9.4.20.v20190813.jar
- - org.eclipse.jetty.websocket-websocket-common-9.4.20.v20190813.jar
- - org.eclipse.jetty.websocket-websocket-server-9.4.20.v20190813.jar
- - org.eclipse.jetty.websocket-websocket-servlet-9.4.20.v20190813.jar
+ - org.eclipse.jetty-jetty-client-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-continuation-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-http-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-io-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-proxy-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-security-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-server-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-servlet-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-servlets-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-util-9.4.29.v20200521.jar
+ - org.eclipse.jetty-jetty-xml-9.4.29.v20200521.jar
+ -
org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.29.v20200521.jar
+ - org.eclipse.jetty.websocket-websocket-api-9.4.29.v20200521.jar
+ - org.eclipse.jetty.websocket-websocket-client-9.4.29.v20200521.jar
+ - org.eclipse.jetty.websocket-websocket-common-9.4.29.v20200521.jar
+ - org.eclipse.jetty.websocket-websocket-server-9.4.29.v20200521.jar
+ - org.eclipse.jetty.websocket-websocket-servlet-9.4.29.v20200521.jar
* SnakeYaml -- org.yaml-snakeyaml-1.24.jar
* RocksDB - org.rocksdb-rocksdbjni-5.13.3.jar
* HttpClient
diff --git a/pom.xml b/pom.xml
index 819b0b8..bac783a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@ flexible messaging model and an intuitive client
API.</description>
<netty.version>4.1.48.Final</netty.version>
<netty-tc-native.version>2.0.30.Final</netty-tc-native.version>
<storm.version>2.0.0</storm.version>
- <jetty.version>9.4.20.v20190813</jetty.version>
+ <jetty.version>9.4.29.v20200521</jetty.version>
<jersey.version>2.27</jersey.version>
<athenz.version>1.8.38</athenz.version>
<prometheus.version>0.5.0</prometheus.version>
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
index 5058b82..9cc8105 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java
@@ -21,6 +21,7 @@ package org.apache.pulsar.broker.admin;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import com.google.common.collect.Sets;
import java.util.HashMap;
@@ -162,6 +163,7 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
try {
admin.schemas().createSchema(topicName, foo1SchemaInfo);
+ fail("Should have failed");
} catch (PulsarAdminException.ConflictException e) {
assertTrue(e.getMessage().contains("HTTP 409 Conflict"));
}
@@ -171,6 +173,7 @@ public class AdminApiSchemaTest extends
MockedPulsarServiceBaseTest {
try {
admin.schemas().createSchema(topicName, fooSchemaInfo);
+ fail("Should have failed");
} catch (PulsarAdminException.NotFoundException e) {
assertTrue(e.getMessage().contains("HTTP 404 Not Found"));
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
index 282f8ac..241072f 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
@@ -574,7 +574,7 @@ public class BrokerServiceTest extends BrokerTestBase {
fail("should fail");
} catch (Exception e) {
- assertTrue(e.getMessage().contains("Authentication required"));
+ assertTrue(e.getMessage().contains("Unauthorized"));
} finally {
pulsarClient.close();
}
@@ -636,7 +636,7 @@ public class BrokerServiceTest extends BrokerTestBase {
fail("should fail");
} catch (Exception e) {
- assertTrue(e.getMessage().contains("Authentication required"));
+ assertTrue(e.getMessage().contains("Unauthorized"));
} finally {
pulsarClient.close();
}
@@ -654,7 +654,7 @@ public class BrokerServiceTest extends BrokerTestBase {
.subscribe();
fail("should fail");
} catch (Exception e) {
- assertTrue(e.getMessage().contains("Authentication required"));
+ assertTrue(e.getMessage().contains("Unauthorized"));
} finally {
pulsarClient.close();
}
@@ -697,7 +697,7 @@ public class BrokerServiceTest extends BrokerTestBase {
.subscribe();
fail("should fail");
} catch (Exception e) {
- assertTrue(e.getMessage().contains("Authentication required"));
+ assertTrue(e.getMessage().contains("Unauthorized"));
} finally {
pulsarClient.close();
}
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
index 4e79cfc..fa8dbf2 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
@@ -40,7 +40,7 @@ public class PulsarAdminException extends Exception {
private static String getReasonFromServer(WebApplicationException e) {
try {
- return e.getResponse().readEntity(ErrorData.class).reason;
+ return
e.getResponse().readEntity(ErrorData.class).reason.toString();
} catch (Exception ex) {
try {
return ObjectMapperFactory.getThreadLocal().readValue(
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index e4d7f3a..9910f64 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -434,12 +434,12 @@ The Apache Software License, Version 2.0
* Java Assist
- javassist-3.25.0-GA.jar
* Jetty
- - jetty-http-9.4.20.v20190813.jar
- - jetty-io-9.4.20.v20190813.jar
- - jetty-security-9.4.20.v20190813.jar
- - jetty-server-9.4.20.v20190813.jar
- - jetty-servlet-9.4.20.v20190813.jar
- - jetty-util-9.4.20.v20190813.jar
+ - jetty-http-9.4.29.v20200521.jar
+ - jetty-io-9.4.29.v20200521.jar
+ - jetty-security-9.4.29.v20200521.jar
+ - jetty-server-9.4.29.v20200521.jar
+ - jetty-servlet-9.4.29.v20200521.jar
+ - jetty-util-9.4.29.v20200521.jar
* Java Native Access
- jna-4.2.0.jar
* Yahoo Datasketches
