Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
FreeAndNil committed Mar 25, 2024
2 parents 0888221 + 0c3bb11 commit 11228c2
Show file tree
Hide file tree
Showing 22 changed files with 3,062 additions and 3,568 deletions.
2 changes: 0 additions & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ github:
features:
issues: true
del_branch_on_merge: true
autolink_jira:
- LOG4JNET
labels:
- apache
- dotnet
Expand Down
2 changes: 1 addition & 1 deletion doc/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 19 additions & 0 deletions doc/MailTemplate.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
To: [email protected]
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.
2 changes: 1 addition & 1 deletion doc/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ([email protected])
13. raise a vote on the log4net mailing list ([email protected]) - 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
Expand Down
58 changes: 58 additions & 0 deletions local-tasks/default-tools-installer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/// <reference path="../node_modules/zarro/types.d.ts" />
// 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<DebugFactory>("debug")(__filename),
gulp = requireModule<Gulp>("gulp"),
env = requireModule<Env>("env"),
nugetSourceName = process.env.NUGET_SOURCE || "nuget.org",
installLocalTools = requireModule<InstallLocalTools>("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();
}
);
})();

49 changes: 10 additions & 39 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,18 @@
<groupId>log4net</groupId>
<artifactId>apache-log4net</artifactId>
<packaging>pom</packaging>
<version>2.0.16</version>
<version>2.0.17</version>
<name>Apache log4net</name>
<description>Logging framework for Microsoft .NET Framework.</description>
<url>http://logging.apache.org/log4net/</url>
<inceptionYear>2004</inceptionYear>
<issueManagement>
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/LOG4NET</url>
<system>Github</system>
<url>https://github.com/apache/logging-log4net/issues</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://builds.apache.org/job/log4net-trunk-build/</url>
</ciManagement>
<mailingLists>
<mailingList>
<name>log4net-user : log4net usage</name>
<name>log4net-user: log4net usage</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
Expand All @@ -47,19 +43,17 @@
</otherArchives>
</mailingList>
<mailingList>
<name>dev : development of the logging projects including log4net</name>
<name>dev: development of the logging projects including log4net</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>https://lists.apache.org/[email protected]</archive>
<otherArchives>
<otherArchive>http://mail-archives.apache.org/mod_mbox/logging-dev/</otherArchive>
<!--otherArchive>http://marc.info/?l=log4net-dev</otherArchive>
<otherArchive>http://dir.gmane.org/gmane.comp.apache.logging.log4net.devel</otherArchive-->
</otherArchives>
</mailingList>
<mailingList>
<name>logging commits : all svn/git commits of the logging projects including log4net</name>
<name>logging commits: all git commits of the logging projects including log4net</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>Read-Only List</post>
Expand All @@ -74,9 +68,9 @@
</license>
</licenses>
<scm>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/logging-log4net.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4net.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4net.git</url>
<connection>scm:git:https://github.com/apache/logging-log4net</connection>
<developerConnection>scm:git:https://github.com/apache/logging-log4net</developerConnection>
<url>https://github.com/apache/logging-log4net</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
Expand Down Expand Up @@ -140,30 +134,7 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<configuration>
<excludes>
<!-- generated files -->
<exclude>**/TestResult.xml</exclude>
<exclude>**/*.suo</exclude>
<exclude>**/*.user</exclude>
<exclude>**/obj/**</exclude>
<exclude>bin/**</exclude>
<exclude>build/**</exclude>
<exclude>doc/sdk/**</exclude>
<exclude>src/log4net.xml</exclude>
<exclude>src/GeneratedAssemblyInfo.cs</exclude>
<exclude>src/site/resources/**</exclude>
<exclude>tests/bin/**</exclude>
<exclude>netstandard/*/bin/**</exclude>

<!-- really README files -->
<exclude>*.snk*</exclude>
<exclude>tests/lib/prerequisites.txt</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>ReleaseInstructions.txt</exclude>

<!-- can't have comments in JSON -->
<exclude>**/*.json</exclude>
</excludes>
<excludesFile>${basedir}/rat.excludesFile</excludesFile>
</configuration>
</plugin>
<plugin>
Expand Down
26 changes: 26 additions & 0 deletions rat.excludesFile
Original file line number Diff line number Diff line change
@@ -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/**
4 changes: 2 additions & 2 deletions src/log4net/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions src/log4net/AssemblyVersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
// 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
//

[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")]
Loading

0 comments on commit 11228c2

Please sign in to comment.