You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gn...@apache.org on 2016/09/20 13:07:35 UTC
[2/2] cxf git commit: [CXF-7060] Use 1.3 version of the namespace and
remove snapshots references
[CXF-7060] Use 1.3 version of the namespace and remove snapshots references
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcb96eb5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcb96eb5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcb96eb5
Branch: refs/heads/master
Commit: bcb96eb5cbdfcd473da2ef64709ec0dc541d3609
Parents: 629af81
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Sep 20 13:05:27 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Sep 20 15:06:51 2016 +0200
----------------------------------------------------------------------
osgi/karaf4/features/src/main/resources/features.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb96eb5/osgi/karaf4/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf4/features/src/main/resources/features.xml b/osgi/karaf4/features/src/main/resources/features.xml
index 6d98973..fef8dbf 100644
--- a/osgi/karaf4/features/src/main/resources/features.xml
+++ b/osgi/karaf4/features/src/main/resources/features.xml
@@ -16,11 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="cxf-${project.version}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="cxf-${project.version}">
- <repository>mvn:org.ops4j.pax.web/pax-web-features/6.0.0-SNAPSHOT/xml/features</repository>
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/[1.0.0.RC1,2)/xml/features</repository>
- <repository>mvn:org.apache.activemq/activemq-karaf/[5.4,6)/xml/features</repository>
<feature name="cxf-specs" version="${project.version}">
<bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
@@ -449,14 +447,14 @@
cxf.wsn.activemq.username = karaf
cxf.wsn.activemq.password = karaf
</config>
- <!--<feature version="[5.4,6)">activemq</feature>-->
<feature>spring</feature>
+ <feature>aries-blueprint</feature>
<feature version="${project.version}">cxf-wsn-api</feature>
<feature version="${project.version}">cxf-http-jetty</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
- <bundle dependency="true">mvn:org.apache.activemq/activemq-osgi/5.15.0-SNAPSHOT</bundle>
+ <bundle dependency="true">mvn:org.apache.activemq/activemq-osgi/5.14.0</bundle>
<bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}</bundle>
</feature>
<feature name="cxf-ws-discovery-api" version="${project.version}">