cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject cxf-dosgi git commit: [DOSGI-235] Switch to Aries RSA 1.8.0
Date Thu, 31 Mar 2016 12:05:20 GMT
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 <chris@die-schneider.net>
Authored: Thu Mar 31 14:02:37 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
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 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.apache.aries.rsa</groupId>
-            <artifactId>spi</artifactId>
-            <version>${project.version}</version>
+            <artifactId>org.apache.aries.rsa.spi</artifactId>
+            <version>${aries.rsa.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -106,6 +107,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
             <version>1.7.14</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="cxf-dosgi-${project.version}">
     <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
-    <repository>mvn:org.apache.aries.rsa/rsa-features/1.8-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.apache.aries.rsa/rsa-features/${aries.rsa.version}/xml/features</repository>
 
     <feature name="cxf-dosgi-base" description="base libs needed outside karaf" version="${project.version}"
resolver="(obr)">
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/1.8.5</bundle>

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 @@
 
         <osgi.version>4.3.1</osgi.version>
         <osgi.compendium.version>4.3.1</osgi.compendium.version>
-        <cxf.version>3.1.5</cxf.version>
+        <aries.rsa.version>1.8.0</aries.rsa.version>
+        <cxf.version>3.1.6</cxf.version>
         <cxf.build-utils.version>3.1.0</cxf.build-utils.version>
         <felix.version>5.4.0</felix.version>
         <spring.version>4.2.4.RELEASE</spring.version>


Mime
View raw message