[camel-karaf] branch main updated: CAMEL-16572: camel-spring-jdbc - Make camel-jdbc springless again

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new d583dcd  CAMEL-16572: camel-spring-jdbc - Make camel-jdbc springless 
again
d583dcd is described below

commit d583dcd8fab79cf58eaac56ad9ad9acf6d46e6d7
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 4 09:35:44 2021 +0200

    CAMEL-16572: camel-spring-jdbc - Make camel-jdbc springless again
---
 platforms/karaf/features/src/main/resources/features.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 87249f2..0bfd539 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1088,7 +1088,6 @@
   </feature>
   <feature name='camel-jdbc' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <feature version='${spring-version-range}'>spring-jdbc</feature>
     <bundle>mvn:org.apache.camel/camel-jdbc/${project.version}</bundle>
   </feature>
   <feature name='camel-jetty' version='${project.version}' start-level='50'>
@@ -1976,6 +1975,11 @@
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
   </feature>
+  <feature name='camel-spring-jdbc' version='${project.version}' 
start-level='50'>
+    <feature version='${project.version}'>camel-jdbc</feature>
+    <feature version='${spring-version-range}'>spring-jdbc</feature>
+    <bundle>mvn:org.apache.camel/camel-spring-jdbc/${project.version}</bundle>
+  </feature>
   <feature name='camel-spring-ldap' version='${project.version}' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <feature>transaction</feature>