You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2015/11/23 11:33:08 UTC
cxf git commit: make feature cxf-ws-security installable in karaf
Repository: cxf
Updated Branches:
refs/heads/master 432ed6477 -> 5d23a4f75
make feature cxf-ws-security installable in karaf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d23a4f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d23a4f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d23a4f7
Branch: refs/heads/master
Commit: 5d23a4f759235cac430c4213ecb50ae7b3300b6b
Parents: 432ed64
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Mon Nov 23 11:23:17 2015 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Mon Nov 23 11:32:12 2015 +0100
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5d23a4f7/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 da1f799..dafdbea 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -118,6 +118,7 @@
<feature version="${project.version}">cxf-ws-policy</feature>
<feature version="${cxf.wss4j.version}">wss4j</feature>
<feature version="${project.version}">cxf-ws-addr</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
<bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-security-saml/${project.version}</bundle>
@@ -308,7 +309,7 @@
<feature name="cxf-transports-jms" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-bindings-soap</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}</bundle>
</feature>