You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2012/09/03 03:26:12 UTC
svn commit: r1380106 - in /karaf/branches/karaf-2.2.x:
assemblies/features/standard/src/main/resources/features.xml pom.xml
Author: ffang
Date: Mon Sep 3 01:26:12 2012
New Revision: 1380106
URL: http://svn.apache.org/viewvc?rev=1380106&view=rev
Log:
[KARAF-1751]Spring feature dependencies specified too tightly
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1380106&r1=1380105&r2=1380106&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml Mon Sep 3 01:26:12 2012
@@ -58,7 +58,7 @@
<feature name="spring-web" description="Spring 2 Web support" version="${spring2.version}" resolver="(obr)">
<feature version="${spring2.version}">spring</feature>
- <feature version="${project.version}">http</feature>
+ <feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.springframework/spring-web/${spring2.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
</feature>
@@ -92,7 +92,7 @@
<feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}" resolver="(obr)">
<feature version="${spring.osgi.version}">spring-dm</feature>
<feature version="[2.5.6,4)">spring-web</feature>
- <feature version="${project.version}">http</feature>
+ <feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
@@ -142,7 +142,7 @@
<feature name="spring-web" description="Spring Web support" version="${spring.version}" resolver="(obr)">
<feature version="${spring.version}">spring</feature>
- <feature version="${project.version}">http</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>
</feature>
@@ -206,7 +206,7 @@
</feature>
<feature name="http-whiteboard" description="Provide HTTP Whiteboard pattern support" version="${project.version}" resolver="(obr)">
- <feature>http</feature>
+ <feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
</feature>
@@ -232,7 +232,7 @@
realm=karaf
role=${karaf.admin.role}
</config>
- <feature>http</feature>
+ <feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1380106&r1=1380105&r2=1380106&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Mon Sep 3 01:26:12 2012
@@ -171,7 +171,7 @@
<sshd.version>0.7.0</sshd.version>
<xbean.version>3.11.1</xbean.version>
<javax.mail.version>1.4.5</javax.mail.version>
-
+ <http.feature.version>[2,3)</http.feature.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>
<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>