diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
index 517def0c..d06343aa 100644
--- a/doc/CONTRIBUTING.md
+++ b/doc/CONTRIBUTING.md
@@ -50,4 +50,4 @@ Additional Resources
+ [General GitHub documentation](https://help.github.com/)
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
-[cla]:https://www.apache.org/licenses/#clas
+[cla]:https://www.apache.org/licenses/#clas
\ No newline at end of file
diff --git a/doc/MailTemplate.txt b/doc/MailTemplate.txt
new file mode 100644
index 00000000..6705d347
--- /dev/null
+++ b/doc/MailTemplate.txt
@@ -0,0 +1,19 @@
+To: dev@logging.apache.org
+Subject: [VOTE] Release Apache Log4net 2.0.17
+
+This is a vote to release the Apache Log4net 2.0.17.
+
+Website: https://logging.staged.apache.org/log4net/release/release-notes.html
+GitHub: https://github.com/apache/logging-log4net
+GitHub release (pre-release): https://github.com/apache/logging-log4net/releases/tag/2.0.17-rc1
+Distribution: https://dist.apache.org/repos/dist/dev/logging/log4net
+
+Please download, test, and cast your votes on this mailing list.
+
+[ ] +1, release the artifacts
+[ ] -1, don't release, because...
+
+This vote is open for 72 hours and will pass unless getting a
+net negative vote count. All votes are welcome and we encourage
+everyone to test the release, but only the Logging Services PMC
+votes are officially counted.
\ No newline at end of file
diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index 919d81e9..5af391df 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -66,7 +66,7 @@ release version 2.0.123:
- copy in source & binary artifacts to respective locations
- `svn delete` old items (or defer this until after the vote completes)
- `svn commit`
-13. raise a vote on the log4net mailing list (dev@logging.apache.org)
+13. raise a vote on the log4net mailing list (dev@logging.apache.org) - see MailTemplate.txt
14. wait
15. when the vote has 3 or more +1's, it's time to go live!
16. copy the apache artifacts (binary and source) to the release svn repo and commit
diff --git a/local-tasks/default-tools-installer.ts b/local-tasks/default-tools-installer.ts
new file mode 100644
index 00000000..6f71dcae
--- /dev/null
+++ b/local-tasks/default-tools-installer.ts
@@ -0,0 +1,58 @@
+///
+// 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.
+(function () {
+ const
+ debug = requireModule("debug")(__filename),
+ gulp = requireModule("gulp"),
+ env = requireModule("env"),
+ nugetSourceName = process.env.NUGET_SOURCE || "nuget.org",
+ installLocalTools = requireModule("install-local-tools"),
+ isDotnetCore = env.resolveFlag("DOTNET_CORE"),
+ tools = isDotnetCore
+ ? [] // currently, only dotnet targets are used for dotnet test/build
+ : [
+ `${ nugetSourceName }/nunit.consolerunner`
+ ];
+
+ env.associate("default-tools-installer", [ "BUILD_TOOLS_FOLDER", "DOTNET_CORE" ]);
+
+ gulp.task(
+ "default-tools-installer",
+ `Installs the default toolset: ${ tools.join(", ") }`,
+ () => {
+ if (env.resolveFlag("DOTNET_CORE")) {
+ debug(`DOTNET_CORE builds currently have ${ tools.length } default tools to install`);
+ }
+ if (tools.length === 0) {
+ // don't waste time calling into the installer
+ // when there are no tools to install
+ return Promise.resolve();
+ }
+ return installLocalTools.install(tools);
+ }
+ );
+
+ gulp.task(
+ "clean-tools-folder",
+ "Cleans out folders under the tools folder (will always be done as part of tool installation)",
+ () => {
+ return installLocalTools.clean();
+ }
+ );
+ })();
+
\ No newline at end of file
diff --git a/log4net.build b/log4net.build
index 7172d4f2..f1700d02 100644
--- a/log4net.build
+++ b/log4net.build
@@ -20,7 +20,7 @@ limitations under the License.
-
+
diff --git a/log4net.shfbproj b/log4net.shfbproj
index ae39e037..ac37fbb3 100644
--- a/log4net.shfbproj
+++ b/log4net.shfbproj
@@ -33,7 +33,7 @@ limitations under the License.
.NET Framework 3.5
doc\sdk\net\4.0\
- log4net-sdk-2.0.16
+ log4net-sdk-2.0.17
en-US
Standard
Blank
diff --git a/pom.xml b/pom.xml
index 96d4cdc7..bd0bcef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
log4net
apache-log4net
pom
- 2.0.16
+ 2.0.17
Apache log4net
Logging framework for Microsoft .NET Framework.
http://logging.apache.org/log4net/
diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs
index 3c55f6bc..06ff5fc3 100644
--- a/src/log4net/AssemblyInfo.cs
+++ b/src/log4net/AssemblyInfo.cs
@@ -55,77 +55,77 @@
//
#if (CLI_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.CLI 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.CLI 1.0")]
[assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")]
#elif (NET_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")]
#elif (NET_1_1)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 1.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 1.1")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")]
#elif (NET_4_5)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 4.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 4.5")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")]
#elif (NET_4_0)
#if CLIENT_PROFILE
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 4.0 CP")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 4.0 CP")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")]
#else
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 4.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 4.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")]
#endif // Client Profile
#elif (NET_3_5)
#if CLIENT_PROFILE
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 3.5 CP")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 3.5 CP")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")]
#else
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 3.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 3.5")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")]
#endif // Client Profile
#elif (NET_2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
#elif (NETCF_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NETCF 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NETCF 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")]
#elif (NETCF_2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NETCF 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NETCF 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")]
#elif (MONO_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-Mono 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-Mono 1.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 1.0")]
#elif (MONO_2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-Mono 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-Mono 2.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
#elif (MONO_3_5)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-Mono 3.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-Mono 3.5")]
[assembly: AssemblyTitle("Apache log4net for Mono 3.5")]
#elif (MONO_4_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-Mono 4.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-Mono 4.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 4.0")]
#elif (SSCLI_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-SSCLI 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-SSCLI 1.0")]
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")]
#elif (NET)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework")]
#elif (NETSTANDARD1_3)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET Standard 1.3")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET Standard 1.3")]
[assembly: AssemblyTitle("Apache log4net for .NET Standard 1.3")]
#elif (NETSTANDARD2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NET Standard 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NET Standard 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")]
#elif (NETCF)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-.NETCF")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-.NETCF")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")]
#elif (MONO)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-Mono")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-Mono")]
[assembly: AssemblyTitle("Apache log4net for Mono")]
#elif (SSCLI)
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0-SSCLI")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0-SSCLI")]
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI")]
#else
-[assembly: AssemblyInformationalVersionAttribute("2.0.16.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.17.0")]
[assembly: AssemblyTitle("Apache log4net")]
#endif
diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs
index 14524de4..45e01a6e 100644
--- a/src/log4net/AssemblyVersionInfo.cs
+++ b/src/log4net/AssemblyVersionInfo.cs
@@ -28,11 +28,11 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: System.Reflection.AssemblyVersion("2.0.16.0")]
+[assembly: System.Reflection.AssemblyVersion("2.0.17.0")]
#if !NETCF
#if !SSCLI
-[assembly: System.Reflection.AssemblyFileVersion("2.0.16.0")]
+[assembly: System.Reflection.AssemblyFileVersion("2.0.17.0")]
#endif
#endif
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
index 61dfe5a9..380fba97 100644
--- a/src/log4net/log4net.csproj
+++ b/src/log4net/log4net.csproj
@@ -1,8 +1,8 @@
log4net
- 2.0.16
- 2.0.16
+ 2.0.17
+ $(Version)
Apache log4net
Apache log4net
diff --git a/src/site/apt/roadmap.apt b/src/site/apt/roadmap.apt
index e3396ec4..4736f7eb 100644
--- a/src/site/apt/roadmap.apt
+++ b/src/site/apt/roadmap.apt
@@ -20,8 +20,8 @@
Apache log4net™ Roadmap
- The log4net development roadmap is managed by our JIRA issue tracking system.
+ The log4net development roadmap is managed by our Github issue tracking system.
For a list of upcoming fixes and in-progress tasks see:
- {{{http://issues.apache.org/jira/browse/LOG4NET?report=com.atlassian.jira.plugin.system.project:roadmap-panel}Apache log4net Roadmap}}
+ {{{https://github.com/apache/logging-log4net/milestones}log4net Milestones}}
diff --git a/src/site/resources/doap_log4net.rdf b/src/site/resources/doap_log4net.rdf
index acdb9695..fd6ad3bb 100644
--- a/src/site/resources/doap_log4net.rdf
+++ b/src/site/resources/doap_log4net.rdf
@@ -29,100 +29,16 @@
Apache log4net provides logging services for .NET.
-
+
-
+
C#
-
-
+
+
-
-
- Apache log4net 1.2.9
- 2005-03-21
- 1.2.9
-
-
-
-
- Apache log4net 1.2.10
- 2006-04-19
- 1.2.10
-
-
-
-
- Apache log4net 1.2.11
- 2011-10-12
- 1.2.11
-
-
-
-
- Apache log4net 1.2.12
- 2013-09-12
- 1.2.12
-
-
-
-
- Apache log4net 1.2.13
- 2013-11-21
- 1.2.13
-
-
-
-
- Apache log4net 1.2.14
- 2015-11-11
- 1.2.14
-
-
-
-
- Apache log4net 1.2.15
- 2015-12-09
- 1.2.15
-
-
-
-
- Apache log4net 2.0.6
- 2016-12-25
- 2.0.6
-
-
-
-
- Apache log4net 2.0.7
- 2017-01-05
- 2.0.7
-
-
-
-
- Apache log4net 2.0.8
- 2017-03-11
- 2.0.8
-
-
-
-
- Apache log4net 2.0.9
- 2019-08-25
- 2.0.9
-
-
-
-
- Apache log4net 2.0.10
- 2019-09.12
- 2.0.10
-
-
diff --git a/src/site/site.xml b/src/site/site.xml
index c4f86fb5..2be04ee2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -27,52 +27,50 @@
-
+
-
+
-
+
-
+
-
-
- Apache log4net is distributed under the Apache
- License, version 2.0.
+ Apache log4net is distributed under the Apache License, version 2.0.
- Starting with log4net 1.2.11 log4net is available as source only or
- binary only release.
+ Starting with log4net 1.2.11 log4net is available as source only or binary only release.
- Users who download the ZIP files to Windows may need to unblock the
- archive (right click on the ZIP and press the "Unblock" button)
- before extracting it.
+ Users who download the ZIP files to Windows may need to unblock the archive (right click on the ZIP and press the "Unblock" button) before extracting it.
-
+
@@ -52,14 +47,14 @@ limitations under the License.
Binaries are available in a zip file or nupkg, which is also available from nuget.org
@@ -67,12 +62,8 @@ limitations under the License.
- The KEYS link
- links to the code signing keys used to sign the product. The
- PGP
link downloads the OpenPGP compatible
- signature from our main site. The MD5
link
- downloads the checksum from the main site.
+ The KEYS link links to the code signing keys used to sign the product.
+ The PGP
link downloads the OpenPGP compatible signature from our main site.
@@ -83,9 +74,8 @@ limitations under the License.
The 1.2.10 and 1.2.9 releases have been created while log4net
was still undergoing incubation and those releases are available
- from the distribution
- archive for the Incubator project.
+ from the distribution archive
+ for the Incubator project.
Previous releases of log4net are available from the
SourceForge Project Site.
@@ -94,16 +84,10 @@ limitations under the License.
- It is essential that you verify the integrity of the downloaded
- files using the PGP signature or MD5 checksums. The checksums are
- not as strong indicators as the PGP signature.
+ It is essential that you verify the integrity of the downloaded files using the GPG signature.
Please read Verifying
- Apache HTTP Server Releases for more information on why you
- should verify our releases. The PGP keys used to sign our
- distributions are part of the KEYS
- file.
+ href="http://httpd.apache.org/dev/verification.html">Verifying Apache HTTP Server Releases for more information on why you should verify our releases.
+ The PGP keys used to sign our distributions are part of the KEYS file.
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 8cbe4859..d3c3a5d3 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -16,33 +16,27 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
- Nicko Cadell
- Apache log4net: Home
-
-
-
-
-
-
-
-
- The Apache log4net library is a tool to help the programmer output log statements to a variety
- of output targets. log4net is a port of the excellent Apache log4j™ framework to the
- Microsoft® .NET runtime. We have kept the framework similar in spirit to the original log4j
- while taking advantage of new features in the .NET runtime.
- For more information on log4net see the features document.
-
-
-
-
-
-
+
+ Nicko Cadell
+ Apache log4net: Home
+
+
+
+
+
+ The Apache log4net library is a tool to help the programmer output log statements to a variety
+ of output targets. log4net is a port of the excellent Apache log4j™ framework to the
+ Microsoft® .NET runtime. We have kept the framework similar in spirit to the original log4j
+ while taking advantage of new features in the .NET runtime.
+ For more information on log4net see the features document.
+
+
+
+
diff --git a/src/site/xdoc/release/building.xml b/src/site/xdoc/release/building.xml
index 9a9644d6..f4c21a2c 100644
--- a/src/site/xdoc/release/building.xml
+++ b/src/site/xdoc/release/building.xml
@@ -17,107 +17,18 @@ limitations under the License.
-->
-
- Nicko Cadell
- Apache log4net: Building log4net
-
-
-
-
-
-
-
- The log4net release builds are built using NAnt. Log4net can also be built
- using Visual Studio .NET 2008 or 2010.
-
-
-
-
- Visual Studio .NET 2008 and 2010 are supported build platforms for log4net.
-
-
-
-
- The log4net distribution includes a solution and project file
- for Visual Studio .NET 2008. Open the log4net.vs2008.sln
- from the src directory in the distribution.
-
-
- The log4net project requires only the following references:
-
-
- - System
- - System.Configuration
- - System.Data
- - System.Web
- - System.XML
-
-
-
-
-
- The log4net distribution includes a solution and project file
- for Visual Studio .NET 2010. Open the log4net.vs2010.sln
- from the src directory in the distribution.
-
-
- The log4net project requires only the following references:
-
-
- - System
- - System.Configuration
- - System.Data
- - System.Web
- - System.XML
-
-
-
-
-
-
- The log4net distribution is built using the NAnt tool.
- A recent NAnt version 0.91 alpha2 is required to build log4net, this is
- available from nant.sourceforge.net.
-
-
- To support building log4net for the SSCLI framework the NAnt configuration
- files need to be updated to specify the SSCLI framework directory.
-
-
- To build log4net from the command line, change directory to the root of the
- log4net distribution, ensure that the nant executable is in the
- PATH, and then run the following command:
-
-
-nant -buildfile:log4net.build compile-all
-
- This command will build log4net for all the supported frameworks
- that are available on the current machine. To list all the build
- targets that are available run the following command:
-
-
-nant -buildfile:log4net.build -projecthelp
-
- Under windows the build.cmd can be used
- to script the nant build. This can be called from a different
- directory and will locate the correct log4net.build file to use.
- For example:
-
-
-
-
-
-
- Sandcastle
- Helpfile Builder is used to build the log4net SDK
- documentation. Running it is currently not
- integrated with the NAnt build process, you'll
- have to open and run log4net.shfbproj
- with SHFB manually.
-
-
-
-
-
+
+ Nicko Cadell
+ Apache log4net: Building log4net
+
+
+
+
+
+
+
diff --git a/src/site/xdoc/release/features.xml b/src/site/xdoc/release/features.xml
index c42b7235..eb7b09a3 100644
--- a/src/site/xdoc/release/features.xml
+++ b/src/site/xdoc/release/features.xml
@@ -65,39 +65,12 @@ limitations under the License.
- log4net runs on all ECMA CLI 1.0 compatible runtimes.
log4net has specific builds for the following frameworks:
- - .NET Core 1.0 - using netstandard-1.3
- - Microsoft® .NET Framework 1.0*
- - Microsoft .NET Framework 1.1*
- - Microsoft .NET Framework 2.0
- - Microsoft .NET Framework 3.5
- - Microsoft .NET Framework 4.0
- - Microsoft .NET Framework 4.5
- - Microsoft .NET Framework 3.5 Client Profile
- - Microsoft .NET Framework 4.0 Client Profile
- - Microsoft .NET Compact Framework 1.0*
- - Microsoft .NET Compact Framework 2.0*
- - Mono 1.0*
- - Mono 2.0
- - Mono 3.5
- - Mono 4.0
- - Microsoft Shared Source CLI 1.0*
- - CLI 1.0 Compatible*
+ - .NET Core 6 or higher - using netstandard-2.0
+ - Microsoft .NET Framework 4.6.2 or higher
- The "Client Profile" builds are stripped down
- versions of the "normal" builds that don't contain any
- ASP.NET releated code - which for example means the
- %aspnet-*
patterns and the
- AspNetTraceAppender
are not available.
-
-
- *Not
- supported by the binary release but can be built
- from the source release.
-
@@ -311,4 +284,4 @@ limitations under the License.
+
+ Apache log4net 2.0.16 addresses reported issues:
+
+
Apache log4net 2.0.16 addresses reported issues: