This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
     new 49bb4bef6f Fix reproduciblity issue
49bb4bef6f is described below

commit 49bb4bef6f04978171d93fab0601d86785c902ac
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Fri Apr 19 09:56:50 2024 +0200

    Fix reproduciblity issue
---
 pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pom.xml b/pom.xml
index 385ed90a8c..200aee78d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -577,6 +577,22 @@
         <artifactId>flatten-maven-plugin</artifactId>
         <version>${flatten-maven-plugin.version}</version>
         <executions>
+          <execution>
+            <id>flatten-revision</id>
+            <configuration>
+              <!--
+                ~ Flatten Maven Plugin removes the 
`child.project.url.inherit.append.path` attribute on this POM.
+                ~
+                ~ This causes a difference between the effective model of 
children built on this POM
+                ~ and those built on the flattened version.
+                ~
+                ~ Until 
https://github.com/mojohaus/flatten-maven-plugin/issues/412 we must expand 
&lt;url&gt;
+                -->
+              <pomElements>
+                <url>expand</url>
+              </pomElements>
+            </configuration>
+          </execution>
           <execution>
             <id>flatten-bom</id>
             <goals>
@@ -584,6 +600,12 @@
             </goals>
             <phase>process-resources</phase>
             <inherited>false</inherited>
+            <configuration>
+              <pomElements>
+                <!-- CycloneDX Maven Plugin uses this data -->
+                <distributionManagement>keep</distributionManagement>
+              </pomElements>
+            </configuration>
           </execution>
         </executions>
       </plugin>

Reply via email to