You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2014/12/04 15:53:59 UTC
cxf git commit: CXF-6135 Make sure CXF installs on karaf 4 minimal
Repository: cxf
Updated Branches:
refs/heads/master 30853113b -> 03bd1b4f0
CXF-6135 Make sure CXF installs on karaf 4 minimal
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/03bd1b4f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/03bd1b4f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/03bd1b4f
Branch: refs/heads/master
Commit: 03bd1b4f0beaddf4df112f7c08d5749862805dfa
Parents: 3085311
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Dec 4 15:53:42 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Dec 4 15:53:52 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 1 +
osgi/karaf/features/src/main/resources/features.xml | 3 +++
rt/frontend/jaxws/pom.xml | 6 ++++++
rt/transports/http/pom.xml | 1 +
4 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/03bd1b4f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d7e8f7a..54dcd67 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -198,6 +198,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>net.java.dev.msv</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/03bd1b4f/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index dfd3eb7..7174b36 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -79,6 +79,9 @@
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-core/${project.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-commands" version="${project.version}" resolver="(obr)">
+ <feature version="${project.version}">cxf-core</feature>
<bundle start-level="40">mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
</feature>
<feature name="cxf-wsdl" version="${project.version}" resolver="(obr)">
http://git-wip-us.apache.org/repos/asf/cxf/blob/03bd1b4f/rt/frontend/jaxws/pom.xml
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index 1b9f1c8..8a78748 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -47,6 +47,12 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>1.0.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/03bd1b4f/rt/transports/http/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 5e254c9..56f68b0 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -70,6 +70,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>