You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2020/08/05 18:12:45 UTC
[cxf] branch master updated: Update to latest jackson
This is an automated email from the ASF dual-hosted git repository.
dkulp 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 a15c1e1 Update to latest jackson
a15c1e1 is described below
commit a15c1e19669ef1f52d9f470daae8856c52ffc0c8
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Aug 5 14:12:23 2020 -0400
Update to latest jackson
---
parent/pom.xml | 4 ++--
.../apache/cxf/systest/jaxrs/{ => nonspring}/BookStoreOpenAPI.java | 3 ++-
.../systest/jaxrs/{ => nonspring}/JAXRSNonSpringJaxrsServletTest.java | 3 ++-
.../jaxrs/{ => nonspring}/NonSpringJaxrsServletBookServer.java | 2 +-
.../jaxrs/{ => nonspring}/NonSpringJaxrsServletBookServer2.java | 3 ++-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d014ae7..8125b79 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,8 +127,8 @@
<cxf.httpcomponents.client.version>4.5.12</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.13</cxf.httpcomponents.core.version>
- <cxf.jackson.version>2.11.1</cxf.jackson.version>
- <cxf.jackson.databind.version>2.11.1</cxf.jackson.databind.version>
+ <cxf.jackson.version>2.11.2</cxf.jackson.version>
+ <cxf.jackson.databind.version>2.11.2</cxf.jackson.databind.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.3.1</cxf.jaeger.version>
<cxf.jakarta.activation.version>1.2.2</cxf.jakarta.activation.version>
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreOpenAPI.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/BookStoreOpenAPI.java
similarity index 92%
rename from systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreOpenAPI.java
rename to systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/BookStoreOpenAPI.java
index e87643f..cb08b65 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreOpenAPI.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/BookStoreOpenAPI.java
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.cxf.systest.jaxrs;
+package org.apache.cxf.systest.jaxrs.nonspring;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import org.apache.cxf.feature.Features;
+import org.apache.cxf.systest.jaxrs.Book;
@Path("/bookstore")
@Features(features = "org.apache.cxf.jaxrs.openapi.OpenApiFeature")
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSNonSpringJaxrsServletTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java
similarity index 97%
rename from systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSNonSpringJaxrsServletTest.java
rename to systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java
index b60c258..16a8560 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSNonSpringJaxrsServletTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.cxf.systest.jaxrs;
+package org.apache.cxf.systest.jaxrs.nonspring;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.systest.jaxrs.Book;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.BeforeClass;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NonSpringJaxrsServletBookServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/NonSpringJaxrsServletBookServer.java
similarity index 98%
rename from systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NonSpringJaxrsServletBookServer.java
rename to systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/NonSpringJaxrsServletBookServer.java
index adaf782..fbb500b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NonSpringJaxrsServletBookServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/NonSpringJaxrsServletBookServer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.systest.jaxrs;
+package org.apache.cxf.systest.jaxrs.nonspring;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NonSpringJaxrsServletBookServer2.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/NonSpringJaxrsServletBookServer2.java
similarity index 95%
rename from systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NonSpringJaxrsServletBookServer2.java
rename to systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/NonSpringJaxrsServletBookServer2.java
index fc1b609..d4df6e9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NonSpringJaxrsServletBookServer2.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/NonSpringJaxrsServletBookServer2.java
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.cxf.systest.jaxrs;
+package org.apache.cxf.systest.jaxrs.nonspring;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
+import org.apache.cxf.systest.jaxrs.BookApplicationNonSpring;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;