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: Adapting to changes in Aries RSA
Date Mon, 14 Mar 2016 17:40:06 GMT
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 51f07870c -> edca3c4a6


Adapting to changes in Aries RSA


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/edca3c4a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/edca3c4a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/edca3c4a

Branch: refs/heads/master
Commit: edca3c4a68b32e95ab005d2185314b22eeb4548c
Parents: 51f0787
Author: Christian Schneider <chris@die-schneider.net>
Authored: Mon Mar 14 18:39:58 2016 +0100
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Mon Mar 14 18:39:58 2016 +0100

----------------------------------------------------------------------
 distribution/features/src/main/resources/features.xml | 2 +-
 distribution/multi-bundle/pom.xml                     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/edca3c4a/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 26932b1..d4f2a82 100644
--- a/distribution/features/src/main/resources/features.xml
+++ b/distribution/features/src/main/resources/features.xml
@@ -3,7 +3,7 @@
     <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>
 
-	<feature name="cxf-dosgi-base" description="base libs needed outside karaf" version="${project.version}"
resolver="(obr)">
+    <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>
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/1.8.5</bundle>
         <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.8.8</bundle>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/edca3c4a/distribution/multi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index 3053200..0b76d58 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -67,7 +67,6 @@
               <features>
                 <feature>cxf-dosgi-base</feature>
                 <feature>aries-rsa-discovery-zookeeper</feature>
-                <feature>aries-rsa-zookeeper-server</feature>
                 <feature>cxf-dosgi-provider-cxf</feature>
               </features>
               <repository>target/distribution_bundles</repository>


Mime
View raw message