From f62eaa620f80bd3a6a8d77be705d386557261bbc Mon Sep 17 00:00:00 2001
From: Romain Grecourt <romain.grecourt@oracle.com>
Date: Tue, 1 Sep 2020 18:20:40 -0700
Subject: [PATCH] Integrate build-tools 2.1.1

---
 applications/pom.xml                                | 2 +-
 archetypes/catalog/cli-metadata.properties.mustache | 5 +++--
 archetypes/catalog/pom.xml                          | 2 +-
 pom.xml                                             | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/applications/pom.xml b/applications/pom.xml
index 13b6ec12383..a8370a21305 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -47,7 +47,7 @@
         <version.plugin.dependency>3.1.2</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>2.19.1</version.plugin.failsafe>
-        <version.plugin.helidon>2.1.0</version.plugin.helidon>
+        <version.plugin.helidon>2.1.1</version.plugin.helidon>
         <version.plugin.helidon-cli>2.1.0</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
diff --git a/archetypes/catalog/cli-metadata.properties.mustache b/archetypes/catalog/cli-metadata.properties.mustache
index ac088e0a58e..28eccdc7568 100644
--- a/archetypes/catalog/cli-metadata.properties.mustache
+++ b/archetypes/catalog/cli-metadata.properties.mustache
@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-build-tools.version={{buildtoolsVersion}}
+build-tools.version=2.0.2
+cli.latest.plugin.version={{cliPluginVersion}}
 cli.version={{cliVersion}}
 {{#cliUpdateMessages}}
-cli.{{version}}.message={{message}}
+    cli.{{version}}.message={{message}}
 {{/cliUpdateMessages}}
diff --git a/archetypes/catalog/pom.xml b/archetypes/catalog/pom.xml
index 849ec9b91d8..a9685e00dd0 100644
--- a/archetypes/catalog/pom.xml
+++ b/archetypes/catalog/pom.xml
@@ -70,7 +70,7 @@
 
     <properties>
         <!-- support command-line overrides -->
-        <cli.build.tools.version>${version.plugin.helidon-build-tools}</cli.build.tools.version>
+        <cli.build.tools.version>${version.helidon-cli}</cli.build.tools.version>
     </properties>
     <build>
         <plugins>
diff --git a/pom.xml b/pom.xml
index f96ab408347..4d8131d7572 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>2.19.1</version.plugin.failsafe>
         <version.plugin.glassfish-copyright>2.3</version.plugin.glassfish-copyright>
-        <version.plugin.helidon-build-tools>2.1.0</version.plugin.helidon-build-tools>
+        <version.plugin.helidon-build-tools>2.1.1</version.plugin.helidon-build-tools>
         <version.plugin.hibernate-enhance>${version.lib.hibernate}</version.plugin.hibernate-enhance>
         <version.plugin.jacoco>0.8.5</version.plugin.jacoco>
         <version.plugin.jandex>1.0.6</version.plugin.jandex>
@@ -120,6 +120,8 @@
         <version.plugin.wiremock>2.14.0</version.plugin.wiremock>
         <version.plugin.echo>0.4.0</version.plugin.echo>
 
+        <version.helidon-cli>2.1.0</version.helidon-cli>
+
         <javadoc.link.jackson-annotations>https://fasterxml.github.io/jackson-annotations/javadoc/2.9/</javadoc.link.jackson-annotations>
         <javadoc.link.jackson-core>https://fasterxml.github.io/jackson-core/javadoc/2.9/</javadoc.link.jackson-core>
         <javadoc.link.jackson-databind>https://fasterxml.github.io/jackson-databind/javadoc/2.9/</javadoc.link.jackson-databind>