diff --git a/.asf.yaml b/.asf.yaml
index 4f62ba8e..6bcb287b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,8 +29,6 @@ github:
features:
issues: true
del_branch_on_merge: true
- autolink_jira:
- - LOG4JNET
labels:
- apache
- dotnet
diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
index 97c74d67..6973263d 100644
--- a/doc/CONTRIBUTING.md
+++ b/doc/CONTRIBUTING.md
@@ -47,4 +47,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/pom.xml b/pom.xml
index 96d4cdc7..087b2898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,22 +21,18 @@
log4netapache-log4netpom
- 2.0.16
+ 2.0.17Apache log4netLogging framework for Microsoft .NET Framework.http://logging.apache.org/log4net/2004
- JIRA
- https://issues.apache.org/jira/browse/LOG4NET
+ Github
+ https://github.com/apache/logging-log4net/issues
-
- Jenkins
- https://builds.apache.org/job/log4net-trunk-build/
-
- log4net-user : log4net usage
+ log4net-user: log4net usagelog4net-user-subscribe@logging.apache.orglog4net-user-unsubscribe@logging.apache.orglog4net-user@logging.apache.org
@@ -47,19 +43,17 @@
- dev : development of the logging projects including log4net
+ dev: development of the logging projects including log4netdev-subscribe@logging.apache.orgdev-unsubscribe@logging.apache.orgdev@logging.apache.orghttps://lists.apache.org/list.html?dev@logging.apache.orghttp://mail-archives.apache.org/mod_mbox/logging-dev/
-
- logging commits : all svn/git commits of the logging projects including log4net
+ logging commits: all git commits of the logging projects including log4netcommits-subscribe@logging.apache.orgcommits-unsubscribe@logging.apache.orgRead-Only List
@@ -74,9 +68,9 @@
- scm:git:http://git-wip-us.apache.org/repos/asf/logging-log4net.git
- scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4net.git
- https://git-wip-us.apache.org/repos/asf?p=logging-log4net.git
+ scm:git:https://github.com/apache/logging-log4net
+ scm:git:https://github.com/apache/logging-log4net
+ https://github.com/apache/logging-log4netApache Software Foundation
@@ -140,30 +134,7 @@
apache-rat-plugin0.12
-
-
- **/TestResult.xml
- **/*.suo
- **/*.user
- **/obj/**
- bin/**
- build/**
- doc/sdk/**
- src/log4net.xml
- src/GeneratedAssemblyInfo.cs
- src/site/resources/**
- tests/bin/**
- netstandard/*/bin/**
-
-
- *.snk*
- tests/lib/prerequisites.txt
- CONTRIBUTING.md
- ReleaseInstructions.txt
-
-
- **/*.json
-
+ ${basedir}/rat.excludesFile
diff --git a/rat.excludesFile b/rat.excludesFile
new file mode 100644
index 00000000..ffffc785
--- /dev/null
+++ b/rat.excludesFile
@@ -0,0 +1,26 @@
+rat.excludesFile
+**/*.suo
+**/*.user
+**/*.yml
+**/*.yaml
+**/.zarro-defaults
+**/*.md
+**/*.txt
+**/*.sh
+**/*.xml
+**/*.props
+**/*.csproj
+**/*.config
+**/*.log
+**/*.targets
+**/GeneratedAssemblyInfo.cs
+**/obj/**
+**/bin/**
+**/*.snk
+**/*.readme
+**/*.json
+src/.idea/**
+src/integration-testing/**
+build/**
+doc/**
+src/site/**
\ No newline at end of file
diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs
index 4d22fe67..f22bdb9e 100644
--- a/src/log4net/AssemblyInfo.cs
+++ b/src/log4net/AssemblyInfo.cs
@@ -47,11 +47,11 @@
//
#if NET462_OR_GREATER
-[assembly: AssemblyInformationalVersion("2.0.16.0-.NET 4.6.2")]
+[assembly: AssemblyInformationalVersion("3.0.0.0-.NET 4.6.2")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.6.2")]
#endif
#if NETSTANDARD2_0_OR_GREATER
-[assembly: AssemblyInformationalVersion("2.0.16.0-.NET Standard 2.0")]
+[assembly: AssemblyInformationalVersion("3.0.0.0-.NET Standard 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")]
#endif
diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs
index 64b2e336..e22225f4 100644
--- a/src/log4net/AssemblyVersionInfo.cs
+++ b/src/log4net/AssemblyVersionInfo.cs
@@ -28,8 +28,8 @@
// 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.AssemblyFileVersion("2.0.16.0")]
+[assembly: System.Reflection.AssemblyVersion("3.0.0.0")]
+[assembly: System.Reflection.AssemblyFileVersion("3.0.0.0")]
//
// Shared assembly settings
@@ -37,4 +37,4 @@
[assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")]
[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2024 The Apache Software Foundation.")]
-[assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]
+[assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]
\ No newline at end of file
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
index c26bbbb6..bab37dc7 100644
--- a/src/log4net/log4net.csproj
+++ b/src/log4net/log4net.csproj
@@ -1,117 +1,118 @@
-
- log4net
- 3.0.0
- Apache log4net
- Apache log4net
-
- log4net is a tool to help the programmer output log statements to a variety of output targets.
- In case of problems with an application, it is helpful to enable logging so that the problem
- can be located. With log4net it is possible to enable logging at runtime without modifying the
- application binary. The log4net package is designed so that log statements can remain in
- shipped code without incurring a high performance cost. It follows that the speed of logging
- (or rather not logging) is crucial.
+
+ log4net
+ 3.0.0
+ $(Version)
+ Apache log4net
+ Apache log4net
+
+ log4net is a tool to help the programmer output log statements to a variety of output targets.
+ In case of problems with an application, it is helpful to enable logging so that the problem
+ can be located. With log4net it is possible to enable logging at runtime without modifying the
+ application binary. The log4net package is designed so that log statements can remain in
+ shipped code without incurring a high performance cost. It follows that the speed of logging
+ (or rather not logging) is crucial.
- At the same time, log output can be so voluminous that it quickly becomes overwhelming.
- One of the distinctive features of log4net is the notion of hierarchical loggers.
- Using these loggers it is possible to selectively control which log statements are output
- at arbitrary granularity.
+ At the same time, log output can be so voluminous that it quickly becomes overwhelming.
+ One of the distinctive features of log4net is the notion of hierarchical loggers.
+ Using these loggers it is possible to selectively control which log statements are output
+ at arbitrary granularity.
- log4net is designed with two distinct goals in mind: speed and flexibility
-
- AnyCPU
- net462;netstandard2.0
- Debug;Release
- log4net
- log4net
- Local
- Library
- true
- false
- true
- ..\..\log4net.snk
- true
- ..\..\build\$(Configuration)
- ..\..\build\artifacts
- ..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
-
-
- The Apache Software Foundation
- Copyright 2004-2024 The Apache Software Foundation
- false
- false
- Apache-2.0
- https://logging.apache.org/log4net/
- package-icon.png
- logging log tracing logfiles
- git
- https://github.com/apache/logging-log4net
- Apache Logging Project
- $(Version)
-
-
- 285212672
- portable
- true
- 4096
- README.md
- false
- false
- git
- https://github.com/apache/logging-log4net
-
-
- TRACE;DEBUG;$(DefineConstants)
-
-
- TRACE;STRONG;$(DefineConstants)
- none
- true
-
-
-
-
- System
-
-
-
- System.Web
-
-
- System.Data
-
-
- System.XML
-
-
-
-
-
-
-
- log4net.snk
-
-
-
-
-
- package-icon.png
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
-
+ log4net is designed with two distinct goals in mind: speed and flexibility
+
+ AnyCPU
+ net462;netstandard2.0
+ Debug;Release
+ log4net
+ log4net
+ Local
+ Library
+ true
+ false
+ true
+ ..\..\log4net.snk
+ true
+ ..\..\build\$(Configuration)
+ ..\..\build\artifacts
+ ..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
+ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
+
+
+ The Apache Software Foundation
+ Copyright 2004-2024 The Apache Software Foundation
+ false
+ false
+ Apache-2.0
+ https://logging.apache.org/log4net/
+ package-icon.png
+ logging log tracing logfiles
+ git
+ https://github.com/apache/logging-log4net
+ Apache Logging Project
+ $(Version)
+
+
+ 285212672
+ portable
+ true
+ 4096
+ README.md
+ false
+ false
+ git
+ https://github.com/apache/logging-log4net
+
+
+ TRACE;DEBUG;$(DefineConstants)
+
+
+ TRACE;STRONG;$(DefineConstants)
+ none
+ true
+
+
+
+
+ System
+
+
+
+ System.Web
+
+
+ System.Data
+
+
+ System.XML
+
+
+
+
+
+
+
+ log4net.snk
+
+
+
+
+
+ package-icon.png
+
+
-
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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..be20bada 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,58 +21,54 @@
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-
-
+
-
+
-
+
-
+
-
+
-
-
+
+