update version to 3.3.0

FreeAndNil · FreeAndNil · commit 7dfdee399b68 · 2025-12-07T22:13:21.000+01:00
diff --git a/doc/MailTemplate.Announce.txt b/doc/MailTemplate.Announce.txt
@@ -1,10 +1,10 @@
 To: announce@apache.org, dev@logging.apache.org
-Subject: [ANNOUNCE] Apache log4net 3.2.1 released
+Subject: [ANNOUNCE] Apache log4net 3.3.0 released
 
 Hi,
 
-the Apache log4net team is pleased to announce the 3.2.1 release.
+the Apache log4net team is pleased to announce the 3.3.0 release.
 For further information (support, download, etc.) see
 - https://logging.apache.org/log4net/release-notes.html
-- https://github.com/apache/logging-log4net/releases/tag/rel%2F3.2.1
-- https://www.nuget.org/packages/log4net/3.2.1
+- https://github.com/apache/logging-log4net/releases/tag/rel%2F3.3.0
+- https://www.nuget.org/packages/log4net/3.3.0
diff --git a/doc/MailTemplate.Result.txt b/doc/MailTemplate.Result.txt
@@ -1,5 +1,5 @@
 To: dev@logging.apache.org
-Subject: [RESULT][VOTE] Release Apache Log4net 3.2.1
+Subject: [RESULT][VOTE] Release Apache Log4net 3.3.0
 
 and here is my +1.
 
@@ -9,6 +9,6 @@ I will continue the release process.
 Jan
 
 ---------------------------------------------------------------------------------------------------
-This is a vote to release the Apache Log4net 3.2.1.
+This is a vote to release the Apache Log4net 3.3.0.
 
 ...
diff --git a/doc/MailTemplate.txt b/doc/MailTemplate.txt
@@ -1,12 +1,12 @@
 To: dev@logging.apache.org
-Subject: [VOTE] Release Apache Log4net 3.2.1
+Subject: [VOTE] Release Apache Log4net 3.3.0
 
-This is a vote to release the Apache Log4net 3.2.1.
+This is a vote to release the Apache Log4net 3.3.0.
 
 Website: https://logging.staged.apache.org/log4net/release-notes.html
 GitHub: https://github.com/apache/logging-log4net
 Commit: <todo>
-Distribution: https://dist.apache.org/repos/dist/dev/logging/log4net/3.2.1
+Distribution: https://dist.apache.org/repos/dist/dev/logging/log4net/3.3.0
 Signing key: 0x7D24496A230E29D6349A99EF583E491578F02D5D
 Review kit: https://logging.staged.apache.org/log4net/release-review.html
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "log4net",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Log4Net is a logging framework for .NET",
   "repository": {
     "type": "git",
@@ -17,4 +17,4 @@
     "@antora/site-generator-default": "^3.2.0-alpha.9",
     "@asciidoctor/tabs": "^1.0.0-beta.6"
   }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
   <packaging>pom</packaging>
   <groupId>org.apache.logging.log4net</groupId>
   <artifactId>apache-log4net</artifactId>
-  <version>3.2.1</version>
+  <version>3.3.0</version>
   <name>Apache log4net</name>
   <description>Logging framework for Microsoft .NET Framework.</description>
   <url>https://logging.apache.org/log4net</url>
diff --git a/scripts/build-preview.ps1 b/scripts/build-preview.ps1
@@ -1,5 +1,5 @@
 param(
-  $Version = '3.2.1',
+  $Version = '3.3.0',
   $Preview = '1'
 )
 'building ...'
diff --git a/scripts/build-release.ps1 b/scripts/build-release.ps1
@@ -1,5 +1,5 @@
 param(
-  $Version = '3.2.1'
+  $Version = '3.3.0'
 )
 
 Set-StrictMode -Version Latest
diff --git a/src/changelog/3.3.0/.release-notes.adoc.ftl b/src/changelog/3.3.0/.release-notes.adoc.ftl
diff --git a/src/changelog/3.3.0/.release.xml b/src/changelog/3.3.0/.release.xml
@@ -2,5 +2,5 @@
 <release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="https://logging.apache.org/xml/ns"
          xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
-         date="2025-10-22"
-         version="3.2.1"/>
+         date="2025-12-22"
+         version="3.3.0"/>
diff --git a/src/changelog/3.3.0/268-shorten-test-output.xml b/src/changelog/3.3.0/268-shorten-test-output.xml
diff --git a/src/changelog/3.3.0/274-newline-handling.xml b/src/changelog/3.3.0/274-newline-handling.xml
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>3.2.1</Version>
+    <Version>3.3.0</Version>
     <PackageId>log4net</PackageId>
     <Product>Apache log4net</Product>
     <Title>$(Product)</Title>
@@ -107,8 +107,8 @@ log4net is designed with two distinct goals in mind: speed and flexibility
     <!-- "Workaround" for missing '.pdb'-Files from NuGet Packages -->
     <!-- https://github.com/dotnet/sdk/issues/1458#issuecomment-420456386 -->
     <ItemGroup>
-      <ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdb')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).pdb')" />
-      <ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
+      <ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths-&gt;'%(RootDir)%(Directory)%(Filename).pdb')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).pdb')" />
+      <ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths-&gt;'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/site/antora/modules/ROOT/pages/manual/configuration/appenders/remotesyslogappender.adoc b/src/site/antora/modules/ROOT/pages/manual/configuration/appenders/remotesyslogappender.adoc
@@ -71,12 +71,12 @@ The new default is `Escape`.
 The available modes are:
 
 `Escape` (default since 3.3.0)::
-  Newlines are replaced with the escaped representations `\r` → "\\r" and `\n` → "\\n`.
+  Newlines are replaced with the escaped representations `\r` → "\\r" and `\n` → "\\n".
   The message is sent as a single syslog entry.
 
 `Split` (default before 3.3.0)::
   The message is split at each newline into multiple syslog entries.
-  Combined sequences (\r\n or \n\r) count as a single break.
+  Combined sequences (\r\n) count as a single break.
   This matches the behaviour in versions before 3.3.0.
 
 `Keep`::

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "log4net",`
`3`		`- "version": "3.2.1",`
	`3`	`+ "version": "3.3.0",`
`4`	`4`	`"description": "Log4Net is a logging framework for .NET",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`@@ -17,4 +17,4 @@`
`17`	`17`	`"@antora/site-generator-default": "^3.2.0-alpha.9",`
`18`	`18`	`"@asciidoctor/tabs": "^1.0.0-beta.6"`
`19`	`19`	`}`
`20`		`-}`
	`20`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`param(`
`2`		`- $Version = '3.2.1',`
	`2`	`+ $Version = '3.3.0',`
`3`	`3`	`$Preview = '1'`
`4`	`4`	`)`
`5`	`5`	`'building ...'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`param(`
`2`		`- $Version = '3.2.1'`
	`2`	`+ $Version = '3.3.0'`
`3`	`3`	`)`
`4`	`4`
`5`	`5`	`Set-StrictMode -Version Latest`