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

vy pushed a commit to branch release/10.3.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git

commit 139c4906849c35954524bac69b3015ba48aef521
Merge: 55614e3 47e93f8
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon Nov 6 09:04:03 2023 +0100

    Merge remote-tracking branch 'origin/main' into release/10.3.0

 .github/generate-email.sh                          |  2 +-
 .github/workflows/build-reusable.yaml              |  9 ++-
 .github/workflows/codeql-analysis-reusable.yaml    |  4 +-
 .github/workflows/deploy-release-reusable.yaml     |  2 +-
 .github/workflows/deploy-snapshot-reusable.yaml    |  2 +-
 .github/workflows/merge-dependabot-reusable.yaml   |  2 +-
 .../workflows/scorecards-analysis-reusable.yaml    |  2 +-
 pom.xml                                            | 81 +++++++++++++++-------
 .../.10.x.x/add-pom-xml-timestamp-substitution.xml |  8 +++
 src/changelog/.10.x.x/change-bnd-baseline.xml      |  9 +++
 src/changelog/.10.x.x/fix-manifest.xml             |  8 +++
 ...update_org_cyclonedx_cyclonedx_maven_plugin.xml |  8 +++
 src/site/_release-notes/_10.x.x.adoc               | 20 ++++++
 13 files changed, 123 insertions(+), 34 deletions(-)

diff --cc pom.xml
index 96052f0,6edb66a..ba854c5
--- a/pom.xml
+++ b/pom.xml
@@@ -145,17 -145,17 +145,26 @@@
    <properties>
  
      <!-- project version -->
 -    <revision>10.3.0-SNAPSHOT</revision>
 +    <revision>10.3.0</revision>
 +
 +    <!-- `project.build.outputTimestamp` is required to be present for 
reproducible builds.
 +         We actually inherit one from the `org.apache:apache` parent.
 +         Though inheriting this property has two undesired consequences:
 +         1. `artifact:compare` dumps an `ERROR` log stating that this 
`property should not be inherited but defined` (#50)
 +         2. This value is employed in various places while creating the 
distribution
 +         To mitigate these, we define a *dummy* value here and let the CI 
replace it during a release.
 +         Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
 +    
<project.build.outputTimestamp>2023-10-26T09:50:45Z</project.build.outputTimestamp>
  
+     <!-- `project.build.outputTimestamp` is required to be present for 
reproducible builds.
+          We actually inherit one from the `org.apache:apache` parent.
+          Though inheriting this property has two undesired consequences:
+          1. `artifact:compare` dumps an `ERROR` log stating that this 
`property should not be inherited but defined` (#50)
+          2. This value is employed in various places while creating the 
distribution
+          To mitigate these, we define a *dummy* value here and let the CI 
replace it during a release.
+          Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
+     
<project.build.outputTimestamp>2023-10-26T08:29:15Z</project.build.outputTimestamp>
+ 
      <!-- target Java 8 -->
      <maven.compiler.source>8</maven.compiler.source>
      <maven.compiler.target>8</maven.compiler.target>

Reply via email to