Repository: camel Updated Branches: refs/heads/master 7910e79ed -> 4ec55a34e
CAMEL-11059: camel-spring-dm - Should be removed. For 2.19.x its disabled, and then we can remove it in next release. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26769947 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26769947 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26769947 Branch: refs/heads/master Commit: 2676994718e70d4bd14a83e1a5b48784a334b7c4 Parents: 7910e79 Author: Claus Ibsen <[email protected]> Authored: Wed Apr 12 13:48:52 2017 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Apr 12 13:48:52 2017 +0200 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/26769947/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index eec9fe5..cada7e2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -58,13 +58,17 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-spring/${project.version}</bundle> </feature> + <!-- disabled camel-spring-dm so users don't install it by accident: CAMEL-11059 <feature name='camel-spring-dm' version='${project.version}' resolver='(obr)' start-level='50'> + <details>camel-spring-dm is deprecated and is strongly advised not to be used. Use blueprint instead</details> <feature version='[1.2,2)'>spring-dm</feature> <feature version='${spring-dm-version-range}'>spring</feature> <feature version='${spring-dm-version-range}'>spring-tx</feature> <bundle>mvn:org.apache.camel/camel-spring-dm/${project.version}</bundle> </feature> + --> <feature name='camel-scr' version='${project.version}' resolver='(obr)' start-level='50'> + <details>camel-scr is deprecated. Consider using blueprint instead</details> <feature version='${project.version}'>camel-core</feature> <feature>scr</feature> <feature>eventadmin</feature> @@ -287,7 +291,7 @@ <bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle> </feature> <feature name='camel-cdi' version='${project.version}' resolver='(obr)' start-level='50'> - <details>camel-cdi in OSGi is deprecated. camel-cdi requires that either pax-cdi-weld or pax-cdi-openwebbeans has been installed</details> + <details>camel-cdi in OSGi is deprecated. Use blueprint instead. camel-cdi requires that either pax-cdi-weld or pax-cdi-openwebbeans has been installed</details> <feature version='${project.version}'>camel-core</feature> <feature version='${pax-cdi-version}'>pax-cdi</feature> <feature>eventadmin</feature>
