You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/09/28 08:59:53 UTC
[logging-parent] branch release/10.1.0 updated (9d3f013 -> c174963)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
from 9d3f013 Add auto-generated sources
new 4b1dc5d Update `org.apache:apache` to version `30`
new e5f792a Add `grobmeier` to `developers` in `pom.xml`
new c174963 Upload test and reproducibility results on failures in CI (#28)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-reusable.yaml | 23 +++++++++++
pom.xml | 12 +++++-
src/changelog/.10.x.x/.release-notes.adoc.ftl | 8 +---
...r-generation.xml => add-reports-on-failure.xml} | 4 +-
...s_checkout.xml => update_org_apache_apache.xml} | 4 +-
src/site/_release-notes/_10.1.0.adoc | 1 +
src/site/_release-notes/_10.x.x.adoc | 48 ----------------------
7 files changed, 40 insertions(+), 60 deletions(-)
copy src/changelog/10.1.0/{add-osgi-jpms-descriptor-generation.xml => add-reports-on-failure.xml} (63%)
copy src/changelog/10.1.0/{update_actions_checkout.xml => update_org_apache_apache.xml} (71%)
delete mode 100644 src/site/_release-notes/_10.x.x.adoc
[logging-parent] 01/03: Update `org.apache:apache` to version `30`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 4b1dc5d343988abf087e4464acd93d7069a75777
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Sep 28 10:52:24 2023 +0200
Update `org.apache:apache` to version `30`
---
pom.xml | 2 +-
src/changelog/10.1.0/update_org_apache_apache.xml | 8 ++++++++
src/site/_release-notes/_10.1.0.adoc | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 04454e5..81a7c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>29</version>
+ <version>30</version>
</parent>
<groupId>org.apache.logging</groupId>
diff --git a/src/changelog/10.1.0/update_org_apache_apache.xml b/src/changelog/10.1.0/update_org_apache_apache.xml
new file mode 100644
index 0000000..10793e1
--- /dev/null
+++ b/src/changelog/10.1.0/update_org_apache_apache.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ type="changed">
+ <author id="github:grobmeier"/>
+ <description format="asciidoc">Update `org.apache:apache` to version `30`</description>
+</entry>
diff --git a/src/site/_release-notes/_10.1.0.adoc b/src/site/_release-notes/_10.1.0.adoc
index 66294ef..784e82c 100644
--- a/src/site/_release-notes/_10.1.0.adoc
+++ b/src/site/_release-notes/_10.1.0.adoc
@@ -60,6 +60,7 @@ In particular, we expect the absence of `module-info.java` files to avoid severa
* Update `actions/checkout` to version `4.1.0`
* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.7.3.6`
* Update `com.google.errorprone:error_prone_core` to version `2.22.0`
+* Update `org.apache:apache` to version `30`
* Update `org.osgi:osgi.annotation` to version `8.1.0`
==== Removed
[logging-parent] 03/03: Upload test and reproducibility results on failures in CI (#28)
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit c1749637368ae853702275e76ca09f824643a186
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Sep 27 13:25:33 2023 +0200
Upload test and reproducibility results on failures in CI (#28)
---
.github/workflows/build-reusable.yaml | 23 ++++++++++++
src/changelog/.10.x.x/.release-notes.adoc.ftl | 8 +----
src/changelog/10.1.0/add-reports-on-failure.xml | 9 +++++
src/site/_release-notes/_10.x.x.adoc | 48 -------------------------
4 files changed, 33 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/build-reusable.yaml b/.github/workflows/build-reusable.yaml
index 2ea76a3..5e671f7 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -52,6 +52,7 @@ jobs:
# We could have used `verify`, but `clean install` is required while generating the build reproducibility report, which is performed in the next step.
# For details, see: https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-to-test-my-maven-build-reproducibility
- name: Build
+ id: build
shell: bash
run: |
./mvnw \
@@ -60,12 +61,34 @@ jobs:
-DinstallAtEnd=true \
clean install
+ # We upload tests results if the build fails.
+ - name: Upload test results
+ if: failure() && steps.build.conclusion == 'failure'
+ uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
+ with:
+ name: surefire-${{matrix.os}}-${{github.run_number}}-${{github.run_attempt}}
+ path: |
+ **/target/surefire-reports
+ **/target/logs
+
# `clean verify artifact:compare` is required to generate the build reproducibility report.
# For details, see: https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-to-test-my-maven-build-reproducibility
- name: Verify build reproducibility
+ id: reproducibility
shell: bash
run: |
./mvnw \
--show-version --batch-mode --errors --no-transfer-progress \
-DskipTests=true \
clean verify artifact:compare
+
+ # We reproducibility results if the build fails.
+ - name: Upload reproducibility results
+ if: failure() && steps.reproducibility.conclusion == 'failure'
+ uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
+ with:
+ name: reproducibility-${{matrix.os}}-${{github.run_number}}-${{github.run_attempt}}
+ path: |
+ **/target/*.buildcompare
+ **/target/*.jar
+ **/target/reference/*.jar
diff --git a/src/changelog/.10.x.x/.release-notes.adoc.ftl b/src/changelog/.10.x.x/.release-notes.adoc.ftl
index 8662cca..b220984 100644
--- a/src/changelog/.10.x.x/.release-notes.adoc.ftl
+++ b/src/changelog/.10.x.x/.release-notes.adoc.ftl
@@ -38,12 +38,6 @@
<#if release.date?has_content>Release date:: ${release.date}</#if>
-This minor release focuses on shipping AsciiDoc-based website generation convenience targeting the `src/site` folder.
-As a part of this effort, `logging-parent` started publishing https://logging.apache.org/logging-parent/latest[its own website] and `log4j-changelog` support is switched from Markdown to AsciiDoc.
-
-The introduced https://github.com/bndtools/bnd/blob/master/maven-plugins/bnd-maven-plugin[`bnd-maven-plugin`] default auto-generates both OSGi and JPMS descriptors.
-Users only need to annotate packages that are to be exported with `org.osgi.annotation.bundle.Export`, plugin will do the rest of the magic.
-Hence, no need for custom `.bnd` and/or `module-info.java` files anymore.
-In particular, we expect the absence of `module-info.java` files to avoid several IDE and testing related headaches.
+This minor release contains several small improvements.
<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.1.0/add-reports-on-failure.xml b/src/changelog/10.1.0/add-reports-on-failure.xml
new file mode 100644
index 0000000..46d0239
--- /dev/null
+++ b/src/changelog/10.1.0/add-reports-on-failure.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ type="added">
+ <issue id="28" link="https://github.com/apache/logging-parent/issues/28"/>
+ <author id="github:ppkarwasz"/>
+ <description format="asciidoc">Added CI report uploading in case of test or reproducibility failures</description>
+</entry>
diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc
deleted file mode 100644
index b08527a..0000000
--- a/src/site/_release-notes/_10.x.x.adoc
+++ /dev/null
@@ -1,48 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
-
- Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
- Auto-generation happens during `generate-sources` phase of Maven.
- Hence, you must always
-
- 1. Find and edit the associated `.release-notes.adoc.ftl`
- 2. Run `./mvnw generate-sources`
- 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-////
-
-[#release-notes-10-x-x]
-=== 10.x.x
-
-
-
-This minor release focuses on shipping AsciiDoc-based website generation convenience targeting the `src/site` folder.
-As a part of this effort, `logging-parent` started publishing https://logging.apache.org/logging-parent/latest[its own website] and `log4j-changelog` support is switched from Markdown to AsciiDoc.
-
-The introduced https://github.com/bndtools/bnd/blob/master/maven-plugins/bnd-maven-plugin[`bnd-maven-plugin`] default auto-generates both OSGi and JPMS descriptors.
-Users only need to annotate packages that are to be exported with `org.osgi.annotation.bundle.Export`, plugin will do the rest of the magic.
-Hence, no need for custom `.bnd` and/or `module-info.java` files anymore.
-In particular, we expect the absence of `module-info.java` files to avoid several IDE and testing related headaches.
-
[logging-parent] 02/03: Add `grobmeier` to `developers` in `pom.xml`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit e5f792a6e27f1b153717decde871924a1ec3cc71
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Sep 28 10:52:43 2023 +0200
Add `grobmeier` to `developers` in `pom.xml`
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index 81a7c9c..eff2705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,16 @@
<timezone>America/New_York</timezone>
</developer>
+ <developer>
+ <id>grobmeier</id>
+ <name>Christian Grobmeier</name>
+ <email>grobmeier@apache.org</email>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>Europe/Berlin</timezone>
+ </developer>
+
<developer>
<id>mattsicker</id>
<name>Matt Sicker</name>