You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jp...@apache.org on 2020/04/30 14:57:22 UTC

[camel] branch master updated: Website: Camel3 migration guide: update doc with missing information

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

jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 6bcc3a1  Website: Camel3 migration guide: update doc with missing information
6bcc3a1 is described below

commit 6bcc3a15f27821838a166b02bb998147e7e940e4
Author: John Poth <po...@gmail.com>
AuthorDate: Thu Apr 30 16:56:33 2020 +0200

    Website: Camel3 migration guide: update doc with missing information
---
 docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 4 ++--
 docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
index 1e1bf23..23b4681 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
@@ -51,7 +51,7 @@ In Camel 2.x camel-core was one JAR file, it has now been split up into many JAR
 - camel-util
 - camel-util-json
 
-Maven users of Apache Camel can keep using the dependency `camel-core` which has transitive dependencies on all of its modules, and therefore no migration is needed.
+Maven users of Apache Camel can keep using the dependency `camel-core` which has transitive dependencies on all of its modules, except for `camel-main`, and therefore no migration is needed.
 However, users who want to trim the size of the classes on the classpath, can use fine grained Maven dependencies on only the modules needed.
 You may find how to do that in the examples.
 
@@ -155,7 +155,7 @@ The implementation is still named `org.apache.camel.component.properties.Propert
 
 === Removed components
 
-We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rx` components.
+We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz`, `camel-restlet` and `camel-rx` components.
 
 We removed `camel-jibx` component which wasn't working on JDK 8.
 
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index 5977f27..5bc878e 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -564,6 +564,10 @@ should be rewritten as:
 
 == Upgrading Camel 3.1 to 3.2
 
+```=== JndiRegistry
+
+The deprecated class `org.apache.camel.impl.JndiRegistry` was removed. `org.apache.camel.support.jndi.JndiBeanRepository` should be used instead.
+
 === Rest Configuration
 
 The rest configuration has been simplified and there is now a single RestConfiguration instance (https://issues.apache.org/jira/browse/CAMEL-13844[CAMEL-13844]) per Camel Context.