From commits-return-52287-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Sat Sep 7 20:51:56 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 84B2E180674 for ; Sat, 7 Sep 2019 22:51:56 +0200 (CEST) Received: (qmail 14926 invoked by uid 500); 7 Sep 2019 20:51:56 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14908 invoked by uid 99); 7 Sep 2019 20:51:56 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Sep 2019 20:51:56 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 61A4880FCE; Sat, 7 Sep 2019 20:51:55 +0000 (UTC) Date: Sat, 07 Sep 2019 20:51:55 +0000 To: "commits@cxf.apache.org" Subject: [cxf] 01/02: CXF-8106: Update to Swagger Core 1.5.23 and 2.0.9 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: reta@apache.org In-Reply-To: <156788951488.24800.5385901163637504075@gitbox.apache.org> References: <156788951488.24800.5385901163637504075@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/3.3.x-fixes X-Git-Reftype: branch X-Git-Rev: ba4896378eeb0c01152ea09ae0bdd3e123207736 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190907205155.61A4880FCE@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit ba4896378eeb0c01152ea09ae0bdd3e123207736 Author: reta AuthorDate: Sat Sep 7 11:29:45 2019 -0400 CXF-8106: Update to Swagger Core 1.5.23 and 2.0.9 (cherry picked from commit 24f6584cf3d24d6e60d6931fad4d561f92a96e46) --- .../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 @@ + 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 @@ mvn:org.apache.cxf/cxf-rt-rs-service-description-common-openapi/${project.version} mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${project.version} mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version} + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version} mvn:javax.validation/validation-api/${cxf.validation.api.version} mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version} mvn:org.javassist/javassist/${cxf.javassist.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version} - mvn:com.google.guava/guava/${cxf.guava.version} + mvn:com.google.guava/guava/${cxf.swagger2.guava.version} mvn:io.swagger/swagger-annotations/${cxf.swagger2.version} mvn:io.swagger/swagger-models/${cxf.swagger2.version} mvn:io.swagger/swagger-core/${cxf.swagger2.version} @@ -333,7 +334,8 @@ mvn:org.apache.cxf/cxf-rt-rs-service-description-common-openapi/${project.version} mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${project.version} mvn:org.apache.cxf/cxf-rt-rs-service-description-openapi-v3/${project.version} - mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version} + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version} + mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version} mvn:javax.validation/validation-api/${cxf.validation.api.version} mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version} mvn:io.github.classgraph/classgraph/${cxf.classgraph.version} diff --git a/parent/pom.xml b/parent/pom.xml index 7bcc4e8..35a27a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -197,8 +197,9 @@ 5.1.9.RELEASE 1.7.6 3.23.0 - 2.0.8 - 1.5.21 + 2.0.9 + 1.5.23 + 27.0-jre 1.22 8.5.45 1.3