[cxf] branch master updated: Attempt to fix JAXRS security tests: there is an SSL configuration change (coming from JAXRSJmsTest) which causes HTTPS-based tests to fail later on.

[reta]

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new fa1f612  Attempt to fix JAXRS security tests: there is an SSL 
configuration change (coming from JAXRSJmsTest) which causes HTTPS-based tests 
to fail later on.
fa1f612 is described below

commit fa1f6120a3a98717d22a4e7ee1c4e0d6cbc9f03e
Author: reta <drr...@gmail.com>
AuthorDate: Sun Jan 19 20:51:59 2020 -0500

    Attempt to fix JAXRS security tests: there is an SSL configuration change 
(coming from JAXRSJmsTest) which causes HTTPS-based tests to fail later on.
---
 .../src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java    | 2 +-
 .../jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
index 0abf3b4..0badeed 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
@@ -77,7 +77,7 @@ public class JAXRSJmsTest extends 
AbstractBusClientServerTestBase {
                   System.getProperty("java.util.logging.config.file"));
 
         assertTrue("server did not launch correctly",
-                   launchServer(EmbeddedJMSBrokerLauncher.class, props, null));
+                   launchServer(EmbeddedJMSBrokerLauncher.class, props, null, 
false));
         assertTrue("server did not launch correctly",
                    launchServer(JMSServer.class, true));
         serversStarted = true;
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java
index d267da8..903bf31 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java
@@ -19,6 +19,7 @@
 package org.apache.cxf.systest.jaxrs.jms;
 
 import org.apache.activemq.broker.BrokerService;
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -32,6 +33,7 @@ public class JMSServer extends AbstractBusTestServerBase {
     }
 
     public void tearDown() {
+        context.getBean(JAXRSServerFactoryBean.class).getServer().destroy();
         context.close();
     }