You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/23 12:00:12 UTC
camel git commit: CAMEL-10735: deprecate stuff in OSGi
Repository: camel
Updated Branches:
refs/heads/master 5250afa19 -> 7aec00f43
CAMEL-10735: deprecate stuff in OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7aec00f4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7aec00f4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7aec00f4
Branch: refs/heads/master
Commit: 7aec00f43c8c793b79a17c794bb75dba29add196
Parents: 5250afa
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 23 10:17:53 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 23 13:00:03 2017 +0100
----------------------------------------------------------------------
archetypes/camel-archetype-scr/pom.xml | 2 +-
components/camel-scr/pom.xml | 2 +-
components/readme.adoc | 4 ++--
examples/camel-example-cdi-osgi/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/archetypes/camel-archetype-scr/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/camel-archetype-scr/pom.xml b/archetypes/camel-archetype-scr/pom.xml
index 87fb3f1..8ec0b49 100644
--- a/archetypes/camel-archetype-scr/pom.xml
+++ b/archetypes/camel-archetype-scr/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-scr</artifactId>
- <name>Camel :: Archetypes :: OSGi Service Component Runtime bundle</name>
+ <name>Camel :: Archetypes :: OSGi Service Component Runtime bundle (deprecated)</name>
<description>Creates a new Camel SCR (Declarative Services) bundle project for OSGi</description>
<packaging>maven-archetype</packaging>
http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/components/camel-scr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 5016be2..5505faf 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-scr</artifactId>
- <name>Camel :: SCR</name>
+ <name>Camel :: SCR (deprecated)</name>
<description>Camel with OSGi SCR (Declarative Services)</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 3b4c15a..ff4ef60 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -855,7 +855,7 @@ Miscellaneous Components
^^^^^^^^^^^^^^^^^^^^^^^^
// others: START
-Number of Miscellaneous Components: 36 in 36 JAR artifacts (12 deprecated)
+Number of Miscellaneous Components: 36 in 36 JAR artifacts (13 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -895,7 +895,7 @@ Number of Miscellaneous Components: 36 in 36 JAR artifacts (12 deprecated)
| link:camel-scala/src/main/docs/scala.adoc[Scala DSL] (camel-scala) | 1.4 | *deprecated* Camel Scala DSL
-| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | Camel with OSGi SCR (Declarative Services)
+| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | *deprecated* Camel with OSGi SCR (Declarative Services)
| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servlet Listener] (camel-servletlistener) | 2.11 | Bootstrapping Camel using Servet Listener
http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/examples/camel-example-cdi-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-osgi/pom.xml b/examples/camel-example-cdi-osgi/pom.xml
index 4af73d8..80d6004 100755
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-example-cdi-osgi</artifactId>
- <name>Camel :: Example :: CDI :: OSGi</name>
+ <name>Camel :: Example :: CDI :: OSGi (deprecated)</name>
<description>PAX CDI example</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/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 c4bf366..cdbe42b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -285,7 +285,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 requires that either pax-cdi-weld or pax-cdi-openwebbeans has been installed</details>
+ <details>camel-cdi in OSGi is deprecated. 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>