[camel] branch master updated: Update camel-3x-upgrade-guide-3_4.adoc

[da...@apache.org]

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

davsclaus 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 5145f4b  Update camel-3x-upgrade-guide-3_4.adoc
5145f4b is described below

commit 5145f4bd57cc22b1fc56e8f1cbbb35f05972f039
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed May 20 08:21:18 2020 +0200

    Update camel-3x-upgrade-guide-3_4.adoc
---
 .../modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
index d6d7b9c..eb9a0af 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
@@ -6,15 +6,6 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
 
 == Upgrading Camel 3.3 to 3.4
 
-=== camel-servlet and camel-http-common
-HttpRegistry and DefaultHttpRegistry classes from camel-servlet are moved from camel-servlet into camel-http-common.
-HttpRegistryProvider is added and used in DefaultHttpRegistry instead of CamelServlet which is implementing HttpRegistryProvider
-since DefaultHttpRegistry is used in camel-resteasy component where CamelResteasy servlet also implementing HttpRegistryProvider.
-
-These changes had effects on camel-atmosphere-websocket and camel-servlet and also camel-resteasy.
-Users of these components where they would have custom implemetations on DefaultHttpRegistry and using CamelServlet class should 
-take this change into account.
-
 === camel-test and JMX
 
 The `camel-test` module no longer has dependency on `camel-management` out of the box.
@@ -66,3 +57,10 @@ import static org.apache.camel.builder.Builder.language;
 The `/actuator/camelroutes` HTTP endpoint has been removed from provided Spring Boot actuators in `camel-spring-boot`.
 This actuator was becoming problematic to maintain during Spring Boot upgrades due to changes in Spring Boot.
 
+=== camel-servlet and camel-http-common
+
+`HttpRegistry` and `DefaultHttpRegistry` classes from camel-servlet are moved from camel-servlet into camel-http-common.
+`HttpRegistryProvider` is added and used in `DefaultHttpRegistry` instead of `CamelServlet`.
+
+These changes had effects on camel-atmosphere-websocket and camel-servlet and also camel-resteasy.
+Users of these components where they would have custom implemetations on `DefaultHttpRegistry` and using `CamelServlet` class should take this change into account.