Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from jbonofre/JETTY-UPGRADE 

[AMQ-7249] Upgrade to Jetty 9.4.19.v20190610
This commit is contained in:
Jean-Baptiste Onofré 2019-08-24 07:22:46 +02:00 committed by GitHub
parent 84cc95c7ac 973c78cbec
commit 1f410f8685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-amqp/pom.xml
View File

@ -80,6 +80,7 @@
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
<scope>test</scope>
</dependency>
<dependency>

1
activemq-http/pom.xml
View File

@ -58,6 +58,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>

2
activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
View File

@ -92,7 +92,7 @@ public class SecureSocketConnectorFactory extends SocketConnectorFactory {
factory.setSecureRandomAlgorithm(secureRandomCertficateAlgorithm);
}
if (keyCertificateAlgorithm != null) {
factory.setSslKeyManagerFactoryAlgorithm(keyCertificateAlgorithm);
factory.setKeyManagerFactoryAlgorithm(keyCertificateAlgorithm);
}
if (trustCertificateAlgorithm != null) {
factory.setTrustManagerFactoryAlgorithm(trustCertificateAlgorithm);

3
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java
View File

@ -16,19 +16,16 @@
*/
package org.apache.activemq.transport.wss;
import junit.framework.Assert;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.transport.stomp.Stomp;
import org.apache.activemq.transport.stomp.StompFrame;
import org.apache.activemq.transport.ws.MQTTWSConnection;
import org.apache.activemq.transport.ws.StompWSConnection;
import org.apache.activemq.util.Wait;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.client.io.ConnectPromise;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

3
activemq-osgi/pom.xml
View File

@ -71,7 +71,7 @@
org.apache.commons.logging;version="[1.2,2)";resolution:=optional,
javax.jms*;version="[1.1,3)",
javax.management*,
javax.transaction*,
javax.transaction*;version="[1,3)",
javax.naming*;resolution:=optional,
org.apache.commons.pool*;resolution:=optional,
org.apache.commons.net*;resolution:=optional,
@ -83,6 +83,7 @@
org.apache.tools.ant*;resolution:=optional,
org.apache.log4j*;resolution:=optional,
org.json*;resolution:=optional,
org.objectweb.asm;version="[5,8)";resolution:=optional,
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>

1
activemq-unit-tests/pom.xml
View File

@ -265,6 +265,7 @@
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
<scope>test</scope>
</dependency>

1
activemq-web-console/pom.xml
View File

@ -247,6 +247,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
<scope>test</scope>
</dependency>
<dependency>

1
activemq-web-demo/pom.xml
View File

@ -194,6 +194,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
<scope>test</scope>
</dependency>

1
activemq-web/pom.xml
View File

@ -76,6 +76,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
<scope>provided</scope>
</dependency>
<dependency>

1
assembly/pom.xml
View File

@ -329,6 +329,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>

3
pom.xml
View File

@ -76,7 +76,7 @@
<jackson-databind-version>2.9.9.3</jackson-databind-version>
<jasypt-version>1.9.2</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
<jetty9-version>9.2.26.v20180806</jetty9-version>
<jetty9-version>9.4.19.v20190610</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jmdns-version>3.4.1</jmdns-version>
<tomcat-api-version>8.0.53</tomcat-api-version>
@ -950,6 +950,7 @@
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>${jetty-version}</version>
<classifier>uber</classifier>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>