Skip to content

Commit 45ce728

Browse files
committed
Fix download.adoc links and stuff
1 parent 4ad6d71 commit 45ce728

File tree

1 file changed

+12
-27
lines changed

1 file changed

+12
-27
lines changed

src/site/antora/modules/ROOT/pages/download.adoc

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
= Download
1919
:dist-url: https://downloads.apache.org/logging/log4j/{log4j-core-version}
2020
21-
Apache Log4j is distributed under the
22-
https://www.apache.org/licenses/LICENSE-2.0[Apache License, version 2.0].
23-
You can find the download links of the official <<source-distribution,source>> and <<binary-distribution,binary distributions>> below.
24-
25-
See also the {logging-services-url}/download.html[Logging Services download page] for instruction on how to validate the downloaded files.
21+
You can manually download all published Log4j distributions, verify them, and see their licensing information by following the instructions in {logging-services-url}/download.html[the Download page] of {logging-services-url}[Logging Services].
2622
2723
[TIP]
2824
====
@@ -35,13 +31,13 @@ Proceed to xref:release-notes.adoc[].
3531
[#source-distribution]
3632
== Source distribution
3733
38-
You can download the source code of the latest Apache Log4j release using the links below:
34+
You can download the source code of the latest Log4j release using the links below:
3935
4036
.Source distribution files
4137
[cols="2h,5"]
4238
|===
4339
44-
| Source distribution archive
40+
| Sources
4541
| {dist-url}/apache-log4j-{log4j-core-version}-src.zip[apache-log4j-{log4j-core-version}-src.zip]
4642
4743
| Checksum
@@ -50,14 +46,14 @@ You can download the source code of the latest Apache Log4j release using the li
5046
| Signature
5147
| {dist-url}/apache-log4j-{log4j-core-version}-src.zip.asc[apache-log4j-{log4j-core-version}-src.zip.asc]
5248
53-
| PGP keys
49+
| Signing keys
5450
| https://downloads.apache.org/logging/KEYS[KEYS]
5551
|===
5652
5753
[#binary-distribution]
5854
== Binary distribution
5955
60-
A set of binaries of Apache Log4j is available through two main distribution channels:
56+
A set of binaries of Log4j is available through two main distribution channels:
6157
6258
ASF Nexus Repository::
6359
+
@@ -76,22 +72,22 @@ All the artifacts in the ASF Nexus repository are also available in a single ZIP
7672
[cols="2h,5"]
7773
|===
7874
79-
| Source distribution archive
75+
| Binaries
8076
| {dist-url}/apache-log4j-{log4j-core-version}-bin.zip[apache-log4j-{log4j-core-version}-bin.zip]
8177
8278
| Checksum
83-
| {dist-url}/apache-log4j-{log4j-core-version}-bin.zip.sha512[apache-log4j-{log4j-core-version}-src.bin.sha512]
79+
| {dist-url}/apache-log4j-{log4j-core-version}-bin.zip.sha512[apache-log4j-{log4j-core-version}-bin.zip.sha512]
8480
8581
| Signature
86-
| {dist-url}/apache-log4j-{log4j-core-version}-bin.zip.asc[apache-log4j-{log4j-core-version}-src.bin.asc]
82+
| {dist-url}/apache-log4j-{log4j-core-version}-bin.zip.asc[apache-log4j-{log4j-core-version}-bin.zip.asc]
8783
88-
| PGP keys
84+
| Signing keys
8985
| https://downloads.apache.org/logging/KEYS[KEYS]
9086
|===
9187
9288
[NOTE]
9389
====
94-
The authenticity of the Apache Log4j binary release is independently verified by the
90+
The authenticity of the Log4j binary release is independently verified by the
9591
https://github.com/jvm-repo-rebuild/reproducible-central[Reproducible Builds for Maven Central Repository]
9692
project.
9793
You can check the reproducibility status of the artifacts on their
@@ -101,19 +97,8 @@ https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org
10197
[#sbom]
10298
== Software Bill of Materials (SBOM)
10399
104-
Each Apache Log4j artifact is accompanied by a Software Bill of Materials in
105-
https://cyclonedx.org/[CycloneDX format].
106-
The SBOMs are published to the ASF Nexus repository with `cyclonedx` as classifier and `xml` as type and are also available in the binary distribution archive.
107-
108-
See also {logging-services-url}/download.html#sbom[Apache Logging Services SBOMs].
109-
110-
[IMPORTANT]
111-
====
112-
Since Apache Log4j is a software library, the contents of the SBOMs constitute only a **suggested** list of component versions known to work with Apache Log4j.
113-
These versions are used by our unit tests.
114-
115-
The **effective** list of components included in an application containing Apache Log4j can only be determined by the producer of the application.
116-
====
100+
Each Log4j artifact is accompanied by a Software Bill of Materials (SBOM).
101+
See {logging-services-url}/download.html#sbom[the Download page of Logging Services page] for details.
117102
118103
[#older]
119104
== Older releases

0 commit comments

Comments
 (0)