From 13d6d6dd9300d0a311717c3623d6e39db1c5d14d Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 3 Nov 2020 10:03:02 -0800
Subject: [PATCH] Add defaults for "build-helper-maven-plugin"

---
 base/pom.xml          | 56 +++++++++++++++++++++++++++++++------------
 release-notes/VERSION |  2 ++
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/base/pom.xml b/base/pom.xml
index 967ac6a..ee13992 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -35,19 +35,19 @@ of Jackson: application code should only rely on `jackson-bom`
     </dependency>
   </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- JPMS Libraries-->
-            <dependency>
-                <groupId>javax.activation</groupId>
-                <artifactId>javax.activation-api</artifactId>
-                <version>${javax.activation.version}</version>
-            </dependency>
-        </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <!-- JPMS Libraries-->
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>javax.activation-api</artifactId>
+        <version>${javax.activation.version}</version>
+      </dependency>
+    </dependencies>
 
-    </dependencyManagement>
+  </dependencyManagement>
 
-    <build>
+  <build>
     <pluginManagement>
       <plugins>
         <!-- Verify existence of certain settings
@@ -178,13 +178,39 @@ of Jackson: application code should only rely on `jackson-bom`
             </platformDependencies>
           </configuration>
         </plugin>
-      </plugins>
-    </pluginManagement>
 
-    <!-- And one more odd thing... we actually MUST disable checks just for this
+      <!-- 03-Nov-2020, tatu: For 2.12, defaults for better LICENSE inclusion -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-resource</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>add-resource</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}</directory>
+                  <targetPath>META-INF</targetPath>
+                  <includes>
+                    <include>LICENSE</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </pluginManagement>
+
+  <!-- And one more odd thing... we actually MUST disable checks just for this
          pom (but not on something that extends i)
       -->
-    <plugins>
+   <plugins>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 600c6d9..d7ff52a 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -2,6 +2,8 @@
 
 - Add another execution of `maven-replacer-plugin` for "prepare-package" phase
   to help with IDE import.
+- Add default settings for `gradle-module-metadata-maven-plugin` (gradle metadata)
+- Add default settings for `build-helper-maven-plugin` (LICENSE inclusion)
 
 2.11.3