Skip to content

Commit 6e21ead

Browse files
fluffynutsfluffynuts
committed
🔀 merge in master
2 parents 4f0045f + 177ee10 commit 6e21ead

File tree

8 files changed

+84
-134
lines changed

8 files changed

+84
-134
lines changed

‎README.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Introduction
2+
===========
3+
4+
Apache log4net is a sub project of the Apache Logging Services project.
5+
Apache log4net graduated from the Apache Incubator in February 2007.
6+
Web site: http://logging.apache.org/log4net
7+
8+
9+
Documentation
10+
=============
11+
12+
For the latest documentation see the log4net web site at:
13+
http://logging.apache.org/log4net
14+
15+
Contributing
16+
============
17+
18+
log4net development happens on the logging dev mailing list, see
19+
https://logging.apache.org/log4net/mail-lists.html. Please join the
20+
mailing list and discuss bigger changes before working on them.
21+
22+
For bigger changes we must ask you to sign a Contributor License
23+
Agreement http://www.apache.org/licenses/#clas.
24+
25+
Github pull requests are one way to contribute, The Apache issue
26+
tracker is no longer accepting new issues but is available at
27+
https://issues.apache.org/jira/browse/LOG4NET for access to
28+
previous issues.
29+

‎README.txt

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎local-tasks/build-site.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
const
2+
gulp = requireModule("gulp"),
3+
spawn = requireModule("spawn"),
4+
env = requireModule("env"),
5+
os = require("os"),
6+
which = require("which");
7+
8+
gulp.task("build-site", async () => {
9+
let maven;
10+
try {
11+
maven = await which("mvn");
12+
} catch (e) {
13+
let extra;
14+
switch (os.platform()) {
15+
case "win32":
16+
extra = "You may install maven via scoop (https://scoop.sh/)";
17+
break;
18+
case "darwin":
19+
extra = "You may install maven via homebrew";
20+
break;
21+
default:
22+
extra = "You should install maven with your package manager";
23+
break;
24+
}
25+
throw new Error(`Unable to find mvn in your path. ${extra}`);
26+
}
27+
28+
return spawn("mvn", [ "site" ]);
29+
});
30+

‎local-tasks/zip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const
2-
gulp = requireModule("gulp-with-help"),
2+
gulp = requireModule("gulp"),
33
promisify = requireModule("promisify-stream"),
44
readCsProjVersion = requireModule("read-csproj-version"),
55
target = "build/artifacts",

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"clean-build": "rimraf build",
88
"build": "run-s clean-build \"zarro build\"",
99
"build-release": "cross-env BUILD_CONFIGURATION=Release run-s clean-build \"zarro build\"",
10+
"build-site": "run-s \"zarro build-site\"",
1011
"zip": "run-s \"zarro zip\"",
1112
"dump-env": "node -e \"console.log(process.env);\"",
1213
"release": "run-s build-release zip",
@@ -27,6 +28,7 @@
2728
"gulp-zip": "^5.0.1",
2829
"npm-run-all": "^4.1.5",
2930
"rimraf": "^3.0.2",
30-
"zarro": "^1.77.0"
31+
"zarro": "^1.77.0",
32+
"which": "^2.0.2"
3133
}
3234
}

‎src/site/resources/download_log4net.cgi

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/site/site.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<menu name="Apache log4net" inherit="top" img="icon-home">
3131
<item name="About" href="/index.html"/>
32-
<item name="Download" href="/download_log4net.cgi"/>
32+
<item name="Download" href="/download_log4net.html"/>
3333
<item name="Security Reports" href="/release/security-reports.html"/>
3434
<item name="Release Notes" href="/release/release-notes.html"/>
3535
<item name="License" href="/license.html"/>

‎src/site/xdoc/download_log4net.xml

Lines changed: 20 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -34,89 +34,47 @@ limitations under the License.
3434
archive (right click on the ZIP and press the "Unblock" button)
3535
before extracting it.</p>
3636

37-
<subsection name="Using a Mirror">
38-
<p>We recommend you use a mirror to download our release
39-
builds, but you <strong>must</strong> verify the integrity of
40-
the downloaded files using signatures downloaded from our main
41-
distribution directories. Recent releases (48 hours) may not
42-
yet be available from the mirrors.</p>
43-
44-
<p>You are currently using <b>[preferred]</b>. If you
45-
encounter a problem with this mirror, please select another
46-
mirror. If all mirrors are failing, there are <i>backup</i>
47-
mirrors (at the end of the mirrors list) that should be
48-
available.
49-
<br></br>
50-
[if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
51-
</p>
52-
53-
<form action="[location]" method="get" id="SelectMirror">
54-
<p>
55-
Other mirrors:
56-
<select name="Preferred">
57-
[if-any http]
58-
[for http]<option value="[http]">[http]</option>[end]
59-
[end]
60-
[if-any ftp]
61-
[for ftp]<option value="[ftp]">[ftp]</option>[end]
62-
[end]
63-
[if-any backup]
64-
[for backup]<option value="[backup]">[backup] (backup)</option>[end]
65-
[end]
66-
</select>
67-
<input type="submit" value="Change"></input>
68-
</p>
69-
</form>
70-
71-
<p>The <a
72-
href="http://www.apache.org/dist/logging/log4net/KEYS">KEYS</a> link
73-
links to the code signing keys used to sign the product. The
74-
<code>PGP</code> link downloads the OpenPGP compatible
75-
signature from our main site. The <code>MD5</code> link
76-
downloads the checksum from the main site.</p>
77-
</subsection>
7837
</section>
7938

8039
<section name="log4net 2.0.8">
8140

8241
<subsection name="Source">
8342
<table>
8443
<tr>
85-
<td><a href="[preferred]/logging/log4net/source/log4net-2.0.8-src.zip">log4net-2.0.8-src.zip</a></td>
86-
<td><a href="http://www.apache.org/dist/logging/log4net/source/log4net-2.0.8-src.zip.md5">md5</a></td>
87-
<td><a href="http://www.apache.org/dist/logging/log4net/source/log4net-2.0.8-src.zip.asc">pgp</a></td>
44+
<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>
45+
<td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.9.zip.sha512">sha512</a></td>
46+
<td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.9.zip.asc">pgp</a></td>
8847
</tr>
8948
</table>
9049
</subsection>
9150

9251
<subsection name="Binaries">
93-
94-
<p>There are two different binary releases,
95-
<code>oldkey</code> and <code>newkey</code>. Both contain
96-
assemblies built for most supported platforms and have been
97-
built from the same code base, they only differ in the strong
98-
name key used to sign the assemblies.</p>
99-
100-
<p>See <a href="./release/faq.html#two-snks">the FAQ</a> for
101-
background. We recommend you use the assemblies signed with
102-
the "new" key whenever possible.</p>
103-
52+
<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>
10453
<table>
10554
<tr>
106-
<td><a href="[preferred]/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip">log4net-2.0.8-bin-newkey.zip</a></td>
107-
<td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip.md5">md5</a></td>
108-
<td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-newkey.zip.asc">pgp</a></td>
109-
</tr>
55+
<td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip">log4net-2.0.8-bin-newkey.zip</a></td>
56+
<td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip.sha512">sha512</a></td>
57+
<td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip.asc">pgp</a></td>
58+
</tr>
11059
<tr>
111-
<td><a href="[preferred]/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip">log4net-2.0.8-bin-oldkey.zip</a></td>
112-
<td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip.md5">md5</a></td>
113-
<td><a href="http://www.apache.org/dist/logging/log4net/binaries/log4net-2.0.8-bin-oldkey.zip.asc">pgp</a></td>
60+
<td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg">log4net-2.0.8-bin-newkey.zip</a></td>
61+
<td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg.sha512">sha512</a></td>
62+
<td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg.asc">pgp</a></td>
11463
</tr>
11564
</table>
11665
</subsection>
11766

11867
</section>
11968

69+
<section name="Keys">
70+
<p>The <a
71+
href="http://www.apache.org/dist/logging/log4net/KEYS">KEYS</a> link
72+
links to the code signing keys used to sign the product. The
73+
<code>PGP</code> link downloads the OpenPGP compatible
74+
signature from our main site. The <code>MD5</code> link
75+
downloads the checksum from the main site.</p>
76+
</section>
77+
12078
<section name="Archives">
12179
<p>Release 1.2.11 and all more recent releases are available
12280
from the Apache Software Foundation's <a

0 commit comments

Comments
 (0)