You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/09/16 01:36:53 UTC
[02/22] cxf git commit: [CXF-6800] Add a feature for undertow
transport and make it usable with the pax-tipi osgifi-ed undertow bundles
[CXF-6800] Add a feature for undertow transport and make it usable with the pax-tipi osgifi-ed undertow bundles
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/269e9675
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/269e9675
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/269e9675
Branch: refs/heads/master-jaxrs-2.1
Commit: 269e96752b11aeb3e911da76bd3074d768860968
Parents: f5fabb8
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Sep 12 16:35:02 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Sep 12 16:35:02 2016 +0200
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 5 +++++
parent/pom.xml | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/269e9675/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 196d823..af7952c 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -176,6 +176,11 @@
<bundle start-level="40">mvn:io.netty/netty-codec-http/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-netty-server/${project.version}</bundle>
</feature>
+ <feature name="cxf-http-undertow" version="${project.version}" resolver="(obr)">
+ <feature version="[3,4)">cxf-http</feature>
+ <feature>pax-http-undertow</feature>
+ <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-undertow/${project.version}</bundle>
+ </feature>
<feature name="cxf-bindings-soap" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">cxf-wsdl</feature>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/cxf/blob/269e9675/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bf81458..b41a358 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -123,7 +123,7 @@
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>1.3.7.Final</cxf.undertow.version>
- <cxf.undertow.osgi.version>[1.3.7, 1.4)</cxf.undertow.osgi.version>
+ <cxf.undertow.osgi.version>[1.3, 1.4)</cxf.undertow.osgi.version>
<cxf.jibx.version>1.2.6</cxf.jibx.version>
<cxf.junit.version>4.12</cxf.junit.version>
<cxf.hamcrest.version>1.3</cxf.hamcrest.version>