You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2020/01/02 08:06:52 UTC
[cxf] branch master updated (d3c23af -> 325ed04)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from d3c23af Update Bouncycastle version
new 2f47c80 Revert "Update Jetty version" (due to missing Content-Type in response)
new 325ed04 improved test assertions
The 2 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:
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 +++++++--
3 files changed, 9 insertions(+), 4 deletions(-)
[cxf] 02/02: improved test assertions
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 325ed0436bc9cfa9150b3504a54b5911b47e3266
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Thu Jan 2 09:06:16 2020 +0100
improved test assertions
---
parent/pom.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 58c175c..93e8460 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
<cxf.jettison.version>1.4.0</cxf.jettison.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
- <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version><!-- 9.4.25 will break JAXRSRequestDispatcherTest.testGetBookHTMLInclude -->
<cxf.jexl.version>3.1</cxf.jexl.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
index d2f5c2c..ce005aa 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.systest.jaxrs;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.xml.XMLSource;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -31,6 +33,7 @@ import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase {
@@ -65,8 +68,10 @@ public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase
namespaces.put("books", "http://www.w3.org/books");
String value = source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);
assertEquals("CXF Rocks", value);
- String ct = client.getResponse().getMetadata().getFirst("Content-Type").toString();
- assertEquals("text/html", ct);
+ Object contentType = client.getResponse().getMetadata().getFirst("Content-Type");
+ assertNotNull("Content-Type should be present", contentType);
+ assertEquals("text/html", contentType.toString());
+ assertEquals(MediaType.TEXT_HTML_TYPE, client.getResponse().getMediaType());
}
@Test
[cxf] 01/02: Revert "Update Jetty version" (due to missing
Content-Type in response)
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2f47c807b37758e10fb2d6c7746fd3f40451b566
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Thu Jan 2 08:55:54 2020 +0100
Revert "Update Jetty version" (due to missing Content-Type in response)
This reverts commit ef7f9b1d
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 8ed643a..91fbe05 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.25.v20191220</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
<cxf.tika.version>1.23</cxf.tika.version>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4dd0318..58c175c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
<cxf.jettison.version>1.4.0</cxf.jettison.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
- <cxf.jetty9.version>9.4.25.v20191220</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
<cxf.jexl.version>3.1</cxf.jexl.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>