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/02/13 11:52:59 UTC
svn commit: r1445548 - in /karaf/trunk:
assemblies/features/spring/src/main/feature/feature.xml pom.xml
Author: jbonofre
Date: Wed Feb 13 10:52:58 2013
New Revision: 1445548
URL: http://svn.apache.org/r1445548
Log:
Rename spring.version property to prepare multiple version support
Modified:
karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml?rev=1445548&r1=1445547&r2=1445548&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml Wed Feb 13 10:52:58 2013
@@ -20,21 +20,21 @@
<!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
- <feature name="spring" description="Spring support" version="${spring.version}" resolver="(obr)">
+ <feature name="spring" description="Spring support" version="${spring31.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/spring-core/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-asm/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-expression/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-beans/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-aop/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-context/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-core/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-asm/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-expression/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-beans/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring31.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 AOP support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
- <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring.version}</bundle>
+ <feature name="spring-aspects" description="Spring AOP support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
</feature>
<feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}" resolver="(obr)">
@@ -55,68 +55,68 @@
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
- <feature name="spring-instrument" description="Spring Instrument support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
- <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring.version}</bundle>
+ <feature name="spring-instrument" description="Spring Instrument support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
</feature>
- <feature name="spring-jdbc" description="Spring JDBC support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring-tx</feature>
- <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
+ <feature name="spring-jdbc" description="Spring JDBC support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring-tx</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
</feature>
- <feature name="spring-jms" description="Spring JMS support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring-web</feature>
+ <feature name="spring-jms" description="Spring JMS support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring-web</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/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.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 Struts support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring-web</feature>
+ <feature name="spring-struts" description="Spring Struts support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.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/spring-struts/${spring.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
</feature>
- <feature name="spring-test" description="Spring Test support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
- <bundle start-level="30">mvn:org.springframework/spring-test/${spring.version}</bundle>
+ <feature name="spring-test" description="Spring Test support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
</feature>
- <feature name="spring-orm" description="Spring ORM support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring-jdbc</feature>
- <bundle start-level="30">mvn:org.springframework/spring-orm/${spring.version}</bundle>
+ <feature name="spring-orm" description="Spring ORM support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
</feature>
- <feature name="spring-oxm" description="Spring OXM support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
- <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring.version}</bundle>
+ <feature name="spring-oxm" description="Spring OXM support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
</feature>
- <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
- <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.version}</bundle>
+ <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring</feature>
+ <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
</feature>
- <feature name="spring-web" description="Spring Web support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
+ <feature name="spring-web" description="Spring Web support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.version}">spring</feature>
<feature version="${http.feature.version}">http</feature>
- <bundle start-level="30">mvn:org.springframework/spring-web/${spring.version}</bundle>
- <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
</feature>
- <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring-web</feature>
+ <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring31.version}" resolver="(obr)">
+ <feature version="${spring31.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/spring-webmvc-portlet/${spring.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
</feature>
<feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
+ <feature version="${spring31.version}">spring</feature>
<bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-io/${gemini.blueprint.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-core/${gemini.blueprint.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-extender/${gemini.blueprint.version}</bundle>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1445548&r1=1445547&r2=1445548&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Feb 13 10:52:58 2013
@@ -216,7 +216,7 @@
<slf4j.version>1.7.2</slf4j.version>
<servicemix.specs.version>2.2.0</servicemix.specs.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
- <spring.version>3.1.3.RELEASE</spring.version>
+ <spring31.version>3.1.3.RELEASE</spring31.version>
<sshd.version>0.8.0</sshd.version>
<struts.bundle.version>1.3.10_1</struts.bundle.version>
<xbean.version>3.12</xbean.version>
@@ -942,7 +942,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
<exclusions>
<exclusion>
<groupId>org.aopalliance</groupId>
@@ -953,92 +953,92 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-struts</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
- <version>${spring.version}</version>
+ <version>${spring31.version}</version>
</dependency>
<dependency>