This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.5.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.5.0 by this push:
new 49b1b61 Adapt the new `logging-parent` BOM goodies
49b1b61 is described below
commit 49b1b614f712830e6f2c6ced8ac3a86707ac1d3d
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Fri Sep 8 15:35:23 2023 +0200
Adapt the new `logging-parent` BOM goodies
---
log4j-tools-parent/pom.xml | 18 ------------------
pom.xml | 36 +++++-------------------------------
2 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/log4j-tools-parent/pom.xml b/log4j-tools-parent/pom.xml
index eb2dfb9..7c3cf3f 100644
--- a/log4j-tools-parent/pom.xml
+++ b/log4j-tools-parent/pom.xml
@@ -31,24 +31,6 @@
<properties>
- <!-- project properties -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- <!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which
parents `org.apache.logging:logging-parent`, which parents
`org.apache.logging.log4j:log4j-tools-bom`, which parents us.
- `minimalJavaBuildVersion` is used for enforcing the compiler version.
- We will use `java.version` to enforce the target JVM byte code, which
is 8. -->
- <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
- <java.version>8</java.version>
-
- <!-- `project.build.outputTimestamp` is required for reproducible builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <project.build.outputTimestamp>0</project.build.outputTimestamp>
-
- <!-- disable `maven-site-plugin`-->
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
-
<!-- dependency versions -->
<assertj.version>3.24.2</assertj.version>
<commons-io.version>2.11.0</commons-io.version>
diff --git a/pom.xml b/pom.xml
index 4259683..f1733a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,24 +106,14 @@
<url>https://github.com/apache/logging-log4j-tools/actions</url>
</ciManagement>
- <distributionManagement>
- <!-- `repository` from parent `org.apache.logging:logging-parent` (id:
`apache.releases.https`) -->
- <!-- `snapshotRepository` from parent `org.apache.logging:logging-parent`
(id: `apache.snapshots.https`) -->
- </distributionManagement>
-
<properties>
<!-- project version -->
<revision>0.5.0</revision>
- <!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which
is the parent of `org.apache.logging:logging-parent`, which is the parent of us.
- `minimalJavaBuildVersion` is used for enforcing the compiler version.
- We will use `java.version` to enforce the target JVM byte code, which
is 8. -->
- <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
- <java.version>8</java.version>
-
- <!-- `project.build.outputTimestamp` is required for reproducible builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <project.build.outputTimestamp>0</project.build.outputTimestamp>
+ <!-- disable `maven-site-plugin`-->
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
</properties>
@@ -160,14 +150,11 @@
<build>
<plugins>
- <!-- BOMs should ideally _only_ contain dependencies for modules of the
project.
- No invasive properties or plugin/dependency management – either
from the BOM itself or its parent.
- The following `flatten-maven-plugin` exactly performs that trimming
operation. -->
+ <!-- Enable BOM flattening -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
- <inherited>false</inherited>
<executions>
<execution>
<id>flatten-bom</id>
@@ -175,20 +162,7 @@
<goal>flatten</goal>
</goals>
<phase>process-resources</phase>
- <configuration>
- <flattenMode>bom</flattenMode>
- <!-- POM `ElementHandling` is pretty cryptic:
https://www.mojohaus.org/flatten-maven-plugin/apidocs/org/codehaus/mojo/flatten/ElementHandling.html
- Trial-and-error has shown that we should use either
`remove` or `interpolate`.
- `remove` simply removes the element.
- `interpolate` takes the element from the original POM with
variables interpolated.
- Avoid using `resolve`, which uses the effective POM where
inherited changes from the parent are also incorporated. -->
- <pomElements>
- <properties>remove</properties>
- <repositories>remove</repositories>
- <distributionManagement>remove</distributionManagement>
- <dependencyManagement>interpolate</dependencyManagement>
- </pomElements>
- </configuration>
+ <inherited>false</inherited>
</execution>
</executions>
</plugin>
