From 61755490f516807377b2aaca1f5ee8f75a1f9574 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Tue, 20 Dec 2022 12:43:19 -0800
Subject: [PATCH] Upgrade build-tools to 3.0.3, fix hbs template file copyright

---
 applications/pom.xml                          |  4 ++--
 etc/copyright-exclude.txt                     |  1 -
 .../helidon-standalone-quickstart-mp/pom.xml  |  4 ++--
 .../helidon-standalone-quickstart-se/pom.xml  |  4 ++--
 .../templates/pico/default/module-info.hbs    | 22 +++++++++----------
 pom.xml                                       |  2 +-
 6 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/applications/pom.xml b/applications/pom.xml
index f0bb736d796..7bba2a4b823 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -47,8 +47,8 @@
         <version.plugin.dependency>3.1.2</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
-        <version.plugin.helidon>3.0.0</version.plugin.helidon>
-        <version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
+        <version.plugin.helidon>3.0.3</version.plugin.helidon>
+        <version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.nativeimage>0.9.16</version.plugin.nativeimage>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
diff --git a/etc/copyright-exclude.txt b/etc/copyright-exclude.txt
index 825ee7469f9..c72f400ab06 100644
--- a/etc/copyright-exclude.txt
+++ b/etc/copyright-exclude.txt
@@ -67,4 +67,3 @@ persistence_3_0.xsd
 # excluded as this is a test file and we need to validate its content
 src/test/resources/static/classpath/index.html
 ._java_
-.hbs
diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
index 270d458fc55..2cd5d20c19f 100644
--- a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
+++ b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
@@ -41,8 +41,8 @@
         <version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
-        <version.plugin.helidon>3.0.0</version.plugin.helidon>
-        <version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
+        <version.plugin.helidon>3.0.3</version.plugin.helidon>
+        <version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
         <version.plugin.jandex>1.0.6</version.plugin.jandex>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
index 13140359bb6..ea0751bf160 100644
--- a/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
+++ b/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
@@ -40,8 +40,8 @@
         <version.plugin.dependency>3.0.0</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
-        <version.plugin.helidon>3.0.0</version.plugin.helidon>
-        <version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
+        <version.plugin.helidon>3.0.3</version.plugin.helidon>
+        <version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
         <version.plugin.protobuf>0.5.1</version.plugin.protobuf>
diff --git a/pico/tools/src/main/resources/templates/pico/default/module-info.hbs b/pico/tools/src/main/resources/templates/pico/default/module-info.hbs
index a41df98b2bd..3e9e61b2b4e 100644
--- a/pico/tools/src/main/resources/templates/pico/default/module-info.hbs
+++ b/pico/tools/src/main/resources/templates/pico/default/module-info.hbs
@@ -1,19 +1,17 @@
 {{!
+Copyright (c) 2022 Oracle and/or its affiliates.
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 }}{{#header}}{{{.}}}{{/header}}
 {{#hasdescription}}/**{{#description}}
  * {{{.}}}{{/description}}
diff --git a/pom.xml b/pom.xml
index 194816e7f71..cb81ac03d85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
         <version.plugin.glassfish-copyright>2.3</version.plugin.glassfish-copyright>
-        <version.plugin.helidon-build-tools>3.0.0</version.plugin.helidon-build-tools>
+        <version.plugin.helidon-build-tools>3.0.3</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.1.0</version.plugin.jandex>