ARTEMIS-2601 Update jetty version to 9.4.26.v20200117
This commit is contained in:
parent
7b06050f5f
commit
52e3a0a347
|
@ -56,6 +56,12 @@
|
|||
<groupId>org.jboss.logmanager</groupId>
|
||||
<artifactId>jboss-logmanager</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
||||
<artifactId>jetty-all</artifactId>
|
||||
<type>jar</type>
|
||||
<classifier>uber</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jboss.resteasy</groupId>
|
||||
<artifactId>resteasy-jaxrs</artifactId>
|
||||
|
@ -87,6 +93,7 @@
|
|||
<dependency>
|
||||
<groupId>org.jboss.resteasy</groupId>
|
||||
<artifactId>tjws</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
|
@ -133,11 +140,6 @@
|
|||
<version>2.3.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>2.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
|
|
|
@ -69,7 +69,7 @@ public class WebServerComponent implements ExternalComponent {
|
|||
String scheme = uri.getScheme();
|
||||
|
||||
if ("https".equals(scheme)) {
|
||||
SslContextFactory sslFactory = new SslContextFactory();
|
||||
SslContextFactory.Server sslFactory = new SslContextFactory.Server();
|
||||
sslFactory.setKeyStorePath(webServerConfig.keyStorePath == null ? artemisInstance + "/etc/keystore.jks" : webServerConfig.keyStorePath);
|
||||
sslFactory.setKeyStorePassword(webServerConfig.getKeyStorePassword() == null ? "password" : webServerConfig.getKeyStorePassword());
|
||||
if (webServerConfig.clientAuth != null) {
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -86,7 +86,7 @@
|
|||
<fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
|
||||
<guava.version>24.1.1-jre</guava.version>
|
||||
<jboss.logging.version>3.4.0.Final</jboss.logging.version>
|
||||
<jetty.version>9.4.3.v20170317</jetty.version>
|
||||
<jetty.version>9.4.26.v20200117</jetty.version>
|
||||
<jgroups.version>3.6.13.Final</jgroups.version>
|
||||
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
|
||||
<mockito.version>2.25.0</mockito.version>
|
||||
|
|
Loading…
Reference in New Issue