From 54159154a7d07bd2b90a564a53928222042f9c2d Mon Sep 17 00:00:00 2001
From: lburgazzoli <lburgazzoli@gmail.com>
Date: Fri, 4 Sep 2020 17:01:14 +0200
Subject: [PATCH] build(deps): cleanup versions definition based on
 camel-dependencies from camel 3.5

---
 .../camel-k-quarkus-itests-kamelet/pom.xml             |  4 ++--
 .../camel-k-quarkus-kamelet/deployment/pom.xml         |  2 +-
 .../camel-k-quarkus-kamelet/runtime/pom.xml            |  4 ++--
 camel-k-runtime-core/pom.xml                           |  4 ++--
 camel-kamelet/pom.xml                                  |  4 ++--
 examples/camel-k-runtime-example-kamelets/pom.xml      |  2 +-
 .../camel-k-runtime-example-quarkus-kamelets/pom.xml   | 10 +++++-----
 pom.xml                                                |  5 +----
 8 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml
index 91a09a3ef..2f1b1c743 100644
--- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build-helper-maven-plugin.version}</version>
+                <version>${build-helper-maven-plugin-version}</version>
                 <executions>
                     <execution>
                         <id>reserve-network-port</id>
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus-version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml b/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml
index 328f78806..549a56e7c 100644
--- a/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml
@@ -56,7 +56,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>${quarkus-version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
diff --git a/camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml
index 57a4f75a4..709808674 100644
--- a/camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus-version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -71,7 +71,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>${quarkus-version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
diff --git a/camel-k-runtime-core/pom.xml b/camel-k-runtime-core/pom.xml
index 608ff3e67..134b28f82 100644
--- a/camel-k-runtime-core/pom.xml
+++ b/camel-k-runtime-core/pom.xml
@@ -97,7 +97,7 @@
                 <!-- we need to generate additional configurer classes -->
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${camel.version}</version>
+                <version>${camel-version}</version>
                 <executions>
                     <execution>
                         <id>generate-configurer</id>
@@ -111,7 +111,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build-helper-maven-plugin.version}</version>
+                <version>${build-helper-maven-plugin-version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
diff --git a/camel-kamelet/pom.xml b/camel-kamelet/pom.xml
index 020b58b57..91cd44514 100644
--- a/camel-kamelet/pom.xml
+++ b/camel-kamelet/pom.xml
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-component-maven-plugin</artifactId>
-                <version>${camel.version}</version>
+                <version>${camel-version}</version>
                 <executions>
                     <execution>
                         <id>generate</id>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build-helper-maven-plugin.version}</version>
+                <version>${build-helper-maven-plugin-version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
diff --git a/examples/camel-k-runtime-example-kamelets/pom.xml b/examples/camel-k-runtime-example-kamelets/pom.xml
index 68f0170cf..aceb3ab06 100644
--- a/examples/camel-k-runtime-example-kamelets/pom.xml
+++ b/examples/camel-k-runtime-example-kamelets/pom.xml
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</version>
+                <version>${exec-maven-plugin-version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/examples/camel-k-runtime-example-quarkus-kamelets/pom.xml b/examples/camel-k-runtime-example-quarkus-kamelets/pom.xml
index ba06a0aca..d9590ddcc 100644
--- a/examples/camel-k-runtime-example-quarkus-kamelets/pom.xml
+++ b/examples/camel-k-runtime-example-quarkus-kamelets/pom.xml
@@ -38,7 +38,7 @@
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
                 <artifactId>camel-quarkus-bom</artifactId>
-                <version>${camel-quarkus.version}</version>
+                <version>${camel-quarkus-version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -73,12 +73,12 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus-version}</version>
             </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus-version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</version>
+                <version>${exec-maven-plugin-version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -135,7 +135,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>${exec-maven-plugin.version}</version>
+                        <version>${exec-maven-plugin-version}</version>
                         <executions>
                             <execution>
                                 <goals>
diff --git a/pom.xml b/pom.xml
index a5fa81156..1807f7c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.4.2</version>
+        <version>3.5.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -58,10 +58,7 @@
         <junit-pioneer-version>0.9.0</junit-pioneer-version>
 
         <!-- overridden camel dependencies versions -->
-        <vertx-version>3.9.2</vertx-version>
-        <jandex-version>2.2.1.Final</jandex-version>
         <javapoet-version>1.13.0</javapoet-version>
-        <rest-assured-version>4.3.1</rest-assured-version>
         <json-schema-validator-version>2.2.14</json-schema-validator-version>
 
         <!-- plugins -->