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 2013/03/13 17:02:19 UTC
svn commit: r1456013 - in /karaf/branches/karaf-2.x:
assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
assemblies/features/standard/src/main/resources/features.xml pom.xml
Author: jbonofre
Date: Wed Mar 13 16:02:18 2013
New Revision: 1456013
URL: http://svn.apache.org/r1456013
Log:
[KARAF-2185] Add Spring 3.2.x features
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.x/pom.xml
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1456013&r1=1456012&r2=1456013&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg Wed Mar 13 16:02:18 2013
@@ -93,6 +93,7 @@ org.ops4j.pax.url.mvn.defaultRepositorie
#
org.ops4j.pax.url.mvn.repositories= \
http://repo1.maven.org/maven2@id=central, \
+ http://repository.springsource.com/maven/bundles/release@id=spring-ebr, \
https://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype-snapshot, \
https://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j-snapshot, \
http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache, \
Modified: karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1456013&r1=1456012&r2=1456013&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml Wed Mar 13 16:02:18 2013
@@ -192,11 +192,10 @@
</feature>
<feature name="spring-jms" description="Spring 3.1 JMS support" version="${spring31.version}" resolver="(obr)">
- <feature version="${spring31.version}">spring</feature>
+ <feature version="${spring31.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.springframework/spring-jms/${spring31.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
</feature>
<feature name="spring-struts" description="Spring 3.1 Struts support" version="${spring31.version}" resolver="(obr)">
@@ -241,6 +240,82 @@
<bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
</feature>
+ <!-- Spring 3.2 support -->
+
+ <feature name="spring" description="Spring 3.2.x support" version="${spring32.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.springframework/org.springframework.core/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.expression/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.beans/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.aop/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.context/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.context.support/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 3.2 AOP support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.aspects/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 3.2 Instrument support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.instrument/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 3.2 JDBC support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring-tx</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.jdbc/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 3.2 JMS support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.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.springframework/org.springframework.jms/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-struts" description="Spring 3.2 Struts support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.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.springframework/org.springframework.web.struts/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 3.2 Test support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.test/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 3.2 ORM support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.orm/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 3.2 OXM support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.oxm/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 3.2 Transaction (TX) support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.transaction/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 3.2 Web support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring</feature>
+ <feature version="${http.feature.version}">http</feature>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.web/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.web.servlet/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-web-portlet" description="Spring 3.2 Web Portlet support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.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.springframework/org.springframework.web.portlet/${spring32.version}</bundle>
+ </feature>
+
<feature name="wrapper" description="Provide OS integration" version="${project.version}">
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1456013&r1=1456012&r2=1456013&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Wed Mar 13 16:02:18 2013
@@ -186,6 +186,7 @@
<spring2.version>2.5.6.SEC03</spring2.version>
<spring30.version>3.0.7.RELEASE</spring30.version>
<spring31.version>3.1.4.RELEASE</spring31.version>
+ <spring32.version>3.2.1.RELEASE</spring32.version>
<sshd.version>0.8.0</sshd.version>
<struts.bundle.version>1.3.10_1</struts.bundle.version>
<xbean.version>3.12</xbean.version>