You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/20 14:51:41 UTC
[cxf] branch 3.3.x-fixes updated (24b1072 -> 9c9fe8e)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 24b1072 Update to OpenJpa 3.1.0 to address JDK 8/11 source / target builds
new 354fbdd [CXF-8193] upgrade to jetty 9.4.25.v20191220
new 385d29a Attempt to fix JAXRS security tests: there is an SSL configuration change (coming from JAXRSJmsTest) which causes HTTPS-based tests to fail later on.
new 1dd77ac Updating HTTP core/client
new 9c9fe8e Recording .gitmergeinfo Changes
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 4 ++--
.../src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 2 +-
.../src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java | 2 ++
5 files changed, 8 insertions(+), 4 deletions(-)
[cxf] 01/04: [CXF-8193] upgrade to jetty 9.4.25.v20191220
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 354fbdd3cd58e7e7380873638c82aac9bd4e793f
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Jan 19 11:18:01 2020 +0100
[CXF-8193] upgrade to jetty 9.4.25.v20191220
(cherry picked from commit b9732e5a2d4cead834af8246a35b863aa7b8c811)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index cb283cd..af12bea 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.1.3.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
- <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.25.v20191220</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
<cxf.tika.version>1.23</cxf.tika.version>
[cxf] 03/04: Updating HTTP core/client
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1dd77ac8a4f82bb191826d2dbe0655f026227e53
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 20 12:48:15 2020 +0000
Updating HTTP core/client
(cherry picked from commit 25dc5dd9bc68947f0dfb60656bf5d24fb3ef1cb3)
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4f19dbd..e42f654 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -125,9 +125,9 @@
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
- <cxf.httpcomponents.client.version>4.5.10</cxf.httpcomponents.client.version>
+ <cxf.httpcomponents.client.version>4.5.11</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
- <cxf.httpcomponents.core.version>4.4.12</cxf.httpcomponents.core.version>
+ <cxf.httpcomponents.core.version>4.4.13</cxf.httpcomponents.core.version>
<cxf.jackson.version>2.10.1</cxf.jackson.version>
<cxf.jackson.databind.version>2.10.1</cxf.jackson.databind.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
[cxf] 02/04: Attempt to fix JAXRS security tests: there is an SSL
configuration change (coming from JAXRSJmsTest) which causes HTTPS-based
tests to fail later on.
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 385d29a696b8000ce82ca20bbb8a6ab0be687661
Author: reta <dr...@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.
(cherry picked from commit fa1f6120a3a98717d22a4e7ee1c4e0d6cbc9f03e)
---
.../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();
}
[cxf] 04/04: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9c9fe8e09e1bf7dc0529e6ba5cae7d5ee703602e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 20 13:42:09 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1f2ab78..7106c6d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -101,6 +101,7 @@ B e6d432be93022b5b4ac1998a546d0652861fdff3
B ef7f9b1d16ec71ea1186701e20818607ce7d2bba
B eff15d982722111d5da87591bd115cefefe944df
B f0ad8c3079c37c7f1b9eaf0be0ee42ff5ddf5325
+B f1f26101d421e30560b6da5f125852708774718b
B f54062eb331fcf35d9f3a840f532417fccbb2673
B f9c95c5d87a7b948896d8288d2009e03c6313eb7
B f9f5d45bbe302697224128d78e8b698928a7514d
@@ -125,6 +126,7 @@ M a4fc3a0462f09dd6c6c920385b67e621d7e36399
M a61ca44ab50c1a3fc20fbaafe89b372809e0f49b
M aabf37788e571426e70250e7a62c7f4502e4d6e9
M aefdc0759e30cb44d1729f08d1f31ff516a14e03
+M b9732e5a2d4cead834af8246a35b863aa7b8c811
M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
M c1b729ea9f0c43e6560099dbc427751fe33ee088
M d5b612c220bab496c3dab1731e56b3fea36c1b07