From d6aa233217f4fd033f9d616bd8f38a14e0ae6b7f Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 27 Aug 2023 14:17:37 -0400
Subject: [PATCH] [pom] Move from legacy license configuration to license sets
 and update parent-pom to 11

---
 license-maven-plugin/pom.xml | 16 ++++++++++------
 pom.xml                      | 34 +++++++++++++++++++---------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/license-maven-plugin/pom.xml b/license-maven-plugin/pom.xml
index fc41f9e0d..42f4eaf5a 100644
--- a/license-maven-plugin/pom.xml
+++ b/license-maven-plugin/pom.xml
@@ -74,12 +74,16 @@
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
         <configuration>
-          <excludes>
-            <exclude>src/test/**</exclude>
-            <exclude>src/it/**</exclude>
-            <exclude>src/main/resources/**</exclude>
-            <exclude>**/PropertyPlaceholderResolver.java</exclude>
-          </excludes>
+          <licenseSets>
+            <licenseSet>
+              <excludes>
+                <exclude>src/test/**</exclude>
+                <exclude>src/it/**</exclude>
+                <exclude>src/main/resources/**</exclude>
+                <exclude>**/PropertyPlaceholderResolver.java</exclude>
+              </excludes>
+            </licenseSet>
+          </licenseSets>
         </configuration>
       </plugin>
       <plugin>
diff --git a/pom.xml b/pom.xml
index 0f8724362..f7f3758b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.mycila</groupId>
     <artifactId>mycila-pom</artifactId>
-    <version>10</version>
+    <version>11-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -403,8 +403,10 @@
           <artifactId>license-maven-plugin</artifactId>
           <version>4.2</version>
           <configuration>
-            <inlineHeader>
-              <![CDATA[
+            <licenseSets>
+              <licenseSet>
+                <inlineHeader>
+                  <![CDATA[
 Copyright (C) ${year} ${owner} (${email})
 
 Licensed under the Apache License, Version 2.0 (the "License").
@@ -419,18 +421,20 @@ 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.
 ]]>
-            </inlineHeader>
-            <properties>
-              <owner>Mycila</owner>
-              <year>${project.inceptionYear}-2023</year>
-              <email>mathieu.carbou@gmail.com</email>
-            </properties>
-            <excludes>
-              <exclude>src/test/resources/**</exclude>
-              <exclude>**/release-pom.xml</exclude>
-              <exclude>docs/**</exclude>
-              <exclude>.config/**</exclude>
-            </excludes>
+                </inlineHeader>
+                <properties>
+                  <owner>Mycila</owner>
+                  <year>${project.inceptionYear}-2023</year>
+                  <email>mathieu.carbou@gmail.com</email>
+                </properties>
+                <excludes>
+                  <exclude>src/test/resources/**</exclude>
+                  <exclude>**/release-pom.xml</exclude>
+                  <exclude>docs/**</exclude>
+                  <exclude>.config/**</exclude>
+                </excludes>
+              </licenseSet>
+            </licenseSets>
           </configuration>
         </plugin>
         <plugin>