Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E84E9182C1 for ; Fri, 11 Dec 2015 14:04:09 +0000 (UTC) Received: (qmail 30656 invoked by uid 500); 11 Dec 2015 14:04:09 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30591 invoked by uid 500); 11 Dec 2015 14:04:09 -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 30582 invoked by uid 99); 11 Dec 2015 14:04:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 14:04:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30E71E04BD; Fri, 11 Dec 2015 14:04:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bimargulies@apache.org To: commits@cxf.apache.org Message-Id: <8fb86454c401451f9d409242ad0eaecd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: cxf-6705: Fix versions used to import javax.validation packages. Date: Fri, 11 Dec 2015 14:04:09 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 974280aae -> e5fa40503 cxf-6705: Fix versions used to import javax.validation packages. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e5fa4050 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e5fa4050 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e5fa4050 Branch: refs/heads/master Commit: e5fa40503b793514708fdc6289671dd9718670ef Parents: 974280a Author: Benson Margulies Authored: Fri Dec 11 09:02:36 2015 -0500 Committer: Benson Margulies Committed: Fri Dec 11 09:02:36 2015 -0500 ---------------------------------------------------------------------- core/pom.xml | 2 +- parent/pom.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e5fa4050/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ab6ccbd..cda420d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,7 +56,7 @@ javax.annotation;version="${cxf.osgi.javax.annotation.version}", javax.xml.bind*;version="${cxf.osgi.javax.bind.version}", javax.xml.stream*;version="${cxf.osgi.javax.stream.version}", - javax.validation*;resolution:=optional;version="${cxf.validation.api.version}", + javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}", com.sun.xml.bind.api;resolution:=optional, com.sun.xml.bind.api.impl;resolution:=optional, com.sun.xml.internal.bind.api;resolution:=optional, http://git-wip-us.apache.org/repos/asf/cxf/blob/e5fa4050/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3df4832..ee45d8a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -156,6 +156,9 @@ 2.2.1 1.1.4c_6 1.1.0.Final + + 1.0.0 1.1 1.0 2.1.2.Final