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 98C26185B1 for ; Thu, 31 Mar 2016 12:05:20 +0000 (UTC) Received: (qmail 53644 invoked by uid 500); 31 Mar 2016 12:05:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 53576 invoked by uid 500); 31 Mar 2016 12:05:20 -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 53567 invoked by uid 99); 31 Mar 2016 12:05:20 -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; Thu, 31 Mar 2016 12:05:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 395F9DFDCF; Thu, 31 Mar 2016 12:05:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@cxf.apache.org Message-Id: <39a8f56d204f497880084b032c4ef64e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf-dosgi git commit: [DOSGI-235] Switch to Aries RSA 1.8.0 Date: Thu, 31 Mar 2016 12:05:20 +0000 (UTC) Repository: cxf-dosgi Updated Branches: refs/heads/master edca3c4a6 -> 7a73a59a6 [DOSGI-235] Switch to Aries RSA 1.8.0 Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/7a73a59a Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/7a73a59a Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/7a73a59a Branch: refs/heads/master Commit: 7a73a59a6d4a0cb53df2ea1a92631cfa72888542 Parents: edca3c4 Author: Christian Schneider Authored: Thu Mar 31 14:02:37 2016 +0200 Committer: Christian Schneider Committed: Thu Mar 31 14:02:37 2016 +0200 ---------------------------------------------------------------------- cxf-dsw/pom.xml | 8 +++++--- distribution/features/src/main/resources/features.xml | 2 +- parent/pom.xml | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/7a73a59a/cxf-dsw/pom.xml ---------------------------------------------------------------------- diff --git a/cxf-dsw/pom.xml b/cxf-dsw/pom.xml index 92ef7ae..bc4b9a9 100644 --- a/cxf-dsw/pom.xml +++ b/cxf-dsw/pom.xml @@ -43,17 +43,18 @@ org.osgi org.osgi.core + provided org.osgi org.osgi.compendium + provided - org.apache.aries.rsa - spi - ${project.version} + org.apache.aries.rsa.spi + ${aries.rsa.version} org.apache.cxf @@ -106,6 +107,7 @@ org.slf4j slf4j-jdk14 1.7.14 + test http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/7a73a59a/distribution/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/distribution/features/src/main/resources/features.xml b/distribution/features/src/main/resources/features.xml index d4f2a82..d24ce78 100644 --- a/distribution/features/src/main/resources/features.xml +++ b/distribution/features/src/main/resources/features.xml @@ -1,7 +1,7 @@ mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features - mvn:org.apache.aries.rsa/rsa-features/1.8-SNAPSHOT/xml/features + mvn:org.apache.aries.rsa/rsa-features/${aries.rsa.version}/xml/features mvn:org.ops4j.pax.logging/pax-logging-api/1.8.5 http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/7a73a59a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cf58737..fc33c17 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -38,7 +38,8 @@ 4.3.1 4.3.1 - 3.1.5 + 1.8.0 + 3.1.6 3.1.0 5.4.0 4.2.4.RELEASE