You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/03/21 11:30:10 UTC
git commit: [KARAF-2674] Add spring 4.0.2.RELEASE_1 features
Repository: karaf
Updated Branches:
refs/heads/master 808343e2b -> ebe7b06a6
[KARAF-2674] Add spring 4.0.2.RELEASE_1 features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ebe7b06a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ebe7b06a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ebe7b06a
Branch: refs/heads/master
Commit: ebe7b06a6bf57918e6861e74f09c91a65df21be8
Parents: 808343e
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 21 11:28:08 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 21 11:28:08 2014 +0100
----------------------------------------------------------------------
.../spring/src/main/feature/feature.xml | 82 ++++++++++++++++++++
pom.xml | 1 +
2 files changed, 83 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ebe7b06a/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index f60d0e8..4937d61 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -194,6 +194,88 @@
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
</feature>
+ <!-- Spring 4.0.x support -->
+
+ <feature name="spring" description="Spring 4.0.x support" version="${spring40.version}" resolver="(obr)">
+ <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 4.0.x AOP support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 4.0.x Instrument support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 4.0.x JDBC support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring-tx</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 4.0.x JMS support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring-tx</feature>
+ <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-struts" description="Spring 4.0.x Struts support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring-web</feature>
+ <feature>war</feature>
+ <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 4.0.x Test support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 4.0.x ORM support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 4.0.x OXM support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 4.0.x Transaction (TX) support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 4.0.x Web support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring</feature>
+ <feature version="${http.feature.version}">http</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring40.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring-web</feature>
+ <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 4.0.x WebSocket support" version="${spring40.version}" resolver="(obr)">
+ <feature version="${spring40.version}">spring-web</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring40.version}</bundle>
+ </feature>
+
<!-- Spring Security support -->
<feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}" resolver="(obr)">
http://git-wip-us.apache.org/repos/asf/karaf/blob/ebe7b06a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7ba013c..072281a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,7 @@
<spring.osgi.version>1.2.1</spring.osgi.version>
<spring31.version>3.1.4.RELEASE</spring31.version>
<spring32.version>3.2.8.RELEASE_1</spring32.version>
+ <spring40.version>4.0.2.RELEASE_1</spring40.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
<sshd.version>0.10.1</sshd.version>