Merge branch 'release/3.11.6' into camel-karaf-3.11.x
diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml
index eaec297..4fa85ed 100644
--- a/archetypes/camel-archetype-blueprint/pom.xml
+++ b/archetypes/camel-archetype-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 82883df..c3894df 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml
index dbb845f..8a02ff9 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>camel-karaf-bom</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index cefcb4f..1756803 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 6f44940..2e39b07 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-catalog-provider-karaf</artifactId>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 171e86f..7027987 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/components/camel-bean-osgi/pom.xml b/components/camel-bean-osgi/pom.xml
index a6e0cd8..450eef2 100644
--- a/components/camel-bean-osgi/pom.xml
+++ b/components/camel-bean-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-bean-osgi</artifactId>
diff --git a/components/camel-bean-validator-osgi/pom.xml b/components/camel-bean-validator-osgi/pom.xml
index 4d342f8..ab52607 100644
--- a/components/camel-bean-validator-osgi/pom.xml
+++ b/components/camel-bean-validator-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-bean-validator-osgi</artifactId>
diff --git a/components/camel-blueprint-main/pom.xml b/components/camel-blueprint-main/pom.xml
index c6bf2be..d3189a8 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint-main</artifactId>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 2a1153b..046e428 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint</artifactId>
diff --git a/components/camel-cmis-osgi/pom.xml b/components/camel-cmis-osgi/pom.xml
index 9df88f1..8932c77 100644
--- a/components/camel-cmis-osgi/pom.xml
+++ b/components/camel-cmis-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-cmis-osgi</artifactId>
diff --git a/components/camel-cxf-blueprint/pom.xml b/components/camel-cxf-blueprint/pom.xml
index a5872d6..c024e5f 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 3dbc0ab..a5d32ad 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 b65fd48..5009e08 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-eventadmin</artifactId>
diff --git a/components/camel-jcache-osgi/pom.xml b/components/camel-jcache-osgi/pom.xml
index c036f08..a06999f 100644
--- a/components/camel-jcache-osgi/pom.xml
+++ b/components/camel-jcache-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-jcache-osgi</artifactId>
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 7efcddb..31e8919 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 f9e2f76..df1e466 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-osgi-activator</artifactId>
diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml
index 0ef7256..8a2a4cc 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 becc5d8..28da3f6 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 de58847..2674ede 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 70d72fa..7ae73db 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-test-karaf</artifactId>
diff --git a/components/camel-zookeeper-master-osgi/pom.xml b/components/camel-zookeeper-master-osgi/pom.xml
index 13eecec..d165555 100644
--- a/components/camel-zookeeper-master-osgi/pom.xml
+++ b/components/camel-zookeeper-master-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>components</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-zookeeper-master-osgi</artifactId>
diff --git a/components/pom.xml b/components/pom.xml
index b88b037..23ef7f8 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/core/camel-core-osgi/pom.xml b/core/camel-core-osgi/pom.xml
index a44cddb..06a5d46 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-core-osgi</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index ae8667a..f4b3527 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index 07e4388..da8009d 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-commands-core</artifactId>
diff --git a/platforms/commands/pom.xml b/platforms/commands/pom.xml
index 127c3d3..cea0705 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>commands</artifactId>
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index c8284be..44419db 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 fd24602..15b6548 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.karaf</groupId>
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index 3db5c15..2602523 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>karaf-platform</artifactId>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 292789b..aa378f0 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>platforms</artifactId>
diff --git a/pom.xml b/pom.xml
index b85c55e..c69f856 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.6</version>
</parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Camel Karaf</name>
@@ -106,7 +106,7 @@
<compiler.fork>false</compiler.fork>
<!-- Camel target version -->
- <camel-version>3.11.6-SNAPSHOT</camel-version>
+ <camel-version>3.11.6</camel-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
@@ -747,7 +747,7 @@
<profile>
<id>dev</id>
<properties>
- <camel-version>3.11.6-SNAPSHOT</camel-version>
+ <camel-version>3.11.6</camel-version>
</properties>
</profile>
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index afecbd5..24b9d48 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 aa3a32c..3083e0e 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 3035a27..79370c6 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-itest-osgi</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index edd8f43..ec4d3be 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.11.6-SNAPSHOT</version>
+ <version>3.11.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 3dd9b04..34907d0 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-catalog-generator-karaf-maven-plugin</artifactId>
diff --git a/tooling/camel-karaf-maven-plugin/pom.xml b/tooling/camel-karaf-maven-plugin/pom.xml
index 235a7a2..a1683d2 100644
--- a/tooling/camel-karaf-maven-plugin/pom.xml
+++ b/tooling/camel-karaf-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>tooling</artifactId>
- <version>3.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>camel-karaf-maven-plugin</artifactId>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 554ed0b..76d6bcf 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.11.6-SNAPSHOT</version>
+ <version>3.11.7-SNAPSHOT</version>
</parent>
<artifactId>tooling</artifactId>
