diff --git a/plugins/org.fusesource.ide.branding/archetypes/archetypes.xml b/plugins/org.fusesource.ide.branding/archetypes/archetypes.xml
index 24bc8ed7b1..947cc15595 100644
--- a/plugins/org.fusesource.ide.branding/archetypes/archetypes.xml
+++ b/plugins/org.fusesource.ide.branding/archetypes/archetypes.xml
@@ -1,19 +1,19 @@
-Creates a new Camel project that configures and interacts with ActiveMQ.
-Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.
-Creates a new Camel component.
-Creates a new Camel project with Apache CXF code-first example using OSGi blueprint.
-Creates a new Camel project with Apache CXF contract-first example using OSGi blueprint.
-Creates a new Camel data format.
-Creates a new Camel project using Java DSL.
-Creates a new Camel project with added Spring DSL support.
-Creates a new Camel project with added Spring DSL support. Ready to be deployed in OSGi.
-Creates a new Camel web project that deploys the Camel routes as a WAR
-Creates a new Camel project that deploys the Camel Web Console, REST API, and your routes as a WAR
-Simple CXF JAX-RS webapp service using Spring configuration
-null
-Creates a new Camel project using CXF in code (Java) first.
-Creates a new Camel project using CXF in contract (WSDL) first.
-Creates a new Camel project using the Drools rule engine.
-Creates a new Camel web services project
+Creates a new Camel project that configures and interacts with ActiveMQ.
+Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.
+Creates a new Camel component.
+Creates a new Camel project with Apache CXF code-first example using OSGi blueprint.
+Creates a new Camel project with Apache CXF contract-first example using OSGi blueprint.
+Creates a new Camel data format.
+Creates a new Camel project using Java DSL.
+Creates a new Camel project with added Spring DSL support.
+Creates a new Camel project with added Spring DSL support. Ready to be deployed in OSGi.
+Creates a new Camel web project that deploys the Camel routes as a WAR
+Creates a new Camel project that deploys the Camel Web Console, REST API, and your routes as a WAR
+Simple CXF JAX-RS webapp service using Spring configuration
+null
+Creates a new Camel project using CXF in code (Java) first.
+Creates a new Camel project using CXF in contract (WSDL) first.
+Creates a new Camel project using the Drools rule engine.
+Creates a new Camel web services project
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-activemq-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-activemq-2.12.0.redhat-610379.jar
similarity index 64%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-activemq-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-activemq-2.12.0.redhat-610379.jar
index 832a007632..d77a9ec971 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-activemq-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-activemq-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-blueprint-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-blueprint-2.12.0.redhat-610379.jar
similarity index 63%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-blueprint-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-blueprint-2.12.0.redhat-610379.jar
index acdc558c55..45b2c32d70 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-blueprint-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-blueprint-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-component-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-component-2.12.0.redhat-610379.jar
similarity index 63%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-component-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-component-2.12.0.redhat-610379.jar
index 1e4e7cfd9c..c0baddf4ce 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-component-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-component-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-code-first-blueprint-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-code-first-blueprint-2.12.0.redhat-610379.jar
similarity index 65%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-code-first-blueprint-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-code-first-blueprint-2.12.0.redhat-610379.jar
index e4a79e0900..353bf8ed51 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-code-first-blueprint-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-code-first-blueprint-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-contract-first-blueprint-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-contract-first-blueprint-2.12.0.redhat-610379.jar
similarity index 67%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-contract-first-blueprint-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-contract-first-blueprint-2.12.0.redhat-610379.jar
index 7eac337298..364bfec111 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-contract-first-blueprint-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-cxf-contract-first-blueprint-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-dataformat-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-dataformat-2.12.0.redhat-610379.jar
similarity index 63%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-dataformat-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-dataformat-2.12.0.redhat-610379.jar
index 0a39bdd72a..7912046c28 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-dataformat-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-dataformat-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-java-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-java-2.12.0.redhat-610379.jar
similarity index 64%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-java-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-java-2.12.0.redhat-610379.jar
index 30ef1ab36b..9893875bf9 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-java-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-java-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-2.12.0.redhat-610379.jar
similarity index 59%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-2.12.0.redhat-610379.jar
index 2b86a92b80..aab753f999 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-dm-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-dm-2.12.0.redhat-610379.jar
similarity index 63%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-dm-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-dm-2.12.0.redhat-610379.jar
index a49ec07cc3..8e3dd6979c 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-dm-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-spring-dm-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-web-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-web-2.12.0.redhat-610379.jar
similarity index 68%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-web-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-web-2.12.0.redhat-610379.jar
index 31e4af6567..f36556a80f 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-web-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-web-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-webconsole-2.12.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-webconsole-2.12.0.redhat-610379.jar
similarity index 61%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-archetype-webconsole-2.12.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-archetype-webconsole-2.12.0.redhat-610379.jar
index 332a6a833e..783ce214b3 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-webconsole-2.12.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-archetype-webconsole-2.12.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-code-first-archetype-1.0.0.redhat-376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-code-first-archetype-1.0.0.redhat-376.jar
deleted file mode 100644
index a3ad3fc61f..0000000000
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-code-first-archetype-1.0.0.redhat-376.jar and /dev/null differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-code-first-archetype-1.0.0.redhat-379.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-code-first-archetype-1.0.0.redhat-379.jar
new file mode 100644
index 0000000000..91755b995d
Binary files /dev/null and b/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-code-first-archetype-1.0.0.redhat-379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-contract-first-archetype-1.0.0.redhat-376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-contract-first-archetype-1.0.0.redhat-379.jar
similarity index 56%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-cxf-contract-first-archetype-1.0.0.redhat-376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-cxf-contract-first-archetype-1.0.0.redhat-379.jar
index 9be0a7bac5..c88374eff8 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-contract-first-archetype-1.0.0.redhat-376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-cxf-contract-first-archetype-1.0.0.redhat-379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-drools-archetype-1.0.0.redhat-376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-drools-archetype-1.0.0.redhat-379.jar
similarity index 76%
rename from plugins/org.fusesource.ide.branding/archetypes/camel-drools-archetype-1.0.0.redhat-376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/camel-drools-archetype-1.0.0.redhat-379.jar
index 60349eb65f..d18df22452 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-drools-archetype-1.0.0.redhat-376.jar and b/plugins/org.fusesource.ide.branding/archetypes/camel-drools-archetype-1.0.0.redhat-379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-webservice-archetype-1.0.0.redhat-376.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-webservice-archetype-1.0.0.redhat-376.jar
deleted file mode 100644
index f80aa0ad15..0000000000
Binary files a/plugins/org.fusesource.ide.branding/archetypes/camel-webservice-archetype-1.0.0.redhat-376.jar and /dev/null differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/camel-webservice-archetype-1.0.0.redhat-379.jar b/plugins/org.fusesource.ide.branding/archetypes/camel-webservice-archetype-1.0.0.redhat-379.jar
new file mode 100644
index 0000000000..38b828c7c9
Binary files /dev/null and b/plugins/org.fusesource.ide.branding/archetypes/camel-webservice-archetype-1.0.0.redhat-379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxrs-service-2.7.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxrs-service-2.7.0.redhat-610376.jar
deleted file mode 100644
index 76f72798c1..0000000000
Binary files a/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxrs-service-2.7.0.redhat-610376.jar and /dev/null differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxrs-service-2.7.0.redhat-610379.jar b/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxrs-service-2.7.0.redhat-610379.jar
new file mode 100644
index 0000000000..40bd6a484a
Binary files /dev/null and b/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxrs-service-2.7.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxws-javafirst-2.7.0.redhat-610376.jar b/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxws-javafirst-2.7.0.redhat-610379.jar
similarity index 54%
rename from plugins/org.fusesource.ide.branding/archetypes/cxf-jaxws-javafirst-2.7.0.redhat-610376.jar
rename to plugins/org.fusesource.ide.branding/archetypes/cxf-jaxws-javafirst-2.7.0.redhat-610379.jar
index 92984b4485..4ee457ae9f 100644
Binary files a/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxws-javafirst-2.7.0.redhat-610376.jar and b/plugins/org.fusesource.ide.branding/archetypes/cxf-jaxws-javafirst-2.7.0.redhat-610379.jar differ
diff --git a/plugins/org.fusesource.ide.catalogs/plugin.xml b/plugins/org.fusesource.ide.catalogs/plugin.xml
index c881472f19..24a33b38af 100644
--- a/plugins/org.fusesource.ide.catalogs/plugin.xml
+++ b/plugins/org.fusesource.ide.catalogs/plugin.xml
@@ -7,35 +7,35 @@
+ uri="xsd/fuse/activemq-spring-5.9.0.redhat-610379.xsd"/>
+ uri="xsd/fuse/activemq-ra-5.9.0.redhat-610379.xsd"/>
+ uri="xsd/fuse/camel-blueprint-2.12.0.redhat-610379.xsd"/>
+ uri="xsd/fuse/camel-cxf-2.12.0.redhat-610379-blueprint.xsd"/>
+ uri="xsd/fuse/camel-cxf-2.12.0.redhat-610379-spring.xsd"/>
+ uri="xsd/fuse/camel-spring-2.12.0.redhat-610379.xsd"/>
+ uri="xsd/fuse/camel-spring-integration-2.12.0.redhat-610379.xsd"/>
+ uri="xsd/fuse/camel-spring-security-2.12.0.redhat-610379.xsd"/>
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-ra-5.9.0.redhat-610376.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-ra-5.9.0.redhat-610379.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-ra-5.9.0.redhat-610376.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-ra-5.9.0.redhat-610379.xsd
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-spring-5.9.0.redhat-610376.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-spring-5.9.0.redhat-610379.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-spring-5.9.0.redhat-610376.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/activemq-spring-5.9.0.redhat-610379.xsd
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610376.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610379.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610376.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610379.xsd
index ea7b3c7e8d..f1a8ec4e82 100644
--- a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610376.xsd
+++ b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610379.xsd
@@ -3142,28 +3142,28 @@
-
-
+
+
-
-
-
+
+
+
-
+
@@ -3172,41 +3172,41 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
+
-
-
+
+
-
-
+
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610376-blueprint.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610379-blueprint.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610376-blueprint.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610379-blueprint.xsd
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610376-spring.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610379-spring.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610376-spring.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-cxf-2.12.0.redhat-610379-spring.xsd
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610376.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610379.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610376.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610379.xsd
index b6fe7fe089..70ffdb3876 100644
--- a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610376.xsd
+++ b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610379.xsd
@@ -3127,68 +3127,68 @@
-
-
+
-
+
+
-
+
+
+
-
-
-
-
+
+
-
+
-
-
-
+
-
+
-
+
+
+
-
+
-
+
@@ -3201,11 +3201,11 @@
+
+
-
-
-
+
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-integration-2.12.0.redhat-610376.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-integration-2.12.0.redhat-610379.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-integration-2.12.0.redhat-610376.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-integration-2.12.0.redhat-610379.xsd
diff --git a/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-security-2.12.0.redhat-610376.xsd b/plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-security-2.12.0.redhat-610379.xsd
similarity index 100%
rename from plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-security-2.12.0.redhat-610376.xsd
rename to plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-security-2.12.0.redhat-610379.xsd
diff --git a/plugins/org.fusesource.ide.server.fuse.core/plugin.xml b/plugins/org.fusesource.ide.server.fuse.core/plugin.xml
index aee47a7e2b..9add44d80e 100644
--- a/plugins/org.fusesource.ide.server.fuse.core/plugin.xml
+++ b/plugins/org.fusesource.ide.server.fuse.core/plugin.xml
@@ -103,15 +103,15 @@
os="linux">
diff --git a/pom.xml b/pom.xml
index d58045e7e7..74010b4ddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
org.fusesource
fuse-project
- 1.0.0.redhat-376
+ 1.0.0.redhat-379