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 2024/04/15 10:30:08 UTC
(logging-parent) branch main updated (1492afc -> 05d5ef6)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
from 1492afc Update `com.h3xstream.findsecbugs:findsecbugs-plugin` to version `1.13.0` (#157)
new 46f8ee6 Improve release instructions
new 05d5ef6 Tidy up changelog
The 2 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:
pom.xml | 2 +-
src/changelog/.11.x.x/105_cyclonedx_upgrade.xml | 2 +-
src/changelog/.11.x.x/140_add_coverage_profile.xml | 2 +-
.../update_actions_checkout.xml => .11.x.x/antora.xml} | 2 +-
.../auto_site_deploy.xml} | 2 +-
src/changelog/.11.x.x/update_actions_checkout.xml | 8 --------
src/changelog/.11.x.x/update_actions_setup_java.xml | 8 --------
src/changelog/.11.x.x/update_actions_upload_artifact.xml | 8 --------
.../update_com_github_spotbugs_spotbugs_annotations.xml | 8 --------
.../update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml | 8 --------
src/changelog/.11.x.x/update_commons_codec_commons_codec.xml | 8 --------
...te_de_skuzzle_enforcer_restrict_imports_enforcer_rule.xml | 8 --------
src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml | 8 --------
src/changelog/.11.x.x/update_github_codeql_action.xml | 8 --------
.../update_org_asciidoctor_asciidoctor_maven_plugin.xml | 8 --------
.../.11.x.x/update_org_eclipse_jgit_org_eclipse_jgit.xml | 8 --------
.../.11.x.x/update_org_jacoco_jacoco_maven_plugin.xml | 8 --------
.../update_org_simplify4u_plugins_sign_maven_plugin.xml | 8 --------
.../modules/ROOT/pages/release-instructions-project.adoc | 12 ++++++++++--
19 files changed, 15 insertions(+), 111 deletions(-)
copy src/changelog/{10.1.0/update_actions_checkout.xml => .11.x.x/antora.xml} (72%)
copy src/changelog/{10.1.0/add-osgi-jpms-descriptor-generation.xml => .11.x.x/auto_site_deploy.xml} (69%)
delete mode 100644 src/changelog/.11.x.x/update_actions_checkout.xml
delete mode 100644 src/changelog/.11.x.x/update_actions_setup_java.xml
delete mode 100644 src/changelog/.11.x.x/update_actions_upload_artifact.xml
delete mode 100644 src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
delete mode 100644 src/changelog/.11.x.x/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
delete mode 100644 src/changelog/.11.x.x/update_commons_codec_commons_codec.xml
delete mode 100644 src/changelog/.11.x.x/update_de_skuzzle_enforcer_restrict_imports_enforcer_rule.xml
delete mode 100644 src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml
delete mode 100644 src/changelog/.11.x.x/update_github_codeql_action.xml
delete mode 100644 src/changelog/.11.x.x/update_org_asciidoctor_asciidoctor_maven_plugin.xml
delete mode 100644 src/changelog/.11.x.x/update_org_eclipse_jgit_org_eclipse_jgit.xml
delete mode 100644 src/changelog/.11.x.x/update_org_jacoco_jacoco_maven_plugin.xml
delete mode 100644 src/changelog/.11.x.x/update_org_simplify4u_plugins_sign_maven_plugin.xml
(logging-parent) 02/02: Tidy up changelog
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 05d5ef64274ddb56c96c48cac0e9da17a73e56dc
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Apr 15 12:28:46 2024 +0200
Tidy up changelog
---
pom.xml | 2 +-
src/changelog/.11.x.x/105_cyclonedx_upgrade.xml | 2 +-
src/changelog/.11.x.x/140_add_coverage_profile.xml | 2 +-
src/changelog/.11.x.x/{update_actions_checkout.xml => antora.xml} | 5 ++---
.../{update_actions_setup_java.xml => auto_site_deploy.xml} | 5 ++---
src/changelog/.11.x.x/update_actions_upload_artifact.xml | 8 --------
.../.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml | 8 --------
.../update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml | 8 --------
src/changelog/.11.x.x/update_commons_codec_commons_codec.xml | 8 --------
.../update_de_skuzzle_enforcer_restrict_imports_enforcer_rule.xml | 8 --------
src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml | 8 --------
src/changelog/.11.x.x/update_github_codeql_action.xml | 8 --------
.../.11.x.x/update_org_asciidoctor_asciidoctor_maven_plugin.xml | 8 --------
.../.11.x.x/update_org_eclipse_jgit_org_eclipse_jgit.xml | 8 --------
src/changelog/.11.x.x/update_org_jacoco_jacoco_maven_plugin.xml | 8 --------
.../.11.x.x/update_org_simplify4u_plugins_sign_maven_plugin.xml | 8 --------
16 files changed, 7 insertions(+), 97 deletions(-)
diff --git a/pom.xml b/pom.xml
index 17baed7..92d768b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
<error-prone.version>2.26.1</error-prone.version>
<!-- `findsecbugs-plugin:1.13.0` contains a bug blocking Log4j compilation: https://github.com/find-sec-bugs/find-sec-bugs/pull/728
Hence, pinning the `1.12.0` instead. -->
- <findsecbugs-plugin.version>1.13.0</findsecbugs-plugin.version>
+ <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<!-- site-specific versions -->
<!-- We use a separate property than `project.version` to refer to the most recent _published_ version of the project.
diff --git a/src/changelog/.11.x.x/105_cyclonedx_upgrade.xml b/src/changelog/.11.x.x/105_cyclonedx_upgrade.xml
index bf672b2..84d0c1c 100644
--- a/src/changelog/.11.x.x/105_cyclonedx_upgrade.xml
+++ b/src/changelog/.11.x.x/105_cyclonedx_upgrade.xml
@@ -4,5 +4,5 @@
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="changed">
<issue id="105" link="https://github.com/apache/logging-parent/issues/105"/>
- <description format="asciidoc">Replace `process-sbom` script with CycloneDX plugin configuration.</description>
+ <description format="asciidoc">Replace `process-sbom` script with CycloneDX plugin configuration</description>
</entry>
diff --git a/src/changelog/.11.x.x/140_add_coverage_profile.xml b/src/changelog/.11.x.x/140_add_coverage_profile.xml
index c771e8d..ddd35c1 100644
--- a/src/changelog/.11.x.x/140_add_coverage_profile.xml
+++ b/src/changelog/.11.x.x/140_add_coverage_profile.xml
@@ -4,5 +4,5 @@
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="added">
<issue id="140" link="https://github.com/apache/logging-parent/pull/140"/>
- <description format="asciidoc">Add `coverage` profile to generate a test coverage report.</description>
+ <description format="asciidoc">Add `coverage` profile to generate a test coverage report</description>
</entry>
diff --git a/src/changelog/.11.x.x/update_actions_checkout.xml b/src/changelog/.11.x.x/antora.xml
similarity index 58%
rename from src/changelog/.11.x.x/update_actions_checkout.xml
rename to src/changelog/.11.x.x/antora.xml
index 513fc17..79efb12 100644
--- a/src/changelog/.11.x.x/update_actions_checkout.xml
+++ b/src/changelog/.11.x.x/antora.xml
@@ -2,7 +2,6 @@
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://logging.apache.org/xml/ns"
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="132" link="https://github.com/apache/logging-parent/pull/132"/>
- <description format="asciidoc">Update `actions/checkout` to version `4.1.2`</description>
+ type="changed">
+ <description format="asciidoc">Migrate website support from `asciidoctor-maven-plugin` to Antora</description>
</entry>
diff --git a/src/changelog/.11.x.x/update_actions_setup_java.xml b/src/changelog/.11.x.x/auto_site_deploy.xml
similarity index 58%
rename from src/changelog/.11.x.x/update_actions_setup_java.xml
rename to src/changelog/.11.x.x/auto_site_deploy.xml
index 985d204..097c807 100644
--- a/src/changelog/.11.x.x/update_actions_setup_java.xml
+++ b/src/changelog/.11.x.x/auto_site_deploy.xml
@@ -2,7 +2,6 @@
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://logging.apache.org/xml/ns"
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="137" link="https://github.com/apache/logging-parent/pull/137"/>
- <description format="asciidoc">Update `actions/setup-java` to version `4.2.1`</description>
+ type="added">
+ <description format="asciidoc">Add `deploy-site-yaml` GitHub actions workflow to automate the website deployment</description>
</entry>
diff --git a/src/changelog/.11.x.x/update_actions_upload_artifact.xml b/src/changelog/.11.x.x/update_actions_upload_artifact.xml
deleted file mode 100644
index 5c421af..0000000
--- a/src/changelog/.11.x.x/update_actions_upload_artifact.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="114" link="https://github.com/apache/logging-parent/pull/114"/>
- <description format="asciidoc">Update `actions/upload-artifact` to version `4.3.1`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
deleted file mode 100644
index 499d1f0..0000000
--- a/src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="152" link="https://github.com/apache/logging-parent/pull/152"/>
- <description format="asciidoc">Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.4`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml b/src/changelog/.11.x.x/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
deleted file mode 100644
index c26d724..0000000
--- a/src/changelog/.11.x.x/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="157" link="https://github.com/apache/logging-parent/pull/157"/>
- <description format="asciidoc">Update `com.h3xstream.findsecbugs:findsecbugs-plugin` to version `1.13.0`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_commons_codec_commons_codec.xml b/src/changelog/.11.x.x/update_commons_codec_commons_codec.xml
deleted file mode 100644
index 5a20236..0000000
--- a/src/changelog/.11.x.x/update_commons_codec_commons_codec.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="115" link="https://github.com/apache/logging-parent/pull/115"/>
- <description format="asciidoc">Update `commons-codec:commons-codec` to version `1.16.1`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_de_skuzzle_enforcer_restrict_imports_enforcer_rule.xml b/src/changelog/.11.x.x/update_de_skuzzle_enforcer_restrict_imports_enforcer_rule.xml
deleted file mode 100644
index 894b084..0000000
--- a/src/changelog/.11.x.x/update_de_skuzzle_enforcer_restrict_imports_enforcer_rule.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="111" link="https://github.com/apache/logging-parent/pull/111"/>
- <description format="asciidoc">Update `de.skuzzle.enforcer:restrict-imports-enforcer-rule` to version `2.5.0`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml b/src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml
deleted file mode 100644
index d6e0c64..0000000
--- a/src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="144" link="https://github.com/apache/logging-parent/pull/144"/>
- <description format="asciidoc">Update `dependabot/fetch-metadata` to version `2.0.0`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_github_codeql_action.xml b/src/changelog/.11.x.x/update_github_codeql_action.xml
deleted file mode 100644
index 573bc36..0000000
--- a/src/changelog/.11.x.x/update_github_codeql_action.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="153" link="https://github.com/apache/logging-parent/pull/153"/>
- <description format="asciidoc">Update `github/codeql-action` to version `3.24.10`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_org_asciidoctor_asciidoctor_maven_plugin.xml b/src/changelog/.11.x.x/update_org_asciidoctor_asciidoctor_maven_plugin.xml
deleted file mode 100644
index 69bd15d..0000000
--- a/src/changelog/.11.x.x/update_org_asciidoctor_asciidoctor_maven_plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="119" link="https://github.com/apache/logging-parent/pull/119"/>
- <description format="asciidoc">Update `org.asciidoctor:asciidoctor-maven-plugin` to version `3.0.0`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_org_eclipse_jgit_org_eclipse_jgit.xml b/src/changelog/.11.x.x/update_org_eclipse_jgit_org_eclipse_jgit.xml
deleted file mode 100644
index e2e209b..0000000
--- a/src/changelog/.11.x.x/update_org_eclipse_jgit_org_eclipse_jgit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="130" link="https://github.com/apache/logging-parent/pull/130"/>
- <description format="asciidoc">Update `org.eclipse.jgit:org.eclipse.jgit` to version `6.9.0.202403050737-r`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_org_jacoco_jacoco_maven_plugin.xml b/src/changelog/.11.x.x/update_org_jacoco_jacoco_maven_plugin.xml
deleted file mode 100644
index 46ca86d..0000000
--- a/src/changelog/.11.x.x/update_org_jacoco_jacoco_maven_plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="148" link="https://github.com/apache/logging-parent/pull/148"/>
- <description format="asciidoc">Update `org.jacoco:jacoco-maven-plugin` to version `0.8.12`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_org_simplify4u_plugins_sign_maven_plugin.xml b/src/changelog/.11.x.x/update_org_simplify4u_plugins_sign_maven_plugin.xml
deleted file mode 100644
index 930e37b..0000000
--- a/src/changelog/.11.x.x/update_org_simplify4u_plugins_sign_maven_plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="https://logging.apache.org/xml/ns"
- xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
- type="updated">
- <issue id="124" link="https://github.com/apache/logging-parent/pull/124"/>
- <description format="asciidoc">Update `org.simplify4u.plugins:sign-maven-plugin` to version `1.1.0`</description>
-</entry>
(logging-parent) 01/02: Improve release instructions
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 46f8ee670071773695ea408c96ae987d03f7f590
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Apr 15 12:22:27 2024 +0200
Improve release instructions
---
.../modules/ROOT/pages/release-instructions-project.adoc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
index 0f4a4b2..9363ef9 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -30,8 +30,16 @@ This section explains how to publish a new release of projects extending from th
[WARNING]
====
-In the code examples below, assuming that the project and its version to be published are `{project-id}` and `7.8.0`, respectively.
-You need to adapt these values for your project and version accordingly.
+Shared instructions hardcode the following constants:
+
+Project ID::
+`{project-id}`
+
+Project version::
+`7.8.0`
+
+**You must adapt these values for your project!**
+For instance, project ID needs to be replaced with `log4j` for Log4j, `log4j-kotlin` for Log4j Kotlin, etc.
====
[#stage-release]