You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/06/09 09:20:13 UTC
[1/2] karaf-cave git commit: Upgrade to Karaf 4.0.0.M3
Repository: karaf-cave
Updated Branches:
refs/heads/master 8c2e709e6 -> 168a0732c
Upgrade to Karaf 4.0.0.M3
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/4828004b
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/4828004b
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/4828004b
Branch: refs/heads/master
Commit: 4828004bddbd371b72586cf4ad344e2f6b07476a
Parents: 8c2e709
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jun 9 09:19:19 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jun 9 09:19:19 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/4828004b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9bb2b58..3b840f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<cxf.version>3.1.0</cxf.version>
<httpclient.version>4.3.4</httpclient.version>
<jsoup.version>1.7.3</jsoup.version>
- <karaf.version>4.0.0-SNAPSHOT</karaf.version>
+ <karaf.version>4.0.0.M3</karaf.version>
<osgi.version>5.0.0</osgi.version>
<wagon.version>1.0</wagon.version>
[2/2] karaf-cave git commit: Loosen the requirements a bit on pax-web,
we only require the HttpService and use the http feature as an optional
feature dependency
Posted by gn...@apache.org.
Loosen the requirements a bit on pax-web, we only require the HttpService and use the http feature as an optional feature dependency
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/168a0732
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/168a0732
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/168a0732
Branch: refs/heads/master
Commit: 168a0732ca37b7b0ddd2657f923fafaefd722fb1
Parents: 4828004
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jun 9 09:20:03 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jun 9 09:20:03 2015 +0200
----------------------------------------------------------------------
assembly/src/main/resources/features.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/168a0732/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index c250ecb..18622b7 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="karaf-cave-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+<features name="karaf-cave-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
@@ -45,20 +45,23 @@
</feature>
<feature name="cave-http" version="${project.version}">
- <feature>http</feature>
+ <feature dependency="true">http</feature>
+ <requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<feature>cave-storage</feature>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.http/${project.version}</bundle>
</feature>
<feature name="cave-rest" version="${project.version}">
- <feature>http</feature>
+ <feature dependency="true">http</feature>
+ <requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<feature version="[3,4)">cxf-jaxrs</feature>
<feature>cave-storage</feature>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.rest/${project.version}</bundle>
</feature>
<feature name="cave-maven" version="${project.version}">
- <feature>http</feature>
+ <feature dependency="true">http</feature>
+ <requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.maven/${project.version}</bundle>
</feature>