[camel] branch master updated: CAMEL-14254: Add Camel 3.x migration guide

[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 b9ec19a  CAMEL-14254: Add Camel 3.x migration guide
b9ec19a is described below

commit b9ec19af83739acacc89f93d56cfeec7b0edf4e1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 10 11:28:16 2019 +0100

    CAMEL-14254: Add Camel 3.x migration guide
---
 docs/user-manual-nav.adoc.template                 |  3 +-
 docs/user-manual/modules/ROOT/nav.adoc             |  3 +-
 .../ROOT/pages/camel-3x-migration-guide.adoc       | 48 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/docs/user-manual-nav.adoc.template b/docs/user-manual-nav.adoc.template
index 400637b..823d200 100644
--- a/docs/user-manual-nav.adoc.template
+++ b/docs/user-manual-nav.adoc.template
@@ -160,4 +160,5 @@
  ** xref:faq/why-do-camel-throw-so-many-noclassdeffoundexception-on-startup.adoc[Why do Camel throw so many NoClassDefFoundException on startup?]
  ** xref:faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc[Why does Camel use too many threads with ProducerTemplate?]
  ** xref:faq/why-does-maven-not-download-dependencies.adoc[Why does maven not download dependencies?]
-* xref:camel-3-migration-guide.adoc[Camel 3 Migration Guide]
+* xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide]
+* xref:camel-3x-migration-guide.adoc[Camel 3.x Migration Guide]
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc
index 1083741..65d8e67 100644
--- a/docs/user-manual/modules/ROOT/nav.adoc
+++ b/docs/user-manual/modules/ROOT/nav.adoc
@@ -236,4 +236,5 @@
  ** xref:faq/why-do-camel-throw-so-many-noclassdeffoundexception-on-startup.adoc[Why do Camel throw so many NoClassDefFoundException on startup?]
  ** xref:faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc[Why does Camel use too many threads with ProducerTemplate?]
  ** xref:faq/why-does-maven-not-download-dependencies.adoc[Why does maven not download dependencies?]
-* xref:camel-3-migration-guide.adoc[Camel 3 Migration Guide]
+* xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide]
+* xref:camel-3x-migration-guide.adoc[Camel 3.x Migration Guide]
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
new file mode 100644
index 0000000..45e8639
--- /dev/null
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
@@ -0,0 +1,48 @@
+= Apache Camel 3.x Migration Guide
+
+This document is intended for helping you migrate your Apache Camel application
+from Camel 3.x to Camel 3.y.
+
+IMPORTANT: If you are migrating from Camel 2.x then read first the
+xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide].
+
+For example if you are migrating from Camel 3.0 to 3.2, then you should follow the guides
+from both 3.0 to 3.1 and 3.1 to 3.2.
+
+== Migrating from Camel 3.0 to 3.1
+
+=== camel-nats
+
+The `camel-nats` component has changed its endpoint syntax from `nats:servers` to `nats:topic`.
+For example before
+
+[source,text]
+----
+nats:myserver:4222?topic=myTopic
+----
+
+Should be changed to
+----
+nats:myTopic?servers=myserver:4222
+----
+
+This change is motivated by allowing to configure servers on component level,
+and also for Spring Boot auto-configuration etc.
+
+=== camel-nsq
+
+The `camel-nsq` component has changed its endpoint syntax from `nsq:servers` to `nsq:topic`.
+For example before
+
+[source,text]
+----
+nsq:myserver:4161/myTopic
+----
+
+Should be changed to
+----
+nsq:myTopic?servers=myserver:4161
+----
+
+This change is motivated by allowing to configure servers on component level,
+and also for Spring Boot auto-configuration etc.