Merge pull request #387 from jbonofre/JETTY-UPGRADE

[AMQ-7249] Upgrade to Jetty 9.4.19.v20190610

Author: jbonofre

activemq-amqp/pom.xml

@@ -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>

activemq-http/pom.xml

@@ -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>

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

@@ -92,7 +92,7 @@ public Connector createConnector(Server server) throws Exception {
                     factory.setSecureRandomAlgorithm(secureRandomCertficateAlgorithm);
                 }
                 if (keyCertificateAlgorithm != null) {
-                    factory.setSslKeyManagerFactoryAlgorithm(keyCertificateAlgorithm);
+                    factory.setKeyManagerFactoryAlgorithm(keyCertificateAlgorithm);
                 }
                 if (trustCertificateAlgorithm != null) {
                     factory.setTrustManagerFactoryAlgorithm(trustCertificateAlgorithm);

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

@@ -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;

activemq-osgi/pom.xml

@@ -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>

activemq-unit-tests/pom.xml

@@ -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>
 

activemq-web-console/pom.xml

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

activemq-web-demo/pom.xml

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

activemq-web/pom.xml

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

assembly/pom.xml

@@ -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>

pom.xml

@@ -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>