Merge branch 'master' into release

apache · Jan 3, 2025 · b8d7c5b · b8d7c5b
2 parents 5d0339e + 353698e
commit b8d7c5b
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 236 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -12,6 +12,7 @@ New features
 *                   Add org.junit-pioneer:junit-pioneer to dependencyManagement. Thanks to Gary Gregory.
 *                   Add org.apache.maven.plugins:maven-changes-plugin to pluginManagement. Thanks to Gary Gregory.
 *                   Add mockito to dependencyManagement #568. Thanks to Arnout Engelen.
+*                   Run maven-changes-plugin changes-validate on verify. Thanks to Gary Gregory.
 
 Fixed Bugs
 ----------

diff --git a/pom.xml b/pom.xml
@@ -821,6 +821,18 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-changes-plugin</artifactId>
           <version>${commons.changes.version}</version>
+          <executions>
+            <execution>
+              <id>validate-changes</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>changes-validate</goal>
+              </goals>
+              <configuration>
+                <failOnError>true</failOnError>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -993,8 +1005,6 @@
             <exclude>.asf.yaml</exclude>
             <exclude>.gitattributes</exclude>
             <exclude>src/site/resources/download_*.cgi</exclude>
-            <exclude>src/site/resources/profile.*</exclude>
-            <exclude>profile.*</exclude>
             <!-- Exclude Eclipse local files and folders -->
             <exclude>maven-eclipse.xml</exclude>
             <exclude>.externalToolBuilders/**</exclude>
@@ -1057,6 +1067,10 @@
         <groupId>org.spdx</groupId>
         <artifactId>spdx-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
@@ -1173,8 +1187,6 @@
             <exclude>.asf.yaml</exclude>
             <exclude>.gitattributes</exclude>
             <exclude>src/site/resources/download_*.cgi</exclude>
-            <exclude>src/site/resources/profile.*</exclude>
-            <exclude>profile.*</exclude>
             <!-- Exclude Eclipse local files and folders -->
             <exclude>maven-eclipse.xml</exclude>
             <exclude>.externalToolBuilders/**</exclude>