(logging-parent) branch main-site-pro-out updated: Add website content generated from `eb3d4c1d8e1149f7165147be2298586ab243a2ee`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-pro-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-pro-out by this push: new a62f70b Add website content generated from `eb3d4c1d8e1149f7165147be2298586ab243a2ee` a62f70b is described below commit a62f70b75ffeb2d5fb3914c205b30f2928fa3b78 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 13:53:33 2024 + Add website content generated from `eb3d4c1d8e1149f7165147be2298586ab243a2ee` --- README.txt |1 - index.html | 1738 2 files changed, 1738 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt deleted file mode 100644 index 1dd210f..000 --- a/README.txt +++ /dev/null @@ -1 +0,0 @@ -An orphan branch to host auto-generated production website content diff --git a/index.html b/index.html new file mode 100644 index 000..0ddacdf --- /dev/null +++ b/index.html @@ -0,0 +1,1738 @@ + + + + + + + +Logging Parent +https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700;> + +/*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ +/* Uncomment the following line when using as a custom stylesheet */ +/* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";; */ +html{font-family:sans-serif;-webkit-text-size-adjust:100%} +a{background:none} +a:focus{outline:thin dotted} +a:active,a:hover{outline:0} +h1{font-size:2em;margin:.67em 0} +b,strong{font-weight:bold} +abbr{font-size:.9em} +abbr[title]{cursor:help;border-bottom:1px dotted #df;text-decoration:none} +dfn{font-style:italic} +hr{height:0} +mark{background:#ff0;color:#000} +code,kbd,pre,samp{font-family:monospace;font-size:1em} +pre{white-space:pre-wrap} +q{quotes:"\201C" "\201D" "\2018" "\2019"} +small{font-size:80%} +sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} +sup{top:-.5em} +sub{bottom:-.25em} +img{border:0} +svg:not(:root){overflow:hidden} +figure{margin:0} +audio,video{display:inline-block} +audio:not([controls]){display:none;height:0} +fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} +legend{border:0;padding:0} +button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} +button,input{line-height:normal} +button,select{text-transform:none} +button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer} +button[disabled],html input[disabled]{cursor:default} +input[type=checkbox],input[type=radio]{padding:0} +button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} +textarea{overflow:auto;vertical-align:top} +table{border-collapse:collapse;border-spacing:0} +*,::before,::after{box-sizing:border-box} +html,body{font-size:100%} +body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased} +a:hover{cursor:pointer} +img,object,embed{max-width:100%;height:auto} +object,embed{height:100%} +img{-ms-interpolation-mode:bicubic} +.left{float:left!important} +.right{float:right!important} +.text-left{text-align:left!important} +.text-right{text-align:right!important} +.text-center{text-align:center!important} +.text-justify{text-align:justify!important} +.hide{display:none} +img,object,svg{display:inline-block;vertical-align:middle} +textarea{height:auto;min-height:50px} +select{width:100%} +.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em} +div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0} +a{color:#2156a5;text-decoration:underline;line-height:inherit} +a:hover,a:focus{color:#1d4b8f} +a img{border:0} +p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} +p aside{font-size:.875em;line-height:1.35;font-style:italic}
(logging-parent) branch main-site-pro-out updated: Add `.asf.yaml` along with an INFRA fix for the website content generated from `eb3d4c1d8e1149f7165147be2298586ab243a2ee`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-pro-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-pro-out by this push: new 810cee0 Add `.asf.yaml` along with an INFRA fix for the website content generated from `eb3d4c1d8e1149f7165147be2298586ab243a2ee` 810cee0 is described below commit 810cee0fcef1b69943ffd2763c54cf3c84802c24 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 13:53:34 2024 + Add `.asf.yaml` along with an INFRA fix for the website content generated from `eb3d4c1d8e1149f7165147be2298586ab243a2ee` --- .asf.yaml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..1f5a932 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,14 @@ +publish: + profile: ~ + whoami: main-site-pro-out + subdir: content/logging-parent + + +# INFRA cannot handle change sets bigger than a certain size: https://the-asf.slack.com/archives/CBX4TSBQ8/p1709724983391709 +# This file will be used to push a small commit to help the INFRA to recover. +# +# Random values to cause a change: +# +# - Seed: 28249 +# - Commit ID: eb3d4c1d8e1149f7165147be2298586ab243a2ee +# - Timestamp: 2024-04-11T13:53:34Z
(logging-log4j2) branch ScopedContext updated (307120d82b -> a2397eeb33)
This is an automated email from the ASF dual-hosted git repository. rgoers pushed a change to branch ScopedContext in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 307120d82b merge changes from 2.x branch add 132c2d33e4 More abstractions add 3f11508f0c Update `github/codeql-action` to version `3.24.10` (#2451) add 1caec7d20d Add link to the Logging Services page add 9ad91dbd77 Update `commons-io:commons-io` to version `2.16.1` (#2459) add 7b5d23e140 Update `co.elastic.clients:elasticsearch-java` to version `8.13.2` (#2458) add 52edad97e8 Correct timezone for Raman Gupta (#2463) add d78cf38ec3 Update `org.apache.activemq:activemq-broker` to version `6.1.1` (#2452) add 3c423531c2 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#2464) add a2397eeb33 Merge branch '2.x' into ScopedContext No new revisions were added by this update. Summary of changes: .github/workflows/scorecards-analysis.yaml | 2 +- antora-playbook.yaml | 5 + .../apache/logging/log4j/ScopedContextTest.java| 49 ++ .../org/apache/logging/log4j/ScopedContext.java| 58 +++ .../log4j/spi/AbstractScopedContextProvider.java | 527 + .../logging/log4j/spi/ScopedContextProvider.java | 7 + .../spi/internal/DefaultScopedContextProvider.java | 385 +-- .../impl/internal/QueuedScopedContextProvider.java | 357 +- log4j-parent/pom.xml | 8 +- pom.xml| 2 +- ...pdate_co_elastic_clients_elasticsearch_java.xml | 4 +- .../.2.x.x/update_commons_io_commons_io.xml| 4 +- .../.2.x.x/update_github_codeql_action.xml | 4 +- .../update_org_apache_activemq_activemq_broker.xml | 4 +- ...te_org_springframework_spring_framework_bom.xml | 4 +- 15 files changed, 684 insertions(+), 736 deletions(-) create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractScopedContextProvider.java
(logging-parent) branch main-site-stg-out updated: Add website content generated from `5c9e8f84ce4a8a10f031cadcda79576549a5e3c7`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main-site-stg-out
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main-site-stg-out by this push:
new 75b4387 Add website content generated from
`5c9e8f84ce4a8a10f031cadcda79576549a5e3c7`
75b4387 is described below
commit 75b4387294968341e2377c7c5c0c88611ad1dfd4
Author: ASF Logging Services RM
AuthorDate: Thu Apr 11 13:15:53 2024 +
Add website content generated from
`5c9e8f84ce4a8a10f031cadcda79576549a5e3c7`
---
404.html | 82
README.txt| 1 -
_/css/site.css| 3 +
_/css/vendor/tabs.css | 110 +
_/font/roboto-cyrillic-400-italic.woff2 | Bin 0 -> 10292 bytes
_/font/roboto-cyrillic-400-normal.woff2 | Bin 0 -> 9628 bytes
_/font/roboto-cyrillic-500-italic.woff2 | Bin 0 -> 10640 bytes
_/font/roboto-cyrillic-500-normal.woff2 | Bin 0 -> 9840 bytes
_/font/roboto-latin-400-italic.woff | Bin 0 -> 22048 bytes
_/font/roboto-latin-400-italic.woff2 | Bin 0 -> 17368 bytes
_/font/roboto-latin-400-normal.woff | Bin 0 -> 20344 bytes
_/font/roboto-latin-400-normal.woff2 | Bin 0 -> 15744 bytes
_/font/roboto-latin-500-italic.woff | Bin 0 -> 22092 bytes
_/font/roboto-latin-500-italic.woff2 | Bin 0 -> 17336 bytes
_/font/roboto-latin-500-normal.woff | Bin 0 -> 20544 bytes
_/font/roboto-latin-500-normal.woff2 | Bin 0 -> 15920 bytes
_/font/roboto-mono-latin-400-normal.woff | Bin 0 -> 15160 bytes
_/font/roboto-mono-latin-400-normal.woff2 | Bin 0 -> 12312 bytes
_/font/roboto-mono-latin-500-normal.woff | Bin 0 -> 15364 bytes
_/font/roboto-mono-latin-500-normal.woff2 | Bin 0 -> 12532 bytes
_/img/back.svg| 1 +
_/img/caret.svg | 1 +
_/img/chevron.svg | 1 +
_/img/home-o.svg | 1 +
_/img/home.svg| 1 +
_/img/menu.svg| 1 +
_/img/octicons-16.svg | 1 +
_/js/site.js | 6 +
_/js/vendor/highlight.js | 1 +
_/js/vendor/tabs.js | 127 +
features.html | 238 ++
index.html| 191
release-instructions-project.html | 483 +++
release-instructions-xml-schema.html | 248 ++
release-notes.html| 762 ++
sitemap.xml | 27 ++
usage.html| 186
37 files changed, 2471 insertions(+), 1 deletion(-)
diff --git a/404.html b/404.html
new file mode 100644
index 000..1527069
--- /dev/null
+++ b/404.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+Page Not Found :: Apache Logging Parent
+
+
+
+
+
+
+ /* `page-toclevels` greater than 4 are not supported by Antora UI, patching
it: */
+ .toc .toc-menu li[data-level="4"] a {
+padding-left: 2.75rem
+ }
+ /* Replace the default highlight.js color for strings from red to green: */
+ .hljs-string {
+color: #0f8532;
+ }
+
+
+
+
+
+
+ Apache Logging Parent
+
+
+
+https://logging.apache.org;>a subproject
ofApache Logging Services
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://github.com/apache/logging-parent/edit/main/src/site/antora/modules//pages/;>Edit
this Page
+
+
+
+Page Not Found
+
+The page youre looking for does not exist. It may have been moved.
You can return to the start page, or follow one of
the links in the navigation to the left.
+
+
+If you arrived on this page by clicking on a link, please notify the owner
of the site that the link is broken.
+If you typed the URL of this page manually, please double check that you
entered the address correctly.
+
+
+
+
+
+
+
+Copyright © 1999-2024 https://www.apache.org/;>The Apache
Software Foundation.
+Licensed under the https://www.apache.org/licenses/LICENSE-2.0;>Apache Software License,
Version 2.0.
+Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy
policy.
+
+
+Apache, Log4j, and the Apache feather logo are trademarks or registered
trademarks of The Apache Software Foundation.
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+
+
+
+
+
+
+
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 45256d1..000
--- a/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-An orphan branch to host auto-generated staging website content
diff --git a/_/css/site.css b/_/css/site.css
new file mode 100644
index 000..e7b43c5
--- /dev/null
(logging-parent) branch main updated: Fix bash quote escaping
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 The following commit(s) were added to refs/heads/main by this push: new 5edf728 Fix bash quote escaping 5edf728 is described below commit 5edf7285017cd227891c3a6b55df2f0d0215fe53 Author: Volkan Yazıcı AuthorDate: Thu Apr 11 15:18:03 2024 +0200 Fix bash quote escaping --- .github/workflows/deploy-site-reusable.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-site-reusable.yaml b/.github/workflows/deploy-site-reusable.yaml index 1626a70..44055e3 100644 --- a/.github/workflows/deploy-site-reusable.yaml +++ b/.github/workflows/deploy-site-reusable.yaml @@ -177,7 +177,7 @@ jobs: # - Timestamp: $(date --utc '+%Y-%m-%dT%H:%M:%SZ') EOF git add .asf.yaml -git commit -S .asf.yaml -m "Add `.asf.yaml` along with an INFRA fix for the website content generated from \`$SOURCE_COMMIT_ID\`" +git commit -S .asf.yaml -m "Add \`.asf.yaml\` along with an INFRA fix for the website content generated from \`$SOURCE_COMMIT_ID\`" # Push changes *separately*! # A separate small commit push necessary due to the INFRA issue explained above.
(logging-parent) branch main-site-stg-out updated: Add along with an INFRA fix for the website content generated from `5c9e8f84ce4a8a10f031cadcda79576549a5e3c7`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new cda4322 Add along with an INFRA fix for the website content generated from `5c9e8f84ce4a8a10f031cadcda79576549a5e3c7` cda4322 is described below commit cda4322a4502066d5633feff427b266720bb5883 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 13:15:54 2024 + Add along with an INFRA fix for the website content generated from `5c9e8f84ce4a8a10f031cadcda79576549a5e3c7` --- .asf.yaml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..465ff8b --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,14 @@ +staging: + profile: ~ + whoami: main-site-stg-out + subdir: content/logging-parent + + +# INFRA cannot handle change sets bigger than a certain size: https://the-asf.slack.com/archives/CBX4TSBQ8/p1709724983391709 +# This file will be used to push a small commit to help the INFRA to recover. +# +# Random values to cause a change: +# +# - Seed: 26812 +# - Commit ID: 5c9e8f84ce4a8a10f031cadcda79576549a5e3c7 +# - Timestamp: 2024-04-11T13:15:54Z
(logging-parent) 01/01: Add `README.txt`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main-site-pro-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 9903a847c30ab9ed1221c39bea634704b5266aba Author: Volkan Yazıcı AuthorDate: Wed Apr 10 11:31:19 2024 +0200 Add `README.txt` --- README.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/README.txt b/README.txt new file mode 100644 index 000..1dd210f --- /dev/null +++ b/README.txt @@ -0,0 +1 @@ +An orphan branch to host auto-generated production website content
(logging-parent) branch release/11.0.0-test1 deleted (was e2724e0)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/11.0.0-test1 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was e2724e0 Update the `project.build.outputTimestamp` property This change permanently discards the following revisions: discard e2724e0 Update the `project.build.outputTimestamp` property discard 23f2867 Dummy change to trigger CI to test repetitive SVN uploads discard 0aaac63 Release changelog for version `11.0.0-test1` discard bb9b3b2 Update the `project.build.outputTimestamp` property discard 8e6a0c8 Fix Spotless failures discard 41ec1d9 Prepare for release
(logging-parent) 01/01: Add `deploy-site.yaml` workflow
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main-site-pro
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit eb3d4c1d8e1149f7165147be2298586ab243a2ee
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 15:52:51 2024 +0200
Add `deploy-site.yaml` workflow
---
.github/workflows/deploy-site.yaml | 66 ++
1 file changed, 66 insertions(+)
diff --git a/.github/workflows/deploy-site.yaml
b/.github/workflows/deploy-site.yaml
new file mode 100644
index 000..7679ddb
--- /dev/null
+++ b/.github/workflows/deploy-site.yaml
@@ -0,0 +1,66 @@
+#
+# 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.
+#
+
+name: deploy-site
+
+on:
+ push:
+branches:
+ - "main"
+ - "main-site-pro"
+paths-ignore:
+ - "**.md"
+ - "**.txt"
+
+permissions: read-all
+
+jobs:
+
+ deploy-site-stg:
+if: github.repository == 'apache/logging-parent' && github.ref_name ==
'main'
+uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
+# Secrets for committing the generated site
+secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+# Write permissions for committing the generated site
+permissions:
+ contents: write
+with:
+ asf-yaml-content: |
+staging:
+ profile: ~
+ whoami: ${{ github.ref_name }}-site-stg-out
+ subdir: content/logging-parent
+ target-branch: ${{ github.ref_name }}-site-stg-out
+
+ deploy-site-pro:
+if: github.repository == 'apache/logging-parent' && github.ref_name ==
'main-site-pro'
+uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
+# Secrets for committing the generated site
+secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+# Write permissions for committing the generated site
+permissions:
+ contents: write
+with:
+ asf-yaml-content: |
+publish:
+ profile: ~
+ whoami: ${{ github.ref_name }}-out
+ subdir: content/logging-parent
+ source-branch: ${{ github.ref_name }}
+ target-branch: ${{ github.ref_name }}-out
(logging-parent) branch main-site-pro updated (8b24146 -> eb3d4c1)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git discard 8b24146 Dummy change to trigger CI new eb3d4c1 Add `deploy-site.yaml` workflow This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8b24146) \ N -- N -- N refs/heads/main-site-pro (eb3d4c1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .asf.yaml | 4 ++- .github/workflows/deploy-site.yaml | 66 ++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/deploy-site.yaml
(logging-log4j2) branch ScopedContext updated (a2397eeb33 -> 3ef49c59c3)
This is an automated email from the ASF dual-hosted git repository. rgoers pushed a change to branch ScopedContext in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from a2397eeb33 Merge branch '2.x' into ScopedContext add 3ef49c59c3 Fix javadoc comment No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/logging/log4j/message/package-info.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-parent) branch main updated: Create a dedicated workflow for site deployments
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
The following commit(s) were added to refs/heads/main by this push:
new 5c9e8f8 Create a dedicated workflow for site deployments
5c9e8f8 is described below
commit 5c9e8f84ce4a8a10f031cadcda79576549a5e3c7
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 15:15:21 2024 +0200
Create a dedicated workflow for site deployments
---
.github/workflows/build.yaml | 20 ++-
.../{deploy-site-pro.yaml => deploy-site.yaml} | 40 --
2 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a98a6ea..0be2b40 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,10 +23,12 @@ on:
- "main"
- "release/*"
paths-ignore:
+ - "**.adoc"
- "**.md"
- "**.txt"
pull_request:
paths-ignore:
+ - "**.adoc"
- "**.md"
- "**.txt"
@@ -46,24 +48,6 @@ jobs:
with:
site-enabled: true
- deploy-site-stg:
-needs: build
-if: github.repository == 'apache/logging-parent' && github.ref_name ==
'main'
-uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
-# Secrets for committing the generated site
-secrets:
- GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
-# Write permissions for committing the generated site
-permissions:
- contents: write
-with:
- asf-yaml-content: |
-staging:
- profile: ~
- whoami: main-site-stg
- subdir: content/logging-parent
- target-branch: main-site-stg
-
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-parent' && github.ref_name ==
'main'
diff --git a/.github/workflows/deploy-site-pro.yaml
b/.github/workflows/deploy-site.yaml
similarity index 56%
rename from .github/workflows/deploy-site-pro.yaml
rename to .github/workflows/deploy-site.yaml
index 4b7771f..7679ddb 100644
--- a/.github/workflows/deploy-site-pro.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -15,22 +15,40 @@
# limitations under the License.
#
-name: deploy-site-pro
+name: deploy-site
on:
- workflow_dispatch:
-inputs:
- source-branch:
-description: The branch, tag, or SHA to checkout and run the Maven
`site` goal on.
-required: true
-type: string
+ push:
+branches:
+ - "main"
+ - "main-site-pro"
+paths-ignore:
+ - "**.md"
+ - "**.txt"
permissions: read-all
jobs:
+ deploy-site-stg:
+if: github.repository == 'apache/logging-parent' && github.ref_name ==
'main'
+uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
+# Secrets for committing the generated site
+secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+# Write permissions for committing the generated site
+permissions:
+ contents: write
+with:
+ asf-yaml-content: |
+staging:
+ profile: ~
+ whoami: ${{ github.ref_name }}-site-stg-out
+ subdir: content/logging-parent
+ target-branch: ${{ github.ref_name }}-site-stg-out
+
deploy-site-pro:
-if: github.repository == 'apache/logging-parent'
+if: github.repository == 'apache/logging-parent' && github.ref_name ==
'main-site-pro'
uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
# Secrets for committing the generated site
secrets:
@@ -42,7 +60,7 @@ jobs:
asf-yaml-content: |
publish:
profile: ~
- whoami: main-site-pro
+ whoami: ${{ github.ref_name }}-out
subdir: content/logging-parent
- source-branch: ${{ inputs.source-branch }}
- target-branch: main-site-pro
+ source-branch: ${{ github.ref_name }}
+ target-branch: ${{ github.ref_name }}-out
(logging-parent) branch asf-staging deleted (was d34caf6)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-parent.git was d34caf6 Delete redundant `.asf.yaml` This change permanently discards the following revisions: discard d34caf6 Delete redundant `.asf.yaml` discard 69670c3 Didn't work, renaming `.asf.yaml` back to `_asf.yaml` discard dbd0fce Bringing back `.asf.yaml` one more time with the hope to fix the INFRA discard 78978d9 Disable staging site publication discard 8ac29f2 Remove Github config from site branch discard 547b3b7 Version `10.6.0` RC 1 discard 0d0aee7 Protect `asf-site` instead of `asf-staging` discard cb27e77 Replace HTML redirect with HTTP redirect discard 646fbbc Sync `.asf.yaml` file between branches discard 52a99b9 Add `logging-parent` version `10.5.0` (RC3) website discard 2b474fa Add `logging-parent` version `10.4.0` website discard 2240a7b Add `logging-parent` version `10.3.0` website discard f7d2d83 Sync website with `main` discard 3a92a31 Add `logging-parent` version `10.2.0` website discard fe3446b Add website-specific release instructions discard 5d224a1 Add release `10.1.1` website discard 31f28a5 Update `.asf.yaml` for `asf-site` discard 8143281 Update 10.x site discard 17d710b Updates for RC2 discard fd1b00e Brute-force website fix discard f4ad98f Update subdir to match main site discard 94daf97 Copy ASF.yaml from main branch discard b714f99 Rename `content` to `output` discard d03e7c0 Stage the website for the `10.1.0` release
(logging-parent) branch main-site-pro-out created (now 9903a84)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-pro-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git at 9903a84 Add `README.txt` This branch includes the following new commits: new 9903a84 Add `README.txt` The 1 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.
(logging-parent) branch main-site-pro updated: Dummy change to trigger CI
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-pro by this push: new 5792c8b Dummy change to trigger CI 5792c8b is described below commit 5792c8b7a637b0c777519b7f949889393052ef29 Author: Volkan Yazıcı AuthorDate: Thu Apr 11 15:19:37 2024 +0200 Dummy change to trigger CI --- .asf.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index eea32ea..7de06b9 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -35,5 +35,3 @@ github: protected_branches: main: required_signatures: true -asf-staging: - required_signatures: true
(logging-parent) branch main-site-pro updated (5792c8b -> 8b24146)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git discard 5792c8b Dummy change to trigger CI new 8b24146 Dummy change to trigger CI This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5792c8b) \ N -- N -- N refs/heads/main-site-pro (8b24146) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-parent) 01/01: Dummy change to trigger CI
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 8b24146fed058d217a6ee02499263c2626049daa Author: Volkan Yazıcı AuthorDate: Thu Apr 11 15:19:37 2024 +0200 Dummy change to trigger CI --- .asf.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index eea32ea..f835daf 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -31,9 +31,7 @@ github: features: issues: true - # Prevent force pushes to primary branches + # Prevent force pushes to primary branches: protected_branches: main: required_signatures: true -asf-staging: - required_signatures: true
(logging-parent) branch main-site-stg-out updated: Add website content generated from `5edf7285017cd227891c3a6b55df2f0d0215fe53`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new 679464e Add website content generated from `5edf7285017cd227891c3a6b55df2f0d0215fe53` 679464e is described below commit 679464e6ff21737e3914ef7ec53a7ebc3f62de7f Author: ASF Logging Services RM AuthorDate: Thu Apr 11 13:18:37 2024 + Add website content generated from `5edf7285017cd227891c3a6b55df2f0d0215fe53` --- sitemap.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sitemap.xml b/sitemap.xml index 935beac..a87b26b 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,26 +2,26 @@ http://www.sitemaps.org/schemas/sitemap/0.9;> https://logging.apache.org/logging-parent/features.html -2024-04-11T13:15:52.978Z +2024-04-11T13:18:35.635Z https://logging.apache.org/logging-parent/index.html -2024-04-11T13:15:52.978Z +2024-04-11T13:18:35.635Z https://logging.apache.org/logging-parent/release-instructions-project.html -2024-04-11T13:15:52.978Z +2024-04-11T13:18:35.635Z https://logging.apache.org/logging-parent/release-instructions-xml-schema.html -2024-04-11T13:15:52.978Z +2024-04-11T13:18:35.635Z https://logging.apache.org/logging-parent/release-notes.html -2024-04-11T13:15:52.978Z +2024-04-11T13:18:35.635Z https://logging.apache.org/logging-parent/usage.html -2024-04-11T13:15:52.978Z +2024-04-11T13:18:35.635Z
(logging-parent) branch main-site-stg-out updated: Add `.asf.yaml` along with an INFRA fix for the website content generated from `5edf7285017cd227891c3a6b55df2f0d0215fe53`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new ed1b500 Add `.asf.yaml` along with an INFRA fix for the website content generated from `5edf7285017cd227891c3a6b55df2f0d0215fe53` ed1b500 is described below commit ed1b500123c60645b71d0f4819c67b7930a36faa Author: ASF Logging Services RM AuthorDate: Thu Apr 11 13:18:37 2024 + Add `.asf.yaml` along with an INFRA fix for the website content generated from `5edf7285017cd227891c3a6b55df2f0d0215fe53` --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 465ff8b..21f6f39 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -9,6 +9,6 @@ staging: # # Random values to cause a change: # -# - Seed: 26812 -# - Commit ID: 5c9e8f84ce4a8a10f031cadcda79576549a5e3c7 -# - Timestamp: 2024-04-11T13:15:54Z +# - Seed: 254 +# - Commit ID: 5edf7285017cd227891c3a6b55df2f0d0215fe53 +# - Timestamp: 2024-04-11T13:18:37Z
(logging-log4j-samples) branch main updated (dd5790a -> 94cac78)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git from dd5790a Add custom configuration file to JLink example add 94cac78 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#126) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- .../.0.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j-samples) branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 updated (94f461f -> 94cac78)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git discard 94f461f Bump org.springframework:spring-framework-bom from 5.3.33 to 5.3.34 add 94cac78 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#126) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (94f461f) \ N -- N -- N refs/heads/dependabot/maven/org.springframework-spring-framework-bom-5.3.34 (94cac78) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../.0.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4j-samples) branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 deleted (was 94cac78)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git was 94cac78 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#126) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-jakarta) branch dependabot/maven/org.springframework-spring-framework-bom-6.1.6 created (now 0bd217b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-6.1.6 in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git at 0bd217b Bump org.springframework:spring-framework-bom from 6.1.5 to 6.1.6 No new revisions were added by this update.
(logging-log4j-samples) branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 created (now 94f461f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git at 94f461f Bump org.springframework:spring-framework-bom from 5.3.33 to 5.3.34 No new revisions were added by this update.
(logging-log4cxx) branch master updated: Add 'persist-credentials: false' to all Github checkout actions (#367)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git The following commit(s) were added to refs/heads/master by this push: new dc06736c Add 'persist-credentials: false' to all Github checkout actions (#367) dc06736c is described below commit dc06736cf71870608b51aa7b0aa4c97ab691812c Author: Stephen Webb AuthorDate: Fri Apr 12 14:32:00 2024 +1000 Add 'persist-credentials: false' to all Github checkout actions (#367) --- .github/workflows/abi-compatibility.yml | 1 + .github/workflows/log4cxx-cpp11.yml | 1 + .github/workflows/log4cxx-macos.yml | 1 + .github/workflows/log4cxx-ubuntu.yml | 1 + .github/workflows/log4cxx-windows-static.yml | 1 + .github/workflows/log4cxx-windows.yml| 1 + .github/workflows/package_code.yml | 1 + .github/workflows/sonarcloud.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index e323e660..5fbdecff 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -34,6 +34,7 @@ jobs: steps: - uses: actions/checkout@v2 with: +persist-credentials: false # do not persist auth token in the local git config path: main - name: 'Configure Dependencies - Ubuntu' diff --git a/.github/workflows/log4cxx-cpp11.yml b/.github/workflows/log4cxx-cpp11.yml index 23f97219..0474ca5f 100644 --- a/.github/workflows/log4cxx-cpp11.yml +++ b/.github/workflows/log4cxx-cpp11.yml @@ -24,6 +24,7 @@ jobs: steps: - uses: actions/checkout@v3 with: +persist-credentials: false # do not persist auth token in the local git config path: main - name: 'Configure Dependencies - Ubuntu' diff --git a/.github/workflows/log4cxx-macos.yml b/.github/workflows/log4cxx-macos.yml index 456a191a..2df58221 100644 --- a/.github/workflows/log4cxx-macos.yml +++ b/.github/workflows/log4cxx-macos.yml @@ -40,6 +40,7 @@ jobs: steps: - uses: actions/checkout@v3 with: +persist-credentials: false # do not persist auth token in the local git config path: main - name: 'configure and build' diff --git a/.github/workflows/log4cxx-ubuntu.yml b/.github/workflows/log4cxx-ubuntu.yml index be9e0225..7df025ba 100644 --- a/.github/workflows/log4cxx-ubuntu.yml +++ b/.github/workflows/log4cxx-ubuntu.yml @@ -62,6 +62,7 @@ jobs: steps: - uses: actions/checkout@v3 with: +persist-credentials: false # do not persist auth token in the local git config path: main - name: 'Configure Dependencies' diff --git a/.github/workflows/log4cxx-windows-static.yml b/.github/workflows/log4cxx-windows-static.yml index 009f28e1..2285daeb 100644 --- a/.github/workflows/log4cxx-windows-static.yml +++ b/.github/workflows/log4cxx-windows-static.yml @@ -34,6 +34,7 @@ jobs: steps: - uses: actions/checkout@v3 with: +persist-credentials: false # do not persist auth token in the local git config path: main - name: 'Restore Prebuilt Dependencies' diff --git a/.github/workflows/log4cxx-windows.yml b/.github/workflows/log4cxx-windows.yml index c942670b..38625ca6 100644 --- a/.github/workflows/log4cxx-windows.yml +++ b/.github/workflows/log4cxx-windows.yml @@ -34,6 +34,7 @@ jobs: steps: - uses: actions/checkout@v3 with: +persist-credentials: false # do not persist auth token in the local git config path: main - name: 'Restore Prebuilt Dependencies' diff --git a/.github/workflows/package_code.yml b/.github/workflows/package_code.yml index 31b48498..bfa1518a 100644 --- a/.github/workflows/package_code.yml +++ b/.github/workflows/package_code.yml @@ -33,6 +33,7 @@ jobs: steps: - uses: actions/checkout@v2 with: +persist-credentials: false # do not persist auth token in the local git config path: clean-checkout # Consider using CPack when it supports a white-list for included files diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 442deb09..41945fa5 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -34,6 +34,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + persist-credentials: false # do not persist auth token in the local git config fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis path: main
(logging-log4cxx) branch improve_security deleted (was 87fe67f9)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch improve_security in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git was 87fe67f9 Remove test commands The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4cxx) branch improve_security updated (432b1177 -> 69ac2644)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch improve_security in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from 432b1177 Add 'persist-credentials: false' to all Github checkout actions add 69ac2644 Test unspecified persist-credentials No new revisions were added by this update. Summary of changes: .github/workflows/abi-compatibility.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(logging-parent) branch asf-staging updated: Didn't work, renaming `.asf.yaml` back to `_asf.yaml`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/asf-staging by this push: new 69670c3 Didn't work, renaming `.asf.yaml` back to `_asf.yaml` 69670c3 is described below commit 69670c36f8d9746157841600887453954972fcc2 Author: Volkan Yazıcı AuthorDate: Thu Apr 11 08:52:15 2024 +0200 Didn't work, renaming `.asf.yaml` back to `_asf.yaml` --- _asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_asf.yaml b/_asf.yaml index 2290d0b..d4e3e54 100644 --- a/_asf.yaml +++ b/_asf.yaml @@ -24,5 +24,5 @@ publish: staging: profile: ~ - whoami: asf-staging + whoami: main-site-stg subdir: content/logging-parent
(logging-parent) branch asf-staging updated: Bringing back `.asf.yaml` one more time with the hope to fix the INFRA
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/asf-staging by this push: new dbd0fce Bringing back `.asf.yaml` one more time with the hope to fix the INFRA dbd0fce is described below commit dbd0fcebc1324bd1211d67ec30ba6fc84d75b5bb Author: Volkan Yazıcı AuthorDate: Thu Apr 11 08:49:31 2024 +0200 Bringing back `.asf.yaml` one more time with the hope to fix the INFRA --- .asf.yaml | 28 1 file changed, 28 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..d4e3e54 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,28 @@ +# +# 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. +# + +# `.asf.yaml` documentation: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features + +publish: + profile: ~ + whoami: asf-site + subdir: content/logging-parent + +staging: + profile: ~ + whoami: main-site-stg + subdir: content/logging-parent
(logging-log4cxx) branch improve_security updated (69ac2644 -> a43f4c89)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch improve_security in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from 69ac2644 Test unspecified persist-credentials add a43f4c89 Test persist-credentials : true No new revisions were added by this update. Summary of changes: .github/workflows/abi-compatibility.yml | 1 + 1 file changed, 1 insertion(+)
(logging-parent) branch main-site-stg updated: Add website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new 785f936 Add website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6` 785f936 is described below commit 785f936906c3527ac5981b658baaf16e4ec63105 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 07:17:58 2024 + Add website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6` --- .asf-infra-fix | 8 sitemap.xml| 12 ++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.asf-infra-fix b/.asf-infra-fix deleted file mode 100644 index bbe84f8..000 --- a/.asf-infra-fix +++ /dev/null @@ -1,8 +0,0 @@ -INFRA cannot handle change sets bigger than a certain size: https://the-asf.slack.com/archives/CBX4TSBQ8/p1709724983391709 -This file will be used to push a small commit to help the INFRA to recover. - -Random values to cause a change: - -- Seed: 4821 -- Commit ID: 3704738550608358a14ca2289fa1f874e931de21 -- Timestamp: 2024-04-10T14:55:45Z diff --git a/sitemap.xml b/sitemap.xml index 4b42780..4d2b8fb 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,26 +2,26 @@ http://www.sitemaps.org/schemas/sitemap/0.9;> https://logging.apache.org/logging-parent/features.html -2024-04-10T14:55:44.129Z +2024-04-11T07:17:57.473Z https://logging.apache.org/logging-parent/index.html -2024-04-10T14:55:44.129Z +2024-04-11T07:17:57.473Z https://logging.apache.org/logging-parent/release-instructions-project.html -2024-04-10T14:55:44.129Z +2024-04-11T07:17:57.473Z https://logging.apache.org/logging-parent/release-instructions-xml-schema.html -2024-04-10T14:55:44.129Z +2024-04-11T07:17:57.473Z https://logging.apache.org/logging-parent/release-notes.html -2024-04-10T14:55:44.129Z +2024-04-11T07:17:57.473Z https://logging.apache.org/logging-parent/usage.html -2024-04-10T14:55:44.129Z +2024-04-11T07:17:57.473Z
(logging-parent) branch main-site-stg updated: Add along with an INFRA fix for the website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new e7f9139 Add along with an INFRA fix for the website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6` e7f9139 is described below commit e7f913925be08eea63cd921c3ddf7940a57bf4cc Author: ASF Logging Services RM AuthorDate: Thu Apr 11 07:17:59 2024 + Add along with an INFRA fix for the website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6` --- .asf.yaml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..6c74c1d --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,14 @@ +staging: + profile: ~ + whoami: main-site-stg + subdir: content/logging-parent + + +# INFRA cannot handle change sets bigger than a certain size: https://the-asf.slack.com/archives/CBX4TSBQ8/p1709724983391709 +# This file will be used to push a small commit to help the INFRA to recover. +# +# Random values to cause a change: +# +# - Seed: 21616 +# - Commit ID: fa749e8f7684099d976df35cb2f7cd0a489db2e6 +# - Timestamp: 2024-04-11T07:17:59Z
(logging-log4cxx) branch improve_security updated (a43f4c89 -> 87fe67f9)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch improve_security in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from a43f4c89 Test persist-credentials : true add 87fe67f9 Remove test commands No new revisions were added by this update. Summary of changes: .github/workflows/abi-compatibility.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
(logging-parent) branch main updated: Add `deploy-site-pro.yaml` workflow
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
The following commit(s) were added to refs/heads/main by this push:
new 1b1a58c Add `deploy-site-pro.yaml` workflow
1b1a58c is described below
commit 1b1a58ca69a439d4e38ac41a9853a6581b81b9ba
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 09:48:57 2024 +0200
Add `deploy-site-pro.yaml` workflow
---
.github/workflows/deploy-site-pro.yaml | 49 +
.github/workflows/deploy-site-reusable.yaml | 2 +-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/deploy-site-pro.yaml
b/.github/workflows/deploy-site-pro.yaml
new file mode 100644
index 000..70fca46
--- /dev/null
+++ b/.github/workflows/deploy-site-pro.yaml
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+name: deploy-site-pro
+
+on:
+ workflow_dispatch:
+inputs:
+ source-branch:
+description: The branch, tag, or SHA to checkout and run the Maven
`site` goal on.
+required: true
+type: string
+
+permissions: read-all
+
+jobs:
+
+ deploy-site-pro:
+needs: build
+if: github.repository == 'apache/logging-parent'
+uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
+# Secrets for committing the generated site
+secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+# Write permissions for committing the generated site
+permissions:
+ contents: write
+with:
+ asf-yaml-content: |
+publish:
+ profile: ~
+ whoami: main-site-pro
+ subdir: content/logging-parent
+ source-branch: ${{ inputs.source-branch }}
+ target-branch: main-site-pro
diff --git a/.github/workflows/deploy-site-reusable.yaml
b/.github/workflows/deploy-site-reusable.yaml
index 4225189..1626a70 100644
--- a/.github/workflows/deploy-site-reusable.yaml
+++ b/.github/workflows/deploy-site-reusable.yaml
@@ -34,7 +34,7 @@ on:
type: boolean
source-branch:
description: |
- The branch, tag or SHA to checkout and run the Maven `site` goal on.
+ The branch, tag, or SHA to checkout and run the Maven `site` goal on.
When checking out the repository that triggered a workflow, this
defaults to the reference or SHA for that event.
Otherwise, the default branch of the repository will be used.
default: ""
(logging-parent) 01/01: Add `README.txt`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit c1a2a6b483f8d626958c077f737bf5520c5d5ac2 Author: Volkan Yazıcı AuthorDate: Wed Apr 10 11:31:19 2024 +0200 Add `README.txt` --- README.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/README.txt b/README.txt new file mode 100644 index 000..1dd210f --- /dev/null +++ b/README.txt @@ -0,0 +1 @@ +An orphan branch to host auto-generated production website content
(logging-parent) branch main-site-pro created (now c1a2a6b)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git at c1a2a6b Add `README.txt` This branch includes the following new commits: new c1a2a6b Add `README.txt` The 1 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.
(logging-parent) branch main-site-pro updated: Add website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-pro by this push: new 6ba3667 Add website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` 6ba3667 is described below commit 6ba36675c976a24d77f7820164d5a17a55b8342e Author: ASF Logging Services RM AuthorDate: Thu Apr 11 08:33:51 2024 + Add website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` --- README.txt |1 - index.html | 1738 2 files changed, 1738 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt deleted file mode 100644 index 1dd210f..000 --- a/README.txt +++ /dev/null @@ -1 +0,0 @@ -An orphan branch to host auto-generated production website content diff --git a/index.html b/index.html new file mode 100644 index 000..063f703 --- /dev/null +++ b/index.html @@ -0,0 +1,1738 @@ + + + + + + + +Logging Parent +https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700;> + +/*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ +/* Uncomment the following line when using as a custom stylesheet */ +/* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";; */ +html{font-family:sans-serif;-webkit-text-size-adjust:100%} +a{background:none} +a:focus{outline:thin dotted} +a:active,a:hover{outline:0} +h1{font-size:2em;margin:.67em 0} +b,strong{font-weight:bold} +abbr{font-size:.9em} +abbr[title]{cursor:help;border-bottom:1px dotted #df;text-decoration:none} +dfn{font-style:italic} +hr{height:0} +mark{background:#ff0;color:#000} +code,kbd,pre,samp{font-family:monospace;font-size:1em} +pre{white-space:pre-wrap} +q{quotes:"\201C" "\201D" "\2018" "\2019"} +small{font-size:80%} +sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} +sup{top:-.5em} +sub{bottom:-.25em} +img{border:0} +svg:not(:root){overflow:hidden} +figure{margin:0} +audio,video{display:inline-block} +audio:not([controls]){display:none;height:0} +fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} +legend{border:0;padding:0} +button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} +button,input{line-height:normal} +button,select{text-transform:none} +button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer} +button[disabled],html input[disabled]{cursor:default} +input[type=checkbox],input[type=radio]{padding:0} +button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} +textarea{overflow:auto;vertical-align:top} +table{border-collapse:collapse;border-spacing:0} +*,::before,::after{box-sizing:border-box} +html,body{font-size:100%} +body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased} +a:hover{cursor:pointer} +img,object,embed{max-width:100%;height:auto} +object,embed{height:100%} +img{-ms-interpolation-mode:bicubic} +.left{float:left!important} +.right{float:right!important} +.text-left{text-align:left!important} +.text-right{text-align:right!important} +.text-center{text-align:center!important} +.text-justify{text-align:justify!important} +.hide{display:none} +img,object,svg{display:inline-block;vertical-align:middle} +textarea{height:auto;min-height:50px} +select{width:100%} +.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em} +div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0} +a{color:#2156a5;text-decoration:underline;line-height:inherit} +a:hover,a:focus{color:#1d4b8f} +a img{border:0} +p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} +p aside{font-size:.875em;line-height:1.35;font-style:italic}
(logging-parent) branch main-site-pro updated: Add along with an INFRA fix for the website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-pro by this push: new 0bddcdc Add along with an INFRA fix for the website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` 0bddcdc is described below commit 0bddcdc9e8923788a02e3d22102412d9d8597210 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 08:33:51 2024 + Add along with an INFRA fix for the website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` --- .asf.yaml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..bb925be --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,14 @@ +publish: + profile: ~ + whoami: main-site-pro + subdir: content/logging-parent + + +# INFRA cannot handle change sets bigger than a certain size: https://the-asf.slack.com/archives/CBX4TSBQ8/p1709724983391709 +# This file will be used to push a small commit to help the INFRA to recover. +# +# Random values to cause a change: +# +# - Seed: 18962 +# - Commit ID: 64ae84e05803f3ab6d4201512b00f1cb1c4051e8 +# - Timestamp: 2024-04-11T08:33:51Z
(logging-parent) branch main updated: Fix workflow dependency problem
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 The following commit(s) were added to refs/heads/main by this push: new 68829de Fix workflow dependency problem 68829de is described below commit 68829de27b1cd84cfd6fdd735dd36300f597a42f Author: Volkan Yazıcı AuthorDate: Thu Apr 11 10:32:50 2024 +0200 Fix workflow dependency problem --- .github/workflows/deploy-site-pro.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-site-pro.yaml b/.github/workflows/deploy-site-pro.yaml index 70fca46..4b7771f 100644 --- a/.github/workflows/deploy-site-pro.yaml +++ b/.github/workflows/deploy-site-pro.yaml @@ -30,7 +30,6 @@ permissions: read-all jobs: deploy-site-pro: -needs: build if: github.repository == 'apache/logging-parent' uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main # Secrets for committing the generated site
(logging-parent) 02/02: Support `.asf.yaml` customization in `deploy-site-reusable.yaml`
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 fa749e8f7684099d976df35cb2f7cd0a489db2e6
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 09:15:32 2024 +0200
Support `.asf.yaml` customization in `deploy-site-reusable.yaml`
---
.github/workflows/build.yaml| 5 +++
.github/workflows/deploy-site-reusable.yaml | 49 +
2 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4d6c343..9e5b1f6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -59,6 +59,11 @@ jobs:
permissions:
contents: write
with:
+ asf-yaml-content: |
+staging:
+ profile: ~
+ whoami: main-site-stg
+ subdir: content/logging-parent
target-branch: main-site-stg
deploy-snapshot:
diff --git a/.github/workflows/deploy-site-reusable.yaml
b/.github/workflows/deploy-site-reusable.yaml
index 0f80326..4225189 100644
--- a/.github/workflows/deploy-site-reusable.yaml
+++ b/.github/workflows/deploy-site-reusable.yaml
@@ -20,6 +20,10 @@ name: deploy-site-reusable
on:
workflow_call:
inputs:
+ asf-yaml-content:
+description: The contents of the `.asf.yaml` that will be created
+required: true
+type: string
java-version:
description: The Java compiler version
default: 17
@@ -124,11 +128,11 @@ jobs:
shell: bash
env:
TARGET_PATH: ${{ inputs.target-path }}
+ ASF_YAML_CONTENT: ${{ inputs.asf-yaml-content }}
run: |
- # Check if there exist an INFRA fix file
- INFRA_FIX_FILENAME=".asf-infra-fix"
- INFRA_FIX_FILE_EXISTS=$([ -f "$INFRA_FIX_FILENAME" ] && echo "true"
|| echo "false")
+ # Check if there already exists an `.asf.yaml`
+ ASF_YAML_EXISTS=$([ -f .asf.yaml ] && echo "true" || echo "false")
# Clean up the target path
if [ "." = "$TARGET_PATH" ]; then
@@ -141,10 +145,11 @@ jobs:
unzip /tmp/site.zip -d "$TARGET_PATH"
git add "$TARGET_PATH"
- # Recover INFRA fix file, if there was one.
+ # Recover `.asf.yaml`, if there was one.
# Otherwise `git status` will always show a change even when there
are no changes in the website content.
- if [ "$INFRA_FIX_FILE_EXISTS" = "true" ]; then
-git checkout HEAD "$INFRA_FIX_FILENAME"
+ # That is because we always populate `.asf.yaml` with some random
values at the end to fix an INFRA issue.
+ if [ "$ASF_YAML_EXISTS" = "true" ]; then
+git checkout HEAD .asf.yaml
fi
# Commit changes, if there are any
@@ -154,24 +159,28 @@ jobs:
git config user.name "ASF Logging Services RM"
git config user.email priv...@logging.apache.org
-# Commit site changes
+# Commit & push site changes
git commit -S -a -m "Add website content generated from
\`$SOURCE_COMMIT_ID\`"
+git push -f origin
-# INFRA fix
-cat >"$INFRA_FIX_FILENAME" .asf.yaml
(logging-parent) 01/02: Remove incorrect `staging:` entry from `.asf.yaml`
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 3f4b0d0a51583b0ac414bc01e31f8c1a61a55abd Author: Volkan Yazıcı AuthorDate: Thu Apr 11 09:05:23 2024 +0200 Remove incorrect `staging:` entry from `.asf.yaml` --- .asf.yaml | 5 - 1 file changed, 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 791f865..665bc95 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -36,8 +36,3 @@ github: required_signatures: true asf-site: required_signatures: true - -staging: - profile: ~ - whoami: main-site-stg - subdir: content/logging-parent
(logging-parent) branch main updated (3704738 -> fa749e8)
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 3704738 Import the GPG private key in `deploy-site-reusable.yaml` new 3f4b0d0 Remove incorrect `staging:` entry from `.asf.yaml` new fa749e8 Support `.asf.yaml` customization in `deploy-site-reusable.yaml` 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: .asf.yaml | 5 --- .github/workflows/build.yaml| 5 +++ .github/workflows/deploy-site-reusable.yaml | 49 + 3 files changed, 34 insertions(+), 25 deletions(-)
(logging-parent) branch main-site-stg updated: Add website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new 97ca32b Add website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f` 97ca32b is described below commit 97ca32bc33cf3ade2b88472199b009b615160519 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 08:34:59 2024 + Add website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f` --- sitemap.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sitemap.xml b/sitemap.xml index af0a750..fcc87f4 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,26 +2,26 @@ http://www.sitemaps.org/schemas/sitemap/0.9;> https://logging.apache.org/logging-parent/features.html -2024-04-11T07:53:57.647Z +2024-04-11T08:34:58.443Z https://logging.apache.org/logging-parent/index.html -2024-04-11T07:53:57.647Z +2024-04-11T08:34:58.443Z https://logging.apache.org/logging-parent/release-instructions-project.html -2024-04-11T07:53:57.647Z +2024-04-11T08:34:58.443Z https://logging.apache.org/logging-parent/release-instructions-xml-schema.html -2024-04-11T07:53:57.647Z +2024-04-11T08:34:58.443Z https://logging.apache.org/logging-parent/release-notes.html -2024-04-11T07:53:57.647Z +2024-04-11T08:34:58.443Z https://logging.apache.org/logging-parent/usage.html -2024-04-11T07:53:57.647Z +2024-04-11T08:34:58.443Z
(logging-parent) branch main-site-stg updated: Add along with an INFRA fix for the website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new 4ce1673 Add along with an INFRA fix for the website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f` 4ce1673 is described below commit 4ce167389ddb2f9fe4982105106aa2688e9383ef Author: ASF Logging Services RM AuthorDate: Thu Apr 11 08:35:00 2024 + Add along with an INFRA fix for the website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f` --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 5fc0747..7c830ce 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -9,6 +9,6 @@ staging: # # Random values to cause a change: # -# - Seed: 16629 -# - Commit ID: 1b1a58ca69a439d4e38ac41a9853a6581b81b9ba -# - Timestamp: 2024-04-11T07:53:59Z +# - Seed: 3897 +# - Commit ID: 68829de27b1cd84cfd6fdd735dd36300f597a42f +# - Timestamp: 2024-04-11T08:35:00Z
(logging-parent) branch asf-staging updated: Delete redundant `.asf.yaml`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/asf-staging by this push: new d34caf6 Delete redundant `.asf.yaml` d34caf6 is described below commit d34caf604b03935344f09084bbec44f069c369cf Author: Volkan Yazıcı AuthorDate: Thu Apr 11 09:43:59 2024 +0200 Delete redundant `.asf.yaml` --- .asf.yaml | 28 1 file changed, 28 deletions(-) diff --git a/.asf.yaml b/.asf.yaml deleted file mode 100644 index d4e3e54..000 --- a/.asf.yaml +++ /dev/null @@ -1,28 +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. -# - -# `.asf.yaml` documentation: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features - -publish: - profile: ~ - whoami: asf-site - subdir: content/logging-parent - -staging: - profile: ~ - whoami: main-site-stg - subdir: content/logging-parent
(logging-parent) branch main-site-stg updated: Add along with an INFRA fix for the website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new e5e0ef6 Add along with an INFRA fix for the website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba` e5e0ef6 is described below commit e5e0ef6fb3805735e99424aadbc3cf8c1cacdde6 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 07:53:59 2024 + Add along with an INFRA fix for the website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba` --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 6c74c1d..5fc0747 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -9,6 +9,6 @@ staging: # # Random values to cause a change: # -# - Seed: 21616 -# - Commit ID: fa749e8f7684099d976df35cb2f7cd0a489db2e6 -# - Timestamp: 2024-04-11T07:17:59Z +# - Seed: 16629 +# - Commit ID: 1b1a58ca69a439d4e38ac41a9853a6581b81b9ba +# - Timestamp: 2024-04-11T07:53:59Z
(logging-parent) branch main-site-stg updated: Add website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new 8bfaea7 Add website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba` 8bfaea7 is described below commit 8bfaea72c494196753127d0450f45dc2b9b3f834 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 07:53:58 2024 + Add website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba` --- sitemap.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sitemap.xml b/sitemap.xml index 4d2b8fb..af0a750 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,26 +2,26 @@ http://www.sitemaps.org/schemas/sitemap/0.9;> https://logging.apache.org/logging-parent/features.html -2024-04-11T07:17:57.473Z +2024-04-11T07:53:57.647Z https://logging.apache.org/logging-parent/index.html -2024-04-11T07:17:57.473Z +2024-04-11T07:53:57.647Z https://logging.apache.org/logging-parent/release-instructions-project.html -2024-04-11T07:17:57.473Z +2024-04-11T07:53:57.647Z https://logging.apache.org/logging-parent/release-instructions-xml-schema.html -2024-04-11T07:17:57.473Z +2024-04-11T07:53:57.647Z https://logging.apache.org/logging-parent/release-notes.html -2024-04-11T07:17:57.473Z +2024-04-11T07:53:57.647Z https://logging.apache.org/logging-parent/usage.html -2024-04-11T07:17:57.473Z +2024-04-11T07:53:57.647Z
(logging-parent) branch main updated: Update release instructions on website deployment
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
The following commit(s) were added to refs/heads/main by this push:
new ec65a41 Update release instructions on website deployment
ec65a41 is described below
commit ec65a41b4f95df26a9625e246eacb10a11bfd4a9
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 12:45:46 2024 +0200
Update release instructions on website deployment
---
src/site/antora/modules/ROOT/pages/features.adoc | 3 +
.../ROOT/pages/release-instructions-project.adoc | 95 +-
2 files changed, 24 insertions(+), 74 deletions(-)
diff --git a/src/site/antora/modules/ROOT/pages/features.adoc
b/src/site/antora/modules/ROOT/pages/features.adoc
index b04088a..196c719 100644
--- a/src/site/antora/modules/ROOT/pages/features.adoc
+++ b/src/site/antora/modules/ROOT/pages/features.adoc
@@ -55,6 +55,9 @@ The provided reusable GitHub Actions workflows feature the
following convenience
* Compiles against Java 8 bytecode using the specified Java compiler version
* Verifies reproducibility
+`deploy-site-reusable.yaml`::
+* Builds and deploys the website
+
`deploy-snapshot-reusable.yaml`::
* Deploys SNAPSHOT artifacts
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 2186c53..f4b1f02 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -37,12 +37,24 @@ You need to adapt these values for your project and version
accordingly.
[#stage-release]
== Stage the release
-. Create and push the release branch:
+. Create the release branch:
+
[source,bash]
git fetch -p
git checkout -B release/7.8.0 origin/main
+
+
+. Prepare sources for the release:
+.. Update the `revision` property in `pom.xml`
+.. Release the changelog: `./mvnw -N changelog-release`
+.. Edit the release notes (i.e., `src/changelog/7.8.0/.release-notes.adoc.ftl`)
+
+. Commit & push your changes:
++
+[source,bash]
+
+git commit -a -m 'Prepare to release `7.8.0`'
git push origin release/7.8.0
+
@@ -53,50 +65,16 @@ You can iterate on the `release/7.8.0` branch to perfect it.
. Verify that the associated {project-github-url}/actions[GitHub Actions
workflow] succeeds:
-.. `revision` property in `pom.xml` is updated
-.. Changelog is released (i.e., `src/changelog/7.8.0` folder is populated)
+.. The `project.build.outputTimestamp` property in `pom.xml` is updated
.. *Signed artifacts* are uploaded to the _Staging Repositories_ in
https://repository.apache.org/[repository.apache.org]
.. *Signed distribution and its checksum* (e.g.,
`apache-{project-id}-7.8.0-{bin,src}.{zip,.zip.asc,.zip.sha512}`) are uploaded
to
https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}/7.8.0]
Subversion repository (along with auxiliary files; website, email texts, etc.)
+.. {website-url-staging}[The project **staging** website] is deployed
+
If not, commit necessary fixes, push, and repeat.
. _Close_ the repository in
https://repository.apache.org/[repository.apache.org] using a self-explanatory
description, e.g., ``\`{project-id}` version \`7.8.0` RC1``
-[#stage-release-website]
-== Stage the release website
-
-[NOTE]
-
-You can skip this step if the project does not have a website.
-
-
-. Checkout the `asf-staging` branch of {website-github-url}[the website
repository]
-. Override the contents of the `{website-folder}7.x` folder using the website
uploaded to the
https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}]
Subversion repository
-
-These steps can be summarized as follows in shell:
-
-[source,bash,subs="+attributes"]
-
-# Clone repositories (unless you already have them!)
-svn co https://dist.apache.org/repos/dist/dev/logging logging-dist-dev
-git clone {website-github-url} {website-github-repository-name}
-
-# Checkout the branch
-cd {website-github-repository-name}
-git checkout -B asf-staging origin/asf-staging
-
-# Override the website
-git rm -rf {website-folder}7.x
-mkdir {website-folder}7.x
-unzip ../logging-dist-dev/{project-id}/7.8.0/*-site.zip -d {website-folder}7.x
-git add {website-folder}7.x
-git commit -a -m 'Add `{project-id}` version `7.8.0` website'
-git push origin asf-staging
-
-
-Changes should be visible in {website-url-staging}[the project **staging**
website].
-
[#vote-release]
== Vote the release
@@ -207,43 +185,12 @@ svn commit -m 'Remove `{project-id}` version `7.8.0`
files released'
[#publish-release-github]
=== In GitHub
-{project-github-url}/releases/new[Create a new release in GitHub]
-
-. Use the `rel/7.8.0` tag
-. Copy release notes from the generated
(logging-parent) branch main updated: Don't skip `build` on `*.adoc` changes
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 The following commit(s) were added to refs/heads/main by this push: new f6f91f2 Don't skip `build` on `*.adoc` changes f6f91f2 is described below commit f6f91f2974471e58599520f3aca97a9651c0f3c0 Author: Volkan Yazıcı AuthorDate: Thu Apr 11 12:47:33 2024 +0200 Don't skip `build` on `*.adoc` changes --- .github/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9e5b1f6..a98a6ea 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,12 +23,10 @@ on: - "main" - "release/*" paths-ignore: - - "**.adoc" - "**.md" - "**.txt" pull_request: paths-ignore: - - "**.adoc" - "**.md" - "**.txt"
(logging-log4j2) branch dependabot/maven/main/spring-framework.version-6.1.6 created (now 1db697c78c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/spring-framework.version-6.1.6 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 1db697c78c Bump spring-framework.version from 6.1.5 to 6.1.6 No new revisions were added by this update.
(logging-parent) branch main-site-stg updated: Add along with an INFRA fix for the website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main-site-stg by this push: new cf912df Add along with an INFRA fix for the website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0` cf912df is described below commit cf912dfbfb9b73a1758697c93efe737f6ca75939 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 10:50:03 2024 + Add along with an INFRA fix for the website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0` --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 7c830ce..bef27b7 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -9,6 +9,6 @@ staging: # # Random values to cause a change: # -# - Seed: 3897 -# - Commit ID: 68829de27b1cd84cfd6fdd735dd36300f597a42f -# - Timestamp: 2024-04-11T08:35:00Z +# - Seed: 12980 +# - Commit ID: f6f91f2974471e58599520f3aca97a9651c0f3c0 +# - Timestamp: 2024-04-11T10:50:03Z
(logging-parent) branch main-site-stg updated: Add website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main-site-stg
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main-site-stg by this push:
new 93a98a2 Add website content generated from
`f6f91f2974471e58599520f3aca97a9651c0f3c0`
93a98a2 is described below
commit 93a98a2f69ef259f48aa00db83c91bcb4d2f8f07
Author: ASF Logging Services RM
AuthorDate: Thu Apr 11 10:50:03 2024 +
Add website content generated from
`f6f91f2974471e58599520f3aca97a9651c0f3c0`
---
features.html | 10 +++
release-instructions-project.html | 154 +++---
sitemap.xml | 12 +--
3 files changed, 60 insertions(+), 116 deletions(-)
diff --git a/features.html b/features.html
index 0a23edf..c250957 100644
--- a/features.html
+++ b/features.html
@@ -168,6 +168,16 @@ This VDR is accessible through the following URL: https://logging.apach
+deploy-site-reusable.yaml
+
+
+
+
+Builds and deploys the website
+
+
+
+
deploy-snapshot-reusable.yaml
diff --git a/release-instructions-project.html
b/release-instructions-project.html
index d16bdb4..0cb9a58 100644
--- a/release-instructions-project.html
+++ b/release-instructions-project.html
@@ -121,11 +121,35 @@ You need to adapt these values for your project and
version accordingly.
-Create and push the release branch:
+Create the release branch:
git fetch -p
-git checkout -B release/7.8.0 origin/main
+git checkout -B release/7.8.0 origin/main
+
+
+
+
+Prepare sources for the release:
+
+
+
+Update the revision property in pom.xml
+
+
+Release the changelog: ./mvnw -N changelog-release
+
+
+Edit the release notes (i.e.,
src/changelog/7.8.0/.release-notes.adoc.ftl)
+
+
+
+
+
+Commit push your changes:
+
+
+git commit -a -m 'Prepare to release `7.8.0`'
git push origin release/7.8.0
@@ -150,10 +174,7 @@ You can iterate on the release/7.8.0 branch
to perfect it.
-revision property in pom.xml is updated
-
-
-Changelog is released (i.e., src/changelog/7.8.0 folder is
populated)
+The project.build.outputTimestamp property in
pom.xml is updated
Signed artifacts are uploaded to the Staging
Repositories in https://repository.apache.org/;>repository.apache.org
@@ -161,6 +182,9 @@ You can iterate on the release/7.8.0 branch to
perfect it.
Signed distribution and its checksum (e.g.,
apache-logging-parent-7.8.0-{bin,src}.{zip,.zip.asc,.zip.sha512})
are uploaded to https://dist.apache.org/repos/dist/dev/logging/logging-parent;>dist.apache.org/repos/dist/dev/logging/logging-parent/7.8.0
Subversion repository (along with auxiliary files; website, email texts,
etc.)
+
+https://logging.staged.apache.org/logging-parent;>The project
staging website is deployed
+
@@ -175,60 +199,6 @@ You can iterate on the release/7.8.0 branch
to perfect it.
-Stage the release website
-
-
-
-
-
-
-
-
-
-You can skip this step if the project does not have a website.
-
-
-
-
-
-
-
-
-Checkout the asf-staging branch of https://github.com/apache/logging-parent;>the website repository
-
-
-Override the contents of the 7.x folder using the website
uploaded to the https://dist.apache.org/repos/dist/dev/logging/logging-parent;>dist.apache.org/repos/dist/dev/logging/logging-parent
Subversion repository
-
-
-
-
-These steps can be summarized as follows in shell:
-
-
-
-# Clone repositories (unless you already have them!)
-svn co https://dist.apache.org/repos/dist/dev/logging logging-dist-dev
-git clone https://github.com/apache/logging-parent logging-parent
-
-# Checkout the branch
-cd logging-parent
-git checkout -B asf-staging origin/asf-staging
-
-# Override the website
-git rm -rf 7.x
-mkdir 7.x
-unzip ../logging-dist-dev/logging-parent/7.8.0/*-site.zip -d 7.x
-git add 7.x
-git commit -a -m 'Add `logging-parent` version `7.8.0` website'
-git push origin asf-staging
-
-
-
-Changes should be visible in https://logging.staged.apache.org/logging-parent;>the project
staging website.
-
-
-
-
Vote the
release
@@ -418,72 +388,36 @@ svn commit -m 'Remove `logging-parent` version `7.8.0`
files released'
In GitHub
-
-https://github.com/apache/logging-parent/releases/new;>Create a
new release in GitHub
-
+Run the https://github.com/apache/logging-parent/actions/workflows/deploy-site-pro.yaml;>deploy-site-pro
GitHub Actions workflow:
+
+
+
Use the rel/7.8.0 tag
-Copy release notes from the generated emails
+Verify that https://logging.apache.org/logging-parent;>the project
website is updated
-
-
-
-
-Publish the release website
-
-
-
-
-
-
-
-
-
-You can skip this step if the project does not have a website.
-
-
-
-
-
-
-
+
+
+https://github.com/apache/logging-parent/releases/new;>Create a
new release in GitHub
+
+
-Checkout the asf-site branch of https://github.com/apache/logging-parent;>the website repository
+Use the rel/7.8.0 tag
(logging-log4j2) branch doc/installation updated (d1661830c1 -> 24559e342b)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch doc/installation in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard d1661830c1 Add installation documentation new 24559e342b Add installation documentation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d1661830c1) \ N -- N -- N refs/heads/doc/installation (24559e342b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: src/site/antora/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/manual/_installation.adoc | 34 -- .../modules/ROOT/pages/manual/installation.adoc| 455 + 3 files changed, 456 insertions(+), 34 deletions(-) delete mode 100644 src/site/antora/modules/ROOT/pages/manual/_installation.adoc create mode 100644 src/site/antora/modules/ROOT/pages/manual/installation.adoc
(logging-log4j2) 01/01: Add installation documentation
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch doc/installation
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 24559e342b4e4edc636a3fd13f7d8b6c5382242b
Author: Piotr P. Karwasz
AuthorDate: Tue Apr 9 09:11:00 2024 +0200
Add installation documentation
---
src/site/antora/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/manual/installation.adoc| 455 +
2 files changed, 456 insertions(+)
diff --git a/src/site/antora/modules/ROOT/nav.adoc
b/src/site/antora/modules/ROOT/nav.adoc
index 8ad7f0a6f8..7ed6d0aca0 100644
--- a/src/site/antora/modules/ROOT/nav.adoc
+++ b/src/site/antora/modules/ROOT/nav.adoc
@@ -24,6 +24,7 @@
.Learn
* xref:manual/index.adoc[]
+** xref:manual/installation.adoc[]
** xref:manual/architecture.adoc[]
** xref:manual/migration.adoc[]
** xref:manual/api.adoc[]
diff --git a/src/site/antora/modules/ROOT/pages/manual/installation.adoc
b/src/site/antora/modules/ROOT/pages/manual/installation.adoc
new file mode 100644
index 00..631c4c9acb
--- /dev/null
+++ b/src/site/antora/modules/ROOT/pages/manual/installation.adoc
@@ -0,0 +1,455 @@
+= Installing Apache Log4j
+
+:logback-version: 1.5.12
+:slf4j-version: 2.0.12
+
+Similarly to https://www.qos.ch/[QOS.CH SLF4J/Logback], Apache Log4j 3.x
features a separation between a logging API and multiple logging
implementations:
+
+* the logging API is directly used in your code or by your dependencies,
+* logging implementations are only required at runtime and can be changed
without the need to recompile your software.
+
+That is why the proper way to install Apache Log4j depends on the kind of
software you are writing:
+
+* **Libraries** only require Log4j API and delegate the choice of the
implementation to applications.
+If a logging implementation is required by tests, it should be in the
appropriate "test" scope.
+
+* **Applications** need Log4j API for their own code, but also an
implementation of each of the major Java logging APIs to support log statements
from the libraries they use.
+
+== Installing Log4j API
+
+The easiest way to install Log4j API is through a dependency management tool
such as Maven or Gradle, by adding the following dependency:
+
+[tabs]
+
+Maven::
++
+[source,xml,subs="+attributes"]
+
+
+org.apache.logging.log4j
+log4j-api
+{log4j-api-version}
+
+
+
+Gradle::
++
+[source,groovy,subs="+attributes"]
+
+implementation 'org.apache.logging.log4j:log4j-api:{log4j-api-version}'
+
+
+
+== Installing a logging implementation
+
+The Apache Log4j project maintains **three** different implementations of
Log4j API:
+
+* the reference implementation known as **Log4j Core**.
+Refer to <> for the installation procedure.
+* the `log4j-to-slf4j` implementation that delegates logging to an SLF4J
implementation.
+Since currently only
+https://logback.qos.ch/[Logback] implements SLF4J natively, refer to
<> for the installation procedure.
+* the `log4j-to-jul` implementation that delegates logging to
`java.util.logging`.
+See <> for the installation procedure.
+
+Applications developers should also consider installing the appropriate
bridges from the most commonly used logging APIs (Log4j API, SLF4J and
`java.util.logging`) to the chosen implementation.
+
+NOTE:: In order to ensure that your code does not directly depend on a
particular logging implementation, the logging backend should be put in the
appropriate scope of your dependency manager:
++
+* application developers should use `runtime` if they use Maven or
`runtimeOnly` if they use Gradle,
+* library developers should use `test` if they use Maven or `testRuntimeOnly`
if they use Gradle.
+
+[#installation-installing-log4j-core]
+=== Installing Log4j Core
+
+To install Log4j Core as logging implementation, you need to add the following
dependencies to your application:
+
+[tabs]
+
+Maven::
++
+[source,xml,subs="+attributes"]
+
+
+
+org.apache.logging.log4j
+log4j-core
+{log4j-core-version}
+runtime
+
+
+org.apache.logging.log4j
+log4j-jul
+{log4j-api-version}
+runtime
+
+
+org.apache.logging.log4j
+log4j-slf4j2-impl
+{log4j-api-version}
+runtime
+
+...
+
+
+
+Gradle::
++
+[source,groovy,subs="+attributes"]
+
+runtimeOnly 'org.apache.logging.log4j:log4j-core:{log4j-core-version}'
+runtimeOnly 'org.apache.logging.log4j:log4j-jul:{log4j-api-version}'
+runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:{log4j-api-version}'
+
+
+
+In order to activate the bridge from JUL to Log4j API, you also need to add:
+
+
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
+
+
+to the JVM parameters in your application launcher.
+
+NOTE:: **Spring Boot** users should use the `spring-boot-starter-log4j2`
starter and replace the
(logging-log4j2) branch dependabot/maven/2.x/spring-framework.version-5.3.34 created (now 3436b27826)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/spring-framework.version-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 3436b27826 Bump spring-framework.version from 5.3.33 to 5.3.34 No new revisions were added by this update.
(logging-log4j2) branch dependabot/maven/main/spring-framework.version-6.1.6 deleted (was cbcecac82a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/spring-framework.version-6.1.6 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was cbcecac82a Update `org.springframework:spring-framework-bom` to version `6.1.6` (#2465) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated (b9dd641bd1 -> cbcecac82a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from b9dd641bd1 Correct timezone for Raman Gupta (#2463) add cbcecac82a Update `org.springframework:spring-framework-bom` to version `6.1.6` (#2465) No new revisions were added by this update. Summary of changes: log4j-spring-cloud-config-client/pom.xml | 2 +- .../.3.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j2) branch dependabot/maven/main/spring-framework.version-6.1.6 updated (1db697c78c -> cbcecac82a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/spring-framework.version-6.1.6 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 1db697c78c Bump spring-framework.version from 6.1.5 to 6.1.6 add cbcecac82a Update `org.springframework:spring-framework-bom` to version `6.1.6` (#2465) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1db697c78c) \ N -- N -- N refs/heads/dependabot/maven/main/spring-framework.version-6.1.6 (cbcecac82a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../.3.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4j-audit-sample) branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 created (now 129c5fd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git at 129c5fd Bump org.springframework:spring-framework-bom from 5.3.33 to 5.3.34 No new revisions were added by this update.
(logging-log4j-audit-sample) branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 updated (129c5fd -> 1d53fc5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git discard 129c5fd Bump org.springframework:spring-framework-bom from 5.3.33 to 5.3.34 add 1d53fc5 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#44) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (129c5fd) \ N -- N -- N refs/heads/dependabot/maven/org.springframework-spring-framework-bom-5.3.34 (1d53fc5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(logging-log4j-audit-sample) branch master updated (bb2a095 -> 1d53fc5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git from bb2a095 Update `org.springframework:spring-framework-bom` to version `5.3.33` (#43) add 1d53fc5 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#44) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j-audit-sample) branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 deleted (was 1d53fc5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git was 1d53fc5 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#44) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated (cbcecac82a -> 9e90b1713c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from cbcecac82a Update `org.springframework:spring-framework-bom` to version `6.1.6` (#2465) add 9e90b1713c Update `commons-io:commons-io` to version `2.16.1` (#2456) No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml | 2 +- src/changelog/.3.x.x/update_commons_io_commons_io.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j2) branch dependabot/maven/main/commons-io-commons-io-2.16.1 deleted (was 9e90b1713c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/commons-io-commons-io-2.16.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 9e90b1713c Update `commons-io:commons-io` to version `2.16.1` (#2456) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch dependabot/maven/main/commons-io-commons-io-2.16.1 updated (ae50441ce2 -> 9e90b1713c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/commons-io-commons-io-2.16.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard ae50441ce2 Bump commons-io:commons-io from 2.16.0 to 2.16.1 add 256e041cce Update `org.apache.groovy:groovy-bom` to version `4.0.21` (#2457) add b9dd641bd1 Correct timezone for Raman Gupta (#2463) add cbcecac82a Update `org.springframework:spring-framework-bom` to version `6.1.6` (#2465) add 9e90b1713c Update `commons-io:commons-io` to version `2.16.1` (#2456) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ae50441ce2) \ N -- N -- N refs/heads/dependabot/maven/main/commons-io-commons-io-2.16.1 (9e90b1713c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml | 2 +- log4j-spring-cloud-config-client/pom.xml | 2 +- pom.xml | 2 +- src/changelog/.3.x.x/update_commons_io_commons_io.xml | 4 ++-- src/changelog/.3.x.x/update_org_apache_groovy_groovy_bom.xml | 4 ++-- .../.3.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-)
(logging-parent) branch main-site-stg-out created (now b05d350)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-parent.git at b05d350 Add `README.txt` No new revisions were added by this update.
(logging-log4j2) branch dependabot/maven/2.x/org.apache.activemq-activemq-broker-6.1.1 deleted (was d78cf38ec3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/org.apache.activemq-activemq-broker-6.1.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was d78cf38ec3 Update `org.apache.activemq:activemq-broker` to version `6.1.1` (#2452) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch 2.x updated (52edad97e8 -> d78cf38ec3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 52edad97e8 Correct timezone for Raman Gupta (#2463) add d78cf38ec3 Update `org.apache.activemq:activemq-broker` to version `6.1.1` (#2452) No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml| 2 +- src/changelog/.2.x.x/update_org_apache_activemq_activemq_broker.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j2) branch dependabot/maven/2.x/org.apache.activemq-activemq-broker-6.1.1 updated (0cb9945658 -> d78cf38ec3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/org.apache.activemq-activemq-broker-6.1.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 0cb9945658 Bump org.apache.activemq:activemq-broker from 6.1.0 to 6.1.1 add 3f11508f0c Update `github/codeql-action` to version `3.24.10` (#2451) add 1caec7d20d Add link to the Logging Services page add 9ad91dbd77 Update `commons-io:commons-io` to version `2.16.1` (#2459) add 7b5d23e140 Update `co.elastic.clients:elasticsearch-java` to version `8.13.2` (#2458) add 52edad97e8 Correct timezone for Raman Gupta (#2463) add d78cf38ec3 Update `org.apache.activemq:activemq-broker` to version `6.1.1` (#2452) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0cb9945658) \ N -- N -- N refs/heads/dependabot/maven/2.x/org.apache.activemq-activemq-broker-6.1.1 (d78cf38ec3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/scorecards-analysis.yaml | 2 +- antora-playbook.yaml | 5 + log4j-parent/pom.xml | 4 ++-- pom.xml | 2 +- .../.2.x.x/update_co_elastic_clients_elasticsearch_java.xml | 4 ++-- src/changelog/.2.x.x/update_commons_io_commons_io.xml| 4 ++-- src/changelog/.2.x.x/update_github_codeql_action.xml | 4 ++-- src/changelog/.2.x.x/update_org_apache_activemq_activemq_broker.xml | 4 ++-- 8 files changed, 17 insertions(+), 12 deletions(-)
(logging-log4j2) branch dependabot/maven/2.x/spring-framework.version-5.3.34 updated (3436b27826 -> 3c423531c2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/spring-framework.version-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 3436b27826 Bump spring-framework.version from 5.3.33 to 5.3.34 add d78cf38ec3 Update `org.apache.activemq:activemq-broker` to version `6.1.1` (#2452) add 3c423531c2 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#2464) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3436b27826) \ N -- N -- N refs/heads/dependabot/maven/2.x/spring-framework.version-5.3.34 (3c423531c2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml | 2 +- src/changelog/.2.x.x/update_org_apache_activemq_activemq_broker.xml | 4 ++-- .../.2.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
(logging-parent) branch main-site-stg deleted (was cf912df)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-stg in repository https://gitbox.apache.org/repos/asf/logging-parent.git was cf912df Add along with an INFRA fix for the website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0` This change permanently discards the following revisions: discard cf912df Add along with an INFRA fix for the website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0` discard 93a98a2 Add website content generated from `f6f91f2974471e58599520f3aca97a9651c0f3c0` discard 4ce1673 Add along with an INFRA fix for the website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f` discard 97ca32b Add website content generated from `68829de27b1cd84cfd6fdd735dd36300f597a42f` discard e5e0ef6 Add along with an INFRA fix for the website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba` discard 8bfaea7 Add website content generated from `1b1a58ca69a439d4e38ac41a9853a6581b81b9ba` discard e7f9139 Add along with an INFRA fix for the website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6` discard 785f936 Add website content generated from `fa749e8f7684099d976df35cb2f7cd0a489db2e6` discard 5183af8 Content is not effective, seeing if pushing a small commit will help to recover discard 48c8531 Add INFRA fix for the website content generated from `3704738550608358a14ca2289fa1f874e931de21` discard 48e5f34 Add website content generated from `3704738550608358a14ca2289fa1f874e931de21`
(logging-log4j2) branch dependabot/maven/2.x/spring-framework.version-5.3.34 deleted (was 3c423531c2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/spring-framework.version-5.3.34 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 3c423531c2 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#2464) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch main-site-pro deleted (was 0bddcdc)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git was 0bddcdc Add along with an INFRA fix for the website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` This change permanently discards the following revisions: discard 0bddcdc Add along with an INFRA fix for the website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` discard 6ba3667 Add website content generated from `64ae84e05803f3ab6d4201512b00f1cb1c4051e8` discard c1a2a6b Add `README.txt`
(logging-log4j2) branch 2.x updated (d78cf38ec3 -> 3c423531c2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from d78cf38ec3 Update `org.apache.activemq:activemq-broker` to version `6.1.1` (#2452) add 3c423531c2 Update `org.springframework:spring-framework-bom` to version `5.3.34` (#2464) No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml | 2 +- .../.2.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-parent) branch main-site-pro created (now 64ae84e)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-site-pro in repository https://gitbox.apache.org/repos/asf/logging-parent.git at 64ae84e Release changelog for version `10.6.0` No new revisions were added by this update.
(logging-parent) 04/04: Avoid branch protection for the site
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 5b6baf8b2b06f8e387debaedf3fce728d7a350a8 Author: Volkan Yazıcı AuthorDate: Thu Apr 11 14:56:45 2024 +0200 Avoid branch protection for the site --- .asf.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 665bc95..82563ba 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -34,5 +34,3 @@ github: protected_branches: main: required_signatures: true -asf-site: - required_signatures: true
(logging-parent) 01/04: Fix AsciiDoc typo
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 f1de638cf2c0b2ed3f62a7506a4b80940345c9ac
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 13:14:57 2024 +0200
Fix AsciiDoc typo
---
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc | 5 +++--
1 file changed, 3 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 f4b1f02..9667ef0 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -122,6 +122,7 @@ git push origin rel/7.8.0
+
<1> You can find the `COMMIT-ID` in the generated vote email.
+
+
[IMPORTANT]
@@ -195,8 +196,8 @@ svn commit -m 'Remove `{project-id}` version `7.8.0` files
released'
[#announce-release]
== Announce the release
-. Send the announcement email uploaded to the
https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}/7.8.0]
Subversion repository
-+
+Send the announcement email uploaded to the
https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}/7.8.0]
Subversion repository
+
[WARNING]
Make sure your email is sent in plain text, that is,
https://infra.apache.org/contrib-email-tips#nohtml[no HTML]!
(logging-parent) 02/04: Clean up AsciiDoc attributes
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 df41e756840eb8cf4019b9063fe3602bc12ffd34
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 13:23:16 2024 +0200
Clean up AsciiDoc attributes
---
src/site/antora/antora.tmpl.yml| 7 ++-
src/site/antora/antora.yml | 10 +++---
.../modules/ROOT/pages/release-instructions-project.adoc | 4 ++--
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/site/antora/antora.tmpl.yml b/src/site/antora/antora.tmpl.yml
index a19cc68..8bda3bb 100644
--- a/src/site/antora/antora.tmpl.yml
+++ b/src/site/antora/antora.tmpl.yml
@@ -44,11 +44,8 @@ asciidoc:
project-id: "logging-parent"
java-target-version: "${maven.compiler.target}"
java-compiler-version: "${minimalJavaBuildVersion}"
-website-github-repository-name: logging-parent
-website-github-url:
"https://github.com/apache/{website-github-repository-name};
-website-folder: ""
-website-url-staging: "https://logging.staged.apache.org/{project-id};
-website-url: "https://logging.apache.org/{project-id};
+site-url-staging: "https://logging.staged.apache.org/{project-id};
+site-url: "https://logging.apache.org/{project-id};
nav:
- modules/ROOT/nav.adoc
- modules/manual/nav.adoc
diff --git a/src/site/antora/antora.yml b/src/site/antora/antora.yml
index 680975f..0ffc19e 100644
--- a/src/site/antora/antora.yml
+++ b/src/site/antora/antora.yml
@@ -41,14 +41,10 @@ asciidoc:
project-github-url: "https://github.com/awesome/project;
project-version: "1.2.3"
project-name: Logging Parent
-project-id: "logging-parent"
+project-id: "awesome-project"
java-target-version: "8"
java-compiler-version: "[17,18)"
-website-github-repository-name: logging-parent
-website-github-url: "https://github.com/awesome/project-site;
-website-folder: ""
-website-url-staging: "https://logging.staged.apache.org/awesome-project;
-website-url: "https://logging.apache.org/awesome-project;
+site-url-staging: "https://logging.staged.apache.org/awesome-project;
+site-url: "https://logging.apache.org/awesome-project;
nav:
- modules/ROOT/nav.adoc
- - modules/manual/nav.adoc
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 9667ef0..8c43f2c 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -68,7 +68,7 @@ You can iterate on the `release/7.8.0` branch to perfect it.
.. The `project.build.outputTimestamp` property in `pom.xml` is updated
.. *Signed artifacts* are uploaded to the _Staging Repositories_ in
https://repository.apache.org/[repository.apache.org]
.. *Signed distribution and its checksum* (e.g.,
`apache-{project-id}-7.8.0-{bin,src}.{zip,.zip.asc,.zip.sha512}`) are uploaded
to
https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}/7.8.0]
Subversion repository (along with auxiliary files; website, email texts, etc.)
-.. {website-url-staging}[The project **staging** website] is deployed
+.. {site-url-staging}[The project **staging** website] is deployed
+
If not, commit necessary fixes, push, and repeat.
@@ -188,7 +188,7 @@ svn commit -m 'Remove `{project-id}` version `7.8.0` files
released'
. Run the
{project-github-url}/actions/workflows/deploy-site-pro.yaml[`deploy-site-pro`]
GitHub Actions workflow:
.. Use the `rel/7.8.0` tag
-.. Verify that {website-url}[the project website] is updated
+.. Verify that {site-url}[the project website] is updated
. {project-github-url}/releases/new[Create a new release in GitHub]
.. Use the `rel/7.8.0` tag
.. Copy release notes from the generated emails
(logging-parent) branch main updated (f6f91f2 -> 5b6baf8)
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 f6f91f2 Don't skip `build` on `*.adoc` changes new f1de638 Fix AsciiDoc typo new df41e75 Clean up AsciiDoc attributes new 4877da3 Use a separate property to refer to the project version in the website new 5b6baf8 Avoid branch protection for the site The 4 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: .asf.yaml | 2 -- pom.xml | 13 + src/site/antora/antora.tmpl.yml | 10 +++--- src/site/antora/antora.yml| 10 +++--- .../modules/ROOT/pages/release-instructions-project.adoc | 15 +++ 5 files changed, 30 insertions(+), 20 deletions(-)
(logging-parent) 03/04: Use a separate property to refer to the project version in the website
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 4877da3882996bf8505fc478aa3fac7ba4c81f9b
Author: Volkan Yazıcı
AuthorDate: Thu Apr 11 14:26:27 2024 +0200
Use a separate property to refer to the project version in the website
---
pom.xml | 13 +
src/site/antora/antora.tmpl.yml | 3 +--
.../modules/ROOT/pages/release-instructions-project.adoc| 6 ++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2535d2e..6e86620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,11 +242,24 @@
2.26.1
1.13.0
+
+
+10.6.0
+
+
+
+org.apache.logging
+logging-parent
+${site-project.version}
+pom
+
+
biz.aQute.bnd
biz.aQute.bnd.annotation
diff --git a/src/site/antora/antora.tmpl.yml b/src/site/antora/antora.tmpl.yml
index 8bda3bb..8c344c0 100644
--- a/src/site/antora/antora.tmpl.yml
+++ b/src/site/antora/antora.tmpl.yml
@@ -39,7 +39,7 @@ start_page: index.adoc
asciidoc:
attributes:
project-github-url: "${scm.url}"
-project-version: "${project.version}"
+project-version: "${site-project.version}"
project-name: Logging Parent
project-id: "logging-parent"
java-target-version: "${maven.compiler.target}"
@@ -48,4 +48,3 @@ asciidoc:
site-url: "https://logging.apache.org/{project-id};
nav:
- modules/ROOT/nav.adoc
- - modules/manual/nav.adoc
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 8c43f2c..59f09b0 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -47,6 +47,12 @@ git checkout -B release/7.8.0 origin/main
. Prepare sources for the release:
.. Update the `revision` property in `pom.xml`
++
+[IMPORTANT]
+
+If your project refers to its own version in the site sources, those need to
be updated too.
+For instance, `site-project.version` needs to be updated for `logging-parent`.
+
.. Release the changelog: `./mvnw -N changelog-release`
.. Edit the release notes (i.e., `src/changelog/7.8.0/.release-notes.adoc.ftl`)
(logging-log4j2) branch dependabot/maven/main/org.elasticsearch.client-elasticsearch-rest-high-level-client-7.17.20 updated (9a294288ce -> fbed87c10f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/org.elasticsearch.client-elasticsearch-rest-high-level-client-7.17.20 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 9a294288ce Bump org.elasticsearch.client:elasticsearch-rest-high-level-client add 256e041cce Update `org.apache.groovy:groovy-bom` to version `4.0.21` (#2457) add b9dd641bd1 Correct timezone for Raman Gupta (#2463) add cbcecac82a Update `org.springframework:spring-framework-bom` to version `6.1.6` (#2465) add 9e90b1713c Update `commons-io:commons-io` to version `2.16.1` (#2456) add fbed87c10f Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20` (#2455) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9a294288ce) \ N -- N -- N refs/heads/dependabot/maven/main/org.elasticsearch.client-elasticsearch-rest-high-level-client-7.17.20 (fbed87c10f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml | 4 ++-- log4j-spring-cloud-config-client/pom.xml | 2 +- pom.xml | 2 +- src/changelog/.3.x.x/update_commons_io_commons_io.xml | 4 ++-- src/changelog/.3.x.x/update_org_apache_groovy_groovy_bom.xml | 4 ++-- ..._org_elasticsearch_client_elasticsearch_rest_high_level_client.xml | 4 ++-- .../.3.x.x/update_org_springframework_spring_framework_bom.xml| 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-)
(logging-log4j2) branch dependabot/maven/main/org.elasticsearch.client-elasticsearch-rest-high-level-client-7.17.20 deleted (was fbed87c10f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/org.elasticsearch.client-elasticsearch-rest-high-level-client-7.17.20 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was fbed87c10f Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20` (#2455) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated: Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20` (#2455)
This is an automated email from the ASF dual-hosted git repository. github-bot 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 fbed87c10f Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20` (#2455) fbed87c10f is described below commit fbed87c10f2e56f73dfb31f55ee0392c065f24a6 Author: ASF Logging Services RM AuthorDate: Thu Apr 11 13:01:03 2024 + Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20` (#2455) --- log4j-parent/pom.xml | 2 +- ..._org_elasticsearch_client_elasticsearch_rest_high_level_client.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index ecd6931dca..34fffe32cd 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -105,7 +105,7 @@ 1.3.1 1.2.21 4.0.0 -7.17.19 +7.17.20 0.9.0 7.0.5 4.8.1 diff --git a/src/changelog/.3.x.x/update_org_elasticsearch_client_elasticsearch_rest_high_level_client.xml b/src/changelog/.3.x.x/update_org_elasticsearch_client_elasticsearch_rest_high_level_client.xml index f4e90d302b..ec566317cc 100644 --- a/src/changelog/.3.x.x/update_org_elasticsearch_client_elasticsearch_rest_high_level_client.xml +++ b/src/changelog/.3.x.x/update_org_elasticsearch_client_elasticsearch_rest_high_level_client.xml @@ -3,6 +3,6 @@ xmlns="http://logging.apache.org/log4j/changelog; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; type="updated"> - https://github.com/apache/logging-log4j2/pull/2418"/> - Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.19` + https://github.com/apache/logging-log4j2/pull/2455"/> + Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20`
(logging-parent) branch asf-site deleted (was f1c5486)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-parent.git was f1c5486 Disable staging site publication This change permanently discards the following revisions: discard f1c5486 Disable staging site publication
