Merge branch 'release/3.4.6' into camel-karaf-3.4.x
diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml
index cf3a6ac..c538280 100644
--- a/bom/camel-karaf-bom/pom.xml
+++ b/bom/camel-karaf-bom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>camel-karaf-bom</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index ac31675..66e52e1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/catalog/camel-catalog-provider-karaf/pom.xml b/catalog/camel-catalog-provider-karaf/pom.xml
index 187db4a..f50e98e 100644
--- a/catalog/camel-catalog-provider-karaf/pom.xml
+++ b/catalog/camel-catalog-provider-karaf/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>catalog</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-catalog-provider-karaf</artifactId>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 31fecfc..8de9d41 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/components/camel-blueprint-main/pom.xml b/components/camel-blueprint-main/pom.xml
index b168eeb..e872f11 100644
--- a/components/camel-blueprint-main/pom.xml
+++ b/components/camel-blueprint-main/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint-main</artifactId>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 16abb3b..5b1a37b 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint</artifactId>
diff --git a/components/camel-cxf-blueprint/pom.xml b/components/camel-cxf-blueprint/pom.xml
index ca50d87..9b7111e 100644
--- a/components/camel-cxf-blueprint/pom.xml
+++ b/components/camel-cxf-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-cxf-blueprint</artifactId>
diff --git a/components/camel-cxf-transport-blueprint/pom.xml b/components/camel-cxf-transport-blueprint/pom.xml
index 6622e60..7c921ec 100644
--- a/components/camel-cxf-transport-blueprint/pom.xml
+++ b/components/camel-cxf-transport-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-cxf-transport-blueprint</artifactId>
diff --git a/components/camel-eventadmin/pom.xml b/components/camel-eventadmin/pom.xml
index 2b9f97a..bf3edee 100644
--- a/components/camel-eventadmin/pom.xml
+++ b/components/camel-eventadmin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-eventadmin</artifactId>
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index d1f318f..f91e0f5 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-kura</artifactId>
diff --git a/components/camel-osgi-activator/pom.xml b/components/camel-osgi-activator/pom.xml
index c293f27..78c2168 100644
--- a/components/camel-osgi-activator/pom.xml
+++ b/components/camel-osgi-activator/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-osgi-activator</artifactId>
diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml
index 1f3a77e..e844556 100644
--- a/components/camel-paxlogging/pom.xml
+++ b/components/camel-paxlogging/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-paxlogging</artifactId>
diff --git a/components/camel-servlet-osgi/pom.xml b/components/camel-servlet-osgi/pom.xml
index dc72371..6468403 100644
--- a/components/camel-servlet-osgi/pom.xml
+++ b/components/camel-servlet-osgi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-servlet-osgi</artifactId>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 3abf84b..c76add2 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-test-blueprint</artifactId>
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index 7d8df7c..7b09d1a 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-test-karaf</artifactId>
diff --git a/components/pom.xml b/components/pom.xml
index 8344215..506bbc9 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/core/camel-core-osgi/pom.xml b/core/camel-core-osgi/pom.xml
index 395b1f3..729235f 100644
--- a/core/camel-core-osgi/pom.xml
+++ b/core/camel-core-osgi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>core-modules</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-core-osgi</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index fcfd7a1..98e5b8f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index 3edd579..e039446 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>commands</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-commands-core</artifactId>
diff --git a/platforms/commands/pom.xml b/platforms/commands/pom.xml
index 75779d6..d3e157d 100644
--- a/platforms/commands/pom.xml
+++ b/platforms/commands/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>platforms</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>commands</artifactId>
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 1ab8373..e39337c 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf-platform</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.karaf</groupId>
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 7fecbb4..8e3b2f2 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf-platform</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.karaf</groupId>
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index b62e504..d120f8a 100644
--- a/platforms/karaf/pom.xml
+++ b/platforms/karaf/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>platforms</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>karaf-platform</artifactId>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index be03f16..4760d38 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>platforms</artifactId>
diff --git a/pom.xml b/pom.xml
index bb72155..1a5f5fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.6</version>
</parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Camel Karaf</name>
@@ -105,7 +105,7 @@
<compiler.fork>false</compiler.fork>
<!-- Camel target version -->
- <camel-version>3.4.6-SNAPSHOT</camel-version>
+ <camel-version>3.4.6</camel-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
@@ -704,7 +704,7 @@
<profile>
<id>dev</id>
<properties>
- <camel-version>3.4.6-SNAPSHOT</camel-version>
+ <camel-version>3.4.6</camel-version>
</properties>
</profile>
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index c420261..f967068 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>tests</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint-cxf-test</artifactId>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index 657d20c..0e8ea31 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>tests</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint-test</artifactId>
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index bea19b8..9c6ae64 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>tests</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-itest-osgi</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 1ecd1eb..7f3ba62 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml b/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml
index 8ab5667..63a1870 100644
--- a/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml
+++ b/tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>tooling</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-catalog-generator-karaf-maven-plugin</artifactId>
diff --git a/tooling/camel-karaf-docs-maven-plugin/pom.xml b/tooling/camel-karaf-docs-maven-plugin/pom.xml
index 12918fc..d6f34cc 100644
--- a/tooling/camel-karaf-docs-maven-plugin/pom.xml
+++ b/tooling/camel-karaf-docs-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>tooling</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>camel-karaf-docs-maven-plugin</artifactId>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 05e8eb9..1c477b8 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.4.6-SNAPSHOT</version>
+ <version>3.4.7-SNAPSHOT</version>
</parent>
<artifactId>tooling</artifactId>
