You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2021/05/22 22:38:18 UTC

[logging-chainsaw] 01/03: Fix download page

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

rmiddleton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git

commit 0fe69ea36bc30c94ffa6eb6ca3c9792923b6b09d
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Sat May 22 16:38:47 2021 -0400

    Fix download page
---
 pom.xml                         | 26 ++++++++++++++
 src/site/apt/download.apt       | 25 --------------
 src/site/asciidoc/download.adoc | 76 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9dabf46..89fcbfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <dependency.locations.enabled>false</dependency.locations.enabled>
+    <ChainsawReleaseVersion>2.0.0</ChainsawReleaseVersion>
   </properties>
 
   <build>
@@ -356,6 +357,31 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <version>3.7.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctor-maven-plugin</artifactId>
+            <version>1.5.6</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <!-- only build English site even on other language OS -->
+          <locales>en</locales>
+          <!-- Exclude the navigation file for Maven 1 sites
+               and the changes file used by the changes-plugin,
+               as they interfere with the site generation. -->
+          <moduleExcludes>
+            <xdoc>navigation.xml,changes.xml</xdoc>
+          </moduleExcludes>
+          <asciidoc>
+            <attributes>
+              <!-- copy any site properties wanted in asciidoc files -->
+              <ChainsawReleaseVersion>${ChainsawReleaseVersion}</ChainsawReleaseVersion>
+              <Log4jReleaseManager>${Log4jReleaseManager}</Log4jReleaseManager>
+              <Log4jReleaseKey>${Log4jReleaseKey}</Log4jReleaseKey>
+            </attributes>
+          </asciidoc>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
deleted file mode 100644
index 9f74734..0000000
--- a/src/site/apt/download.apt
+++ /dev/null
@@ -1,25 +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.
-Download
-
-   Latest Build:
-
-	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/chainsaw.dmg}OSX}} - .dmg bundled distribution.  Drag to your /Applications folder
-	
-	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/apache-chainsaw-2.0.0-standalone.tar.gz}Standalone tar.gz}} (Unix/Mac: bin/chainsaw, Windows: bin/chainsaw.bat)
-
-	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/apache-chainsaw-2.0.0-standalone.zip}Standalone zip}} (Unix/Mac: bin/chainsaw, Windows: bin/chainsaw.bat)
-	
-	Please check the {{{distributionnotes.html}Important Distribution Notes}} for more information about some of the extended feature sets.
\ No newline at end of file
diff --git a/src/site/asciidoc/download.adoc b/src/site/asciidoc/download.adoc
new file mode 100644
index 0000000..92abcfe
--- /dev/null
+++ b/src/site/asciidoc/download.adoc
@@ -0,0 +1,76 @@
+////
+    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
+
+        https://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.
+////
+= Download Apache Log4j 2
+
+Apache Chainsaw is distributed under the
+https://www.apache.org/licenses/LICENSE-2.0.html[Apache License, version 2.0].
+
+The link in the Mirrors column should display a list of available
+mirrors with a default selection based on your inferred location. If you
+do not see that page, try a different browser. The checksum and
+signature are links to the originals on the main distribution server.
+
+|===
+|Distribution |Mirrors |Checksum |Signature
+
+|Apache Log4j 2 binary (tar.gz)
+|https://www.apache.org/dyn/closer.lua/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz[apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz.sha512[apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz.sha512]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz.asc[apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz.asc]
+
+|Apache Log4j 2 binary (zip)
+|https://www.apache.org/dyn/closer.lua/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-bin.zip[apache-chainsaw-{ChainsawReleaseVersion}-bin.zip]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-bin.zip.sha512[apache-chainsaw-{ChainsawReleaseVersion}-bin.zip.sha512]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-bin.zip.asc[apache-chainsaw-{ChainsawReleaseVersion}-bin.zip.asc]
+
+|Apache Log4j 2 source (tar.gz)
+|https://www.apache.org/dyn/closer.lua/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz[apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz.sha512[apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz.sha512]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz.asc[apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz.asc]
+
+|Apache Log4j 2 source (zip)
+|https://www.apache.org/dyn/closer.lua/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-src.zip[apache-chainsaw-{ChainsawReleaseVersion}-src.zip]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-src.zip.sha512[apache-chainsaw-{ChainsawReleaseVersion}-src.zip.sha512]
+|https://www.apache.org/dist/logging/chainsaw/{ChainsawReleaseVersion}/apache-chainsaw-{ChainsawReleaseVersion}-src.zip.asc[apache-chainsaw-{ChainsawReleaseVersion}-src.zip.asc]
+|===
+
+It is essential that you verify the integrity of the downloaded files
+using the PGP or SHA512 signatures. Please read
+https://httpd.apache.org/dev/verification.html[Verifying Apache HTTP
+Server Releases] for more information on why you should verify our
+releases.
+
+The PGP signatures can be verified using PGP or GPG. First download the
+https://www.apache.org/dist/logging/KEYS[KEYS] as well as the asc
+signature file for the relevant distribution. Make sure you get these
+files from the https://www.apache.org/dist/logging/[main distribution
+directory], rather than from a mirror. Then verify the signatures using
+
+[source,sh,subs=attributes]
+----
+gpg --import KEYS
+gpg --verify apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz.asc apache-chainsaw-{ChainsawReleaseVersion}-bin.tar.gz
+gpg --verify apache-chainsaw-{ChainsawReleaseVersion}-bin.zip.asc apache-chainsaw-{ChainsawReleaseVersion}-bin.zip
+gpg --verify apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz.asc apache-chainsaw-{ChainsawReleaseVersion}-src.tar.gz
+gpg --verify apache-chainsaw-{ChainsawReleaseVersion}-src.zip.asc apache-chainsaw-{ChainsawReleaseVersion}-src.zip
+----
+
+Apache Log4j {ChainsawReleaseVersion} is signed by {Log4jReleaseManager} ({Log4jReleaseKey}).
+
+Alternatively, you can verify the SHA512 signature on the files. A unix
+program called sha512sum is included in many unix distributions.
+