geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1295408 - /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
Date Thu, 01 Mar 2012 04:21:42 GMT
Author: xiaming
Date: Thu Mar  1 04:21:42 2012
New Revision: 1295408

URL: http://svn.apache.org/viewvc?rev=1295408&view=rev
Log:
GERONIMO-6278 fix wrong version settings in karaf feature configuration file, provided by
Tina Li, for 3.0-beta

Modified:
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/features.xml

Modified: geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/features.xml?rev=1295408&r1=1295407&r2=1295408&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
(original)
+++ geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
Thu Mar  1 04:21:42 2012
@@ -37,19 +37,19 @@
         <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
         <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
         <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
-        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${karaf.version}</bundle>
     </feature>
 -->
     <feature name="wrapper" version="${project.version}">
-        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${karaf.version}</bundle>
     </feature>
     <feature name="obr" version="${project.version}">
         <bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
-        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle>
-        <bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${karaf.version}</bundle>
+        <bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${karaf.version}</bundle>
     </feature>
     <feature name="config" version="${project.version}">
-        <bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${karaf.version}</bundle>
     </feature>
     <feature name="http" version="${project.version}">
         <config name="org.ops4j.pax.web">
@@ -68,7 +68,7 @@
         <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
-        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${karaf.version}</bundle>
     </feature>
     <feature name="webconsole-base" version="${project.version}">
         <feature version="${project.version}">http</feature>
@@ -76,14 +76,14 @@
             realm=karaf
         </config>
         <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
-        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${karaf.version}</bundle>
         <bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
     </feature>
     <feature name="webconsole" version="${project.version}">
         <feature version="${project.version}">webconsole-base</feature>
-        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
-        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
-        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${karaf.version}</bundle>
+        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${karaf.version}</bundle>
+        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${karaf.version}</bundle>
     </feature>
     <feature name="ssh" version="${project.version}">
         <config name="org.apache.karaf.shell">
@@ -94,10 +94,10 @@
         </config>
         <bundle>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
         <bundle>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
-        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${karaf.version}</bundle>
     </feature>
     <feature name="management" version="${project.version}">
-        <bundle>mvn:org.apache.karaf/org.apache.karaf.management/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf/org.apache.karaf.management/${karaf.version}</bundle>
         <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
         <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
     </feature>
@@ -105,6 +105,6 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
-        <bundle>mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
+        <bundle>mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${karaf.version}</bundle>
     </feature>
 </features>



Mime
View raw message