:twisted_rightwards_arrows: merge in master
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f14f5bb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+Introduction
+===========
+
+Apache log4net is a sub project of the Apache Logging Services project.
+Apache log4net graduated from the Apache Incubator in February 2007.
+Web site: http://logging.apache.org/log4net
+
+
+Documentation
+=============
+
+For the latest documentation see the log4net web site at:
+http://logging.apache.org/log4net
+
+Contributing
+============
+
+log4net development happens on the logging dev mailing list, see
+https://logging.apache.org/log4net/mail-lists.html. Please join the
+mailing list and discuss bigger changes before working on them.
+
+For bigger changes we must ask you to sign a Contributor License
+Agreement http://www.apache.org/licenses/#clas.
+
+Github pull requests are one way to contribute, The Apache issue
+tracker is no longer accepting new issues but is available at
+https://issues.apache.org/jira/browse/LOG4NET for access to
+previous issues.
+
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 9a630d9..0000000
--- a/README.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Project Status
-==============
-
-Apache Log4net was voted to dormant status on April 1, 2020. Dormant status
-indicates that the project is not being actively maintained, that no future
-releases are planned and, most likely, there are few or no developers left
-in the Apache Logging project familiar with this code base.
-
-If you wish to use any of this library you must build it yourself and should
-assume that no future releases will be forthcoming.
-
-Introduction
-===========
-
-Apache Log4net was voted to dormant status on April 1, 2020. No patches or
-further releases are planned, however if enough people commit to
-maintain the project in the future it is possible
-
-Apache log4net is a sub project of the Apache Logging Services project.
-Apache log4net graduated from the Apache Incubator in February 2007.
-Web site: http://logging.apache.org/log4net
-
-
-Documentation
-=============
-
-For local documentation, which is correct for this release see:
-doc/index.html
-
-For the latest documentation see the log4net web site at:
-http://logging.apache.org/log4net
-
-Contributing
-============
-
-log4net development happens on the logging dev mailing list, see
-<https://logging.apache.org/log4net/mail-lists.html>. Please join the
-mailing list and discuss bigger changes before working on them.
-
-For bigger changes we must ask you to sign a Contributor License
-Agreement <http://www.apache.org/licenses/#clas>.
-
-github pull requests are one way to contribute, The Apache issue
-tracker is no longer accepting new issues but is available at
-<https://issues.apache.org/jira/browse/LOG4NET> for access to
-previous issues.
-
diff --git a/local-tasks/build-site.js b/local-tasks/build-site.js
new file mode 100644
index 0000000..f87fe82
--- /dev/null
+++ b/local-tasks/build-site.js
@@ -0,0 +1,30 @@
+const
+ gulp = requireModule("gulp"),
+ spawn = requireModule("spawn"),
+ env = requireModule("env"),
+ os = require("os"),
+ which = require("which");
+
+gulp.task("build-site", async () => {
+ let maven;
+ try {
+ maven = await which("mvn");
+ } catch (e) {
+ let extra;
+ switch (os.platform()) {
+ case "win32":
+ extra = "You may install maven via scoop (https://scoop.sh/)";
+ break;
+ case "darwin":
+ extra = "You may install maven via homebrew";
+ break;
+ default:
+ extra = "You should install maven with your package manager";
+ break;
+ }
+ throw new Error(`Unable to find mvn in your path. ${extra}`);
+ }
+
+ return spawn("mvn", [ "site" ]);
+});
+
diff --git a/local-tasks/zip.js b/local-tasks/zip.js
index 016648d..4e6b5f1 100644
--- a/local-tasks/zip.js
+++ b/local-tasks/zip.js
@@ -1,5 +1,5 @@
const
- gulp = requireModule("gulp-with-help"),
+ gulp = requireModule("gulp"),
promisify = requireModule("promisify-stream"),
readCsProjVersion = requireModule("read-csproj-version"),
target = "build/artifacts",
diff --git a/package.json b/package.json
index c3063d1..a006951 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"clean-build": "rimraf build",
"build": "run-s clean-build \"zarro build\"",
"build-release": "cross-env BUILD_CONFIGURATION=Release run-s clean-build \"zarro build\"",
+ "build-site": "run-s \"zarro build-site\"",
"zip": "run-s \"zarro zip\"",
"dump-env": "node -e \"console.log(process.env);\"",
"release": "run-s build-release zip",
@@ -27,6 +28,7 @@
"gulp-zip": "^5.0.1",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
- "zarro": "^1.77.0"
+ "zarro": "^1.77.0",
+ "which": "^2.0.2"
}
}
diff --git a/src/site/resources/download_log4net.cgi b/src/site/resources/download_log4net.cgi
deleted file mode 100644
index 4324f76..0000000
--- a/src/site/resources/download_log4net.cgi
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# Wrapper script around mirrors.cgi script
-# (we must change to that directory in order for python to pick up the
-# python includes correctly)
-cd /www/www.apache.org/dyn/mirrors
-/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
diff --git a/src/site/site.xml b/src/site/site.xml
index aa20cb6..c4f86fb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -29,7 +29,7 @@
<menu name="Apache log4net" inherit="top" img="icon-home">
<item name="About" href="/index.html"/>
- <item name="Download" href="/download_log4net.cgi"/>
+ <item name="Download" href="/download_log4net.html"/>
<item name="Security Reports" href="/release/security-reports.html"/>
<item name="Release Notes" href="/release/release-notes.html"/>
<item name="License" href="/license.html"/>
diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml
index 11c3982..f433cec 100644
--- a/src/site/xdoc/download_log4net.xml
+++ b/src/site/xdoc/download_log4net.xml
@@ -34,47 +34,6 @@
archive (right click on the ZIP and press the "Unblock" button)
before extracting it.</p>
- <subsection name="Using a Mirror">
- <p>We recommend you use a mirror to download our release
- builds, but you <strong>must</strong> verify the integrity of
- the downloaded files using signatures downloaded from our main
- distribution directories. Recent releases (48 hours) may not
- yet be available from the mirrors.</p>
-
- <p>You are currently using <b>[preferred]</b>. If you
- encounter a problem with this mirror, please select another
- mirror. If all mirrors are failing, there are <i>backup</i>
- mirrors (at the end of the mirrors list) that should be
- available.
- <br></br>
- [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
- </p>
-
- <form action="[location]" method="get" id="SelectMirror">
- <p>
- Other mirrors:
- <select name="Preferred">
- [if-any http]
- [for http]<option value="[http]">[http]</option>[end]
- [end]
- [if-any ftp]
- [for ftp]<option value="[ftp]">[ftp]</option>[end]
- [end]
- [if-any backup]
- [for backup]<option value="[backup]">[backup] (backup)</option>[end]
- [end]
- </select>
- <input type="submit" value="Change"></input>
- </p>
- </form>
-
- <p>The <a
- href="http://www.apache.org/dist/logging/log4net/KEYS">KEYS</a> link
- links to the code signing keys used to sign the product. The
- <code>PGP</code> link downloads the OpenPGP compatible
- signature from our main site. The <code>MD5</code> link
- downloads the checksum from the main site.</p>
- </subsection>
</section>
<section name="log4net 2.0.8">
@@ -82,41 +41,40 @@
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/logging/log4net/source/log4net-2.0.8-src.zip">log4net-2.0.8-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/logging/log4net/source/log4net-2.0.8-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/logging/log4net/source/log4net-2.0.8-src.zip.asc">pgp</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.9.zip">apache-log4net-source-2.0.9.zip</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.9.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.9.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Binaries">
-
- <p>There are two different binary releases,
- <code>oldkey</code> and <code>newkey</code>. Both contain
- assemblies built for most supported platforms and have been
- built from the same code base, they only differ in the strong
- name key used to sign the assemblies.</p>
-
- <p>See <a href="./release/faq.html#two-snks">the FAQ</a> for
- background. We recommend you use the assemblies signed with
- the "new" key whenever possible.</p>
-
+ <p>Binaries are available in a zip file or nupkg, which is also available from <a href="https://www.nuget.org/packages/log4net/">nuget.org</a></p>
<table>
<tr>
- <td><a href="[preferred]/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip">log4net-2.0.8-bin-newkey.zip</a></td>
- <td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip.asc">pgp</a></td>
- </tr>
+ <td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip">log4net-2.0.8-bin-newkey.zip</a></td>
+ <td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip.asc">pgp</a></td>
+ </tr>
<tr>
- <td><a href="[preferred]/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip">log4net-2.0.8-bin-oldkey.zip</a></td>
- <td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip.asc">pgp</a></td>
+ <td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg">log4net-2.0.8-bin-newkey.zip</a></td>
+ <td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg.asc">pgp</a></td>
</tr>
</table>
</subsection>
</section>
+ <section name="Keys">
+ <p>The <a
+ href="http://www.apache.org/dist/logging/log4net/KEYS">KEYS</a> link
+ links to the code signing keys used to sign the product. The
+ <code>PGP</code> link downloads the OpenPGP compatible
+ signature from our main site. The <code>MD5</code> link
+ downloads the checksum from the main site.</p>
+ </section>
+
<section name="Archives">
<p>Release 1.2.11 and all more recent releases are available
from the Apache Software Foundation's <a
