You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/12/13 18:37:10 UTC
[activemq-artemis] branch main updated: ARTEMIS-3605 Upgrade jetty version to 9.4.44.v20210927
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new c502e94 ARTEMIS-3605 Upgrade jetty version to 9.4.44.v20210927
c502e94 is described below
commit c502e94ade9e050849a2d7fd2431c28ea77f4f0a
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Mon Dec 13 12:11:14 2021 +0100
ARTEMIS-3605 Upgrade jetty version to 9.4.44.v20210927
---
.../org/apache/activemq/artemis/component/WebServerComponent.java | 5 +++++
pom.xml | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index c03a3fe..98b580a 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -32,6 +32,7 @@ import org.apache.activemq.artemis.components.ExternalComponent;
import org.apache.activemq.artemis.dto.AppDTO;
import org.apache.activemq.artemis.dto.ComponentDTO;
import org.apache.activemq.artemis.dto.WebServerDTO;
+import org.eclipse.jetty.security.DefaultAuthenticatorFactory;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
@@ -342,6 +343,10 @@ public class WebServerComponent implements ExternalComponent {
webapp.setAttribute("org.eclipse.jetty.webapp.basetempdir", temporaryWarDir.toFile().getAbsolutePath());
+ // Set the default authenticator factory to avoid NPE due to the following commit:
+ // https://github.com/eclipse/jetty.project/commit/7e91d34177a880ecbe70009e8f200d02e3a0c5dd
+ webapp.getSecurityHandler().setAuthenticatorFactory(new DefaultAuthenticatorFactory());
+
handlers.addHandler(webapp);
return webapp;
}
diff --git a/pom.xml b/pom.xml
index 3095f69..517a0a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
<guava.version>30.1-jre</guava.version>
<jboss.logging.version>3.4.2.Final</jboss.logging.version>
- <jetty.version>9.4.43.v20210629</jetty.version>
+ <jetty.version>9.4.44.v20210927</jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
<errorprone.version>2.9.0</errorprone.version>
<maven.enforcer.plugin.version>3.0.0-M3</maven.enforcer.plugin.version>