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 24f6584 CXF-8106: Update to Swagger Core 1.5.23 and 2.0.9 24f6584 is described below commit 24f6584cf3d24d6e60d6931fad4d561f92a96e46 Author: reta <drr...@gmail.com> AuthorDate: Sat Sep 7 11:29:45 2019 -0400 CXF-8106: Update to Swagger Core 1.5.23 and 2.0.9 --- .../src/main/resources/OSGI-INF/blueprint/context.xml | 1 + osgi/karaf/features/src/main/resources/features.xml | 6 ++++-- parent/pom.xml | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/resources/OSGI-INF/blueprint/context.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/resources/OSGI-INF/blueprint/context.xml index f5e7b3d..8790a4a 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/resources/OSGI-INF/blueprint/context.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/resources/OSGI-INF/blueprint/context.xml @@ -39,6 +39,7 @@ <!-- CXF OpenApiFeature --> <bean id="openApiFeature" class="org.apache.cxf.jaxrs.openapi.OpenApiFeature"> + <property name="scan" value="false" /> </bean> <cxf:bus> diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 593df85..88fee35 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -317,11 +317,12 @@ <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-common-openapi/${project.version}</bundle> <bundle start-level="35">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${project.version}</bundle> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version}</bundle> <bundle start-level="10" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle> <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.javassist/javassist/${cxf.javassist.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}</bundle> - <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle> + <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.swagger2.guava.version}</bundle> <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-annotations/${cxf.swagger2.version}</bundle> <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-models/${cxf.swagger2.version}</bundle> <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-core/${cxf.swagger2.version}</bundle> @@ -333,7 +334,8 @@ <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-common-openapi/${project.version}</bundle> <bundle start-level="35">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${project.version}</bundle> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-openapi-v3/${project.version}</bundle> - <bundle dependency="true" start-level="35">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version}</bundle> + <bundle start-level="35" dependency="true">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle> <bundle start-level="10" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle> <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> <bundle start-level="30" dependency="true">mvn:io.github.classgraph/classgraph/${cxf.classgraph.version}</bundle> diff --git a/parent/pom.xml b/parent/pom.xml index 0ec8a57..f32d0b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -200,8 +200,9 @@ <cxf.spring.version>5.1.9.RELEASE</cxf.spring.version> <cxf.stax-ex.version>1.7.6</cxf.stax-ex.version> <cxf.swagger.ui.version>3.23.0</cxf.swagger.ui.version> - <cxf.swagger.v3.version>2.0.8</cxf.swagger.v3.version> - <cxf.swagger2.version>1.5.21</cxf.swagger2.version> + <cxf.swagger.v3.version>2.0.9</cxf.swagger.v3.version> + <cxf.swagger2.version>1.5.23</cxf.swagger2.version> + <cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version> <cxf.tika.version>1.22</cxf.tika.version> <cxf.tomcat.version>8.5.45</cxf.tomcat.version> <cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>