From 459fa970da31a7bffa3aa825406e4f8f2b4a8c99 Mon Sep 17 00:00:00 2001
From: Honnix <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 08:58:44 +0200
Subject: [PATCH] Fix license header (#245)

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 jflyte-utils/pom.xml |  2 +-
 pom.xml              | 54 +++++++++++++++++---------------------------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/jflyte-utils/pom.xml b/jflyte-utils/pom.xml
index f93701340..28786ab9b 100644
--- a/jflyte-utils/pom.xml
+++ b/jflyte-utils/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2021 Flyte Authors.
+  Copyright 2023 Flyte Authors.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index 3efec2758..45913ffc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,7 +418,7 @@
               <licenseHeader>
                 <!-- Specify either content or file, but not both -->
                 <content><![CDATA[/*
- * Copyright 2021 Flyte Authors
+ * Copyright $YEAR Flyte Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -440,40 +440,13 @@
               </googleJavaFormat>
               <removeUnusedImports />
             </java>
-            <xml>
-              <includes>
-                <include>**/pom.xml</include>
-                <include>**/src/**/*.xml</include>
-              </includes>
-              <licenseHeader>
-                <content><![CDATA[<!--
-  Copyright 2021 Flyte Authors.
-
-  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.
--->]]></content>
-              </licenseHeader>
-              <eclipse>
-                <file>${maven.multiModuleProjectDirectory}/spotless.xmlformat.prefs</file>
-              </eclipse>
-            </xml>
             <scala>
               <scalafmt>
                 <file>${maven.multiModuleProjectDirectory}/.scalafmt.conf</file>
               </scalafmt>
               <licenseHeader>
                 <content><![CDATA[/*
- * Copyright 2021 Flyte Authors.
+ * Copyright $YEAR Flyte Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -491,10 +464,25 @@
               </licenseHeader>
             </scala>
             <pom>
-              <!-- These are the defaults, you can override if you want -->
-              <includes>
-                <include>pom.xml</include>
-              </includes>
+              <licenseHeader>
+                <content><![CDATA[<!--
+  Copyright $YEAR Flyte Authors.
+
+  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.
+-->]]></content>
+                <delimiter><![CDATA[<project]]></delimiter>
+              </licenseHeader>
 
               <sortPom>
                 <encoding>UTF-8</encoding>