You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/11/03 18:26:40 UTC
[1/2] git commit: Remove unused osgi imports that are causing issues
on Karaf4
Repository: cxf
Updated Branches:
refs/heads/master 61c7b99b6 -> f97778f0c
Remove unused osgi imports that are causing issues on Karaf4
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/48262ef2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/48262ef2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/48262ef2
Branch: refs/heads/master
Commit: 48262ef26a489c664afdd6459988002eba34bc15
Parents: 61c7b99
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Nov 3 12:18:44 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Nov 3 12:18:44 2014 -0500
----------------------------------------------------------------------
osgi/karaf/commands/pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/48262ef2/osgi/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml
index 31f589f..1e4be47 100644
--- a/osgi/karaf/commands/pom.xml
+++ b/osgi/karaf/commands/pom.xml
@@ -64,10 +64,8 @@
<instructions>
<Import-Package>
!org.apache.cxf.karaf.commands,
- org.apache.felix.service.command;version="[0.6,1)",
- org.apache.felix.gogo.commands;version="[0.6,1)",
org.apache.cxf*;version="[3,4)",
- org.apache.karaf.shell.console;version="[2.3,4)",
+ org.apache.karaf.shell*;version="[2.3,5)",
*
</Import-Package>
<_nouses>true</_nouses>
[2/2] git commit: Update features to work with Karaf 4
Posted by dk...@apache.org.
Update features to work with Karaf 4
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f97778f0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f97778f0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f97778f0
Branch: refs/heads/master
Commit: f97778f0c21a4dc0f083e840e8157fe2f8528d90
Parents: 48262ef
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Nov 3 12:26:13 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Nov 3 12:26:13 2014 -0500
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f97778f0/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 0a57fad..6199382 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -125,12 +125,12 @@
</feature>
<feature name="cxf-http" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">cxf-core</feature>
- <feature version="[2,4)">http-whiteboard</feature>
+ <feature version="[2,5)">http-whiteboard</feature>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
</feature>
<feature name="cxf-http-jetty" version="${project.version}" resolver="(obr)">
<feature version="[3,4)">cxf-http</feature>
- <feature version="[7,9)">jetty</feature>
+ <feature version="[7,10)">jetty</feature>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
</feature>
<feature name="cxf-http-async" version="${project.version}" resolver="(obr)">