This is an automated email from the ASF dual-hosted git repository.
acosentino 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 f376acb Camel documentation: Move the correct information in the
section from 3.1-3.2
f376acb is described below
commit f376acb0e2ccd8c29aed035c91c28fc2f3bfb32d
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Apr 6 16:08:30 2020 +0200
Camel documentation: Move the correct information in the section from
3.1-3.2
---
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 35 +++++++---------------
1 file changed, 10 insertions(+), 25 deletions(-)
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 d2284e4..14f73bf 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
@@ -9,30 +9,6 @@ xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration
Guide].
For example if you are upgrading 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.
-== Upgrading Camel 3.1 to 3.2
-
-=== 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.
-
-The following methods have been removed:
-
-* org.apache.camel.CamelContext#addRestConfiguration(RestConfiguration
restConfiguration)
-* org.apache.camel.CamelContext#getRestConfiguration(String component, boolean
defaultIfNotFound)
-* org.apache.camel.CamelContext#getRestConfigurations
-
-
-https://issues.apache.org/jira/browse/CAMEL-13844
-
-=== Camel Cloud
-
-The following `ServiceDiscovery` implementation has been removed:
-
-* org.apache.camel.impl.cloud.CachingServiceDiscovery
-* org.apache.camel.impl.cloud.CachingServiceDiscoveryFactory
-
-https://issues.apache.org/jira/browse/CAMEL-14813
-
== Upgrading Camel 3.0 to 3.1
=== camel-ahc, camel-netty-http, camel-undertow
@@ -574,6 +550,15 @@ The following methods have been removed:
https://issues.apache.org/jira/browse/CAMEL-13844
+=== Camel Cloud
+
+The following `ServiceDiscovery` implementation has been removed:
+
+* org.apache.camel.impl.cloud.CachingServiceDiscovery
+* org.apache.camel.impl.cloud.CachingServiceDiscoveryFactory
+
+https://issues.apache.org/jira/browse/CAMEL-14813
+
=== Camel with Karaf and OSGi
Camel on Apache Karaf / OSGi has been moved to its own project at:
https://github.com/apache/camel-karaf
@@ -1098,4 +1083,4 @@ JVM settings to be able to manage Camel remotely on
localhost, port 9913:
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
-Djava.rmi.server.hostname=localhost
-----
\ No newline at end of file
+----
