Skip to content

Commit

Permalink
Merge pull request #121 from apache/release/2.x
Browse files Browse the repository at this point in the history
Update version for 2.0.17
  • Loading branch information
fluffynuts committed Mar 25, 2024
2 parents 9282c95 + 61e2832 commit 1b627b9
Show file tree
Hide file tree
Showing 21 changed files with 279 additions and 1,400 deletions.
2 changes: 1 addition & 1 deletion doc/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 19 additions & 0 deletions doc/MailTemplate.txt
Original file line number Diff line number Diff line change
@@ -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.
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 (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
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();
}
);
})();

2 changes: 1 addition & 1 deletion log4net.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<property name="log4net.basedir" value="." />
<property name="project.build.config" value="debug" />
<property name="project.build.package" value="false" />
<property name="package.version" value="2.0.16"/>
<property name="package.version" value="2.0.17"/>

<!-- Include log4net helpers -->
<include buildfile="${log4net.basedir}/log4net.include" />
Expand Down
2 changes: 1 addition & 1 deletion log4net.shfbproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ limitations under the License.
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
<OutputPath>doc\sdk\net\4.0\</OutputPath>
<HtmlHelpName>log4net-sdk-2.0.16</HtmlHelpName>
<HtmlHelpName>log4net-sdk-2.0.17</HtmlHelpName>
<Language>en-US</Language>
<SyntaxFilters>Standard</SyntaxFilters>
<SdkLinkTarget>Blank</SdkLinkTarget>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<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>
Expand Down
46 changes: 23 additions & 23 deletions src/log4net/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/log4net/AssemblyVersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/log4net/log4net.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>log4net</PackageId>
<Version>2.0.16</Version>
<PackageVersion>2.0.16</PackageVersion>
<Version>2.0.17</Version>
<PackageVersion>$(Version)</PackageVersion>
<Title>Apache log4net</Title>
<Product>Apache log4net</Product>
<Description>
Expand Down
4 changes: 2 additions & 2 deletions src/site/apt/roadmap.apt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

Apache log4net&#x2122; 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}}
92 changes: 4 additions & 88 deletions src/site/resources/doap_log4net.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -29,100 +29,16 @@
<homepage rdf:resource="http://logging.apache.org/log4net/" />
<asfext:pmc rdf:resource="http://logging.apache.org" />
<shortdesc>Apache log4net provides logging services for .NET.</shortdesc>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/LOG4NET" />
<bug-database rdf:resource="https://github.com/apache/logging-log4net/issues" />
<mailing-list rdf:resource="http://logging.apache.org/log4net/mail-lists.html" />
<download-page rdf:resource="http://logging.apache.org/log4net/download_log4net.cgi" />
<download-page rdf:resource="https://logging.apache.org/log4net/download_log4net.html" />
<programming-language>C#</programming-language>
<category rdf:resource="http://projects.apache.org/category/library" />
<repository>
<GITRepository>
<location rdf:resource="https://git-wip-us.apache.org/repos/asf/logging-log4net.git"/>
<browse rdf:resource="https://git-wip-us.apache.org/repos/asf/logging-log4net.git"/>
<location rdf:resource="https://github.com/apache/logging-log4net"/>
<browse rdf:resource="https://github.com/apache/logging-log4net"/>
</GITRepository>
</repository>
<release>
<Version>
<name>Apache log4net 1.2.9</name>
<created>2005-03-21</created>
<revision>1.2.9</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 1.2.10</name>
<created>2006-04-19</created>
<revision>1.2.10</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 1.2.11</name>
<created>2011-10-12</created>
<revision>1.2.11</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 1.2.12</name>
<created>2013-09-12</created>
<revision>1.2.12</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 1.2.13</name>
<created>2013-11-21</created>
<revision>1.2.13</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 1.2.14</name>
<created>2015-11-11</created>
<revision>1.2.14</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 1.2.15</name>
<created>2015-12-09</created>
<revision>1.2.15</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 2.0.6</name>
<created>2016-12-25</created>
<revision>2.0.6</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 2.0.7</name>
<created>2017-01-05</created>
<revision>2.0.7</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 2.0.8</name>
<created>2017-03-11</created>
<revision>2.0.8</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 2.0.9</name>
<created>2019-08-25</created>
<revision>2.0.9</revision>
</Version>
</release>
<release>
<Version>
<name>Apache log4net 2.0.10</name>
<created>2019-09.12</created>
<revision>2.0.10</revision>
</Version>
</release>
</Project>
</rdf:RDF>

0 comments on commit 1b627b9

Please sign in to comment.