You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/02/22 00:52:27 UTC
[cxf] 01/01: Merge remote-tracking branch 'origin/master' into CXF-8371
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch CXF-8371
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit edf86a2342e95b883db4709bec6d2f06af34c37a
Merge: 3b4f2b1 57d9eb9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Feb 21 19:52:09 2022 -0500
Merge remote-tracking branch 'origin/master' into CXF-8371
distribution/src/main/release/samples/pom.xml | 4 +-
osgi/itests-felix/pom.xml | 2 +-
parent/pom.xml | 8 +--
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 2 +-
.../cxf/jaxrs/ext/MessageContextImplTest.java | 54 ++++++++++++++++
.../cxf/jaxrs/swagger/ui/SwaggerUiConfig.java | 15 +++++
.../cxf/jaxrs/swagger/ui/SwaggerUiService.java | 73 +++++++++++++++++-----
rt/transports/http/pom.xml | 2 +-
... => SwaggerUiConfigurationQueryConfigTest.java} | 28 +++------
.../description/SwaggerUiConfigurationTest.java | 18 ++++++
10 files changed, 162 insertions(+), 44 deletions(-)
diff --cc distribution/src/main/release/samples/pom.xml
index 3ff178a,e653adf..045d836
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@@ -30,14 -30,14 +30,14 @@@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.boot.version>2.6.3</spring.boot.version>
- <spring.cloud.eureka.version>3.1.1</spring.cloud.eureka.version>
- <cxf.jetty9.version>9.4.45.v20220203</cxf.jetty9.version>
+ <spring.boot.version>3.0.0-M1</spring.boot.version>
+ <spring.cloud.eureka.version>3.1.0</spring.cloud.eureka.version>
+ <cxf.jetty11.version>11.0.8</cxf.jetty11.version>
<cxf.netty.version>4.1.74.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>4.1.2</cxf.swagger.ui.version>
- <cxf.tika.version>2.2.1</cxf.tika.version>
+ <cxf.swagger.ui.version>4.5.0</cxf.swagger.ui.version>
+ <cxf.tika.version>2.3.0</cxf.tika.version>
- <cxf.tomcat.version>9.0.58</cxf.tomcat.version>
+ <cxf.tomcat.version>10.1.0-M10</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
</properties>
<dependencies>
diff --cc parent/pom.xml
index d9846d0,41e00fa..acc0b55
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -200,20 -198,20 +200,20 @@@
<cxf.slf4j.version>1.7.36</cxf.slf4j.version>
<cxf.snakeyaml.version>1.30</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>2.6.3</cxf.spring.boot.version>
- <cxf.spring.ldap.version>2.3.6.RELEASE</cxf.spring.ldap.version>
+ <cxf.spring.boot.version>3.0.0-M1</cxf.spring.boot.version>
+ <cxf.spring.ldap.version>2.4.0-M1</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
- <cxf.spring.security.version>5.6.2</cxf.spring.security.version>
- <cxf.spring.version>5.3.16</cxf.spring.version>
+ <cxf.spring.security.version>6.0.0-M1</cxf.spring.security.version>
+ <cxf.spring.version>6.0.0-M2</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>4.1.2</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>4.5.0</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.13</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.5</cxf.swagger2.version>
<cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
<cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
- <cxf.tika.version>2.2.1</cxf.tika.version>
+ <cxf.tika.version>2.3.0</cxf.tika.version>
- <cxf.tomcat.version>9.0.58</cxf.tomcat.version>
+ <cxf.tomcat.version>10.1.0-M10</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.7</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.xnio.osgi.version>[3.3,4.0)</cxf.undertow.xnio.osgi.version>
diff --cc rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index e17460e,4a6c67f..f5e73f2
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@@ -19,19 -19,31 +19,30 @@@
package org.apache.cxf.jaxrs.ext;
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+ import java.io.OutputStream;
+ import java.util.Collections;
+ import java.util.UUID;
+
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Providers;
-import javax.xml.bind.JAXBContext;
-
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.HttpHeaders;
++import jakarta.ws.rs.core.MultivaluedHashMap;
++import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.ContextResolver;
+import jakarta.ws.rs.ext.Providers;
+import jakarta.xml.bind.JAXBContext;
+ import org.apache.cxf.binding.Binding;
import org.apache.cxf.endpoint.Endpoint;
+ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+ import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
import org.apache.cxf.jaxrs.impl.HttpHeadersImpl;
import org.apache.cxf.jaxrs.impl.HttpServletRequestFilter;
import org.apache.cxf.jaxrs.impl.HttpServletResponseFilter;
diff --cc rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java
index 75e4ad4,bfccf12..74067f3
--- a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java
+++ b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java
@@@ -23,17 -24,22 +24,22 @@@ import java.io.InputStream
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+ import org.apache.cxf.common.util.StringUtils;
+ import org.apache.cxf.helpers.IOUtils;
+
@Path("api-docs")
public class SwaggerUiService {