From ef1f9ef112cbc21c94a8054f03740022e77f62bb Mon Sep 17 00:00:00 2001 From: Jan Friedrich Date: Thu, 26 Sep 2024 16:17:24 +0200 Subject: [PATCH 1/8] #189 separate review instructions for log4net --- doc/MailTemplate.Announce.txt | Bin 868 -> 427 bytes doc/MailTemplate.Result.txt | Bin 1082 -> 528 bytes doc/MailTemplate.txt | Bin 2556 -> 942 bytes doc/RELEASING.md | 14 ++-- src/site/site.xml | 1 + src/site/xdoc/release/manual/installation.xml | 8 +- .../release/release-review-instructions.xml | 77 ++++++++++++++++++ 7 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 src/site/xdoc/release/release-review-instructions.xml diff --git a/doc/MailTemplate.Announce.txt b/doc/MailTemplate.Announce.txt index cfc9f08146d8f12f4f56c8c970d1a468679e87dc..7c97476965a7e16a63b82efc44915498965f9a82 100644 GIT binary patch literal 427 zcmZXQ%TB{E5JmU?irFB6l-j&jkt(%9RIGx;V})3_$<#3X#RO{RF62u6KPHWmvHEe{zY|A{LDt+hNBhQd z9hb7CR*ik^6DKDzL9sR|>+E{5yWuFL?|bQ@K~5#Bp|?+MFdRfiTui6%G}Z@2Quzi9 C$CV8L literal 868 zcma))OG^VW6ot=P@IPcDD6})aRzkrd7FP;BR^nouj?-$}lxb@Jee0JvaY|`bLNb$k zbI&y@tc0&aJW&(!GWU>8&woxyO-JmJ40HezO)vG(Oz{JcR+ z>u2YJ^1pChz!`%&1kIpf9ofKbiEg^%S&2B)(Q9r}$l<}W;il?IA>4wLf z`!;GUECnn{U>w8a-(Z^p-y_~H-vZ|q8N9rq>{YO1` zH3Y(h;rk}PoR6pT@szm~g{+^9Q%YOKsG_2j%xx9SclnnrLW;}TWd1SDR?EeEHd*0J z8cAN_bK8njryi{gIA(Y39^g%n0QNeRcss^iTM?;PyC6MYzfgS;BV0JMCW~YRZVq0W z&zli;UW{X0V5mKAJDF&^sU~eGH!_7XgvzI!t7zKgtZ*CNA$b3iq(||d;CUd`6ju+g z{it)d+ZGbNrOKBsAcYH8xV<%wg#VSufNsuaO72@gFCK(Rcbl{l_N^;`tR%bk0LlNa Y=!&VuO>O8H+z=s#^6x)m0E{vC0p4PxN&o-= literal 1082 zcmds$OHaa35QWd$#Q$(NCK_q$YvoE4F)mC@1lriFKSu62M{&Z+8iwh zlhY}_4kU&*TA_9@NwLS&ayr%>RcHFf-avoFmT1V`2+d@~`wP1vOZ2Xj!mrNUt@^SL zp`)tRnH13#L(5s^w(22X39^ff>6dXDfH9{J8G696t{W@stWRH4PzA(nCJ?M}RP*t6 za0NRkGU9VG^m&)~j&z~>J^gJ_ZHiA1bPhzLqHYEn>!fk9Depra;W5YGHYcQ)8QANX ztF76^Ug=d&10pvVwt4UJ^tODx8XsRjbaA}ilr{`(4nragy*=K)IL5@-mD^X!kV#d$ Z@0eJMzP*=rYya}!|3H7;H=oIt+AnkHqfY<; diff --git a/doc/MailTemplate.txt b/doc/MailTemplate.txt index 24fa0453c3b82c244712ebc90652cdc4a47629a5..e073fdc26dd077a672be803e3ce388867b8ef2d1 100644 GIT binary patch literal 942 zcmb7DO^?$s5WV|X%ncAt($DRtLWpYHg#(Dywt~ZI4^A>o%%*l^Ptxsg;qMn8$nPYar z#z%a+s6*}VKyx=27PK$LM@66NfwV9tgCoo`ns|hbPeA82To7M zMNB)gY1Ganu<1zLnEhVy4BwH-3@Gi;(tEK|j;u;*QbwQqWc+$5*Ey0B?o{Aaw?*bOc9J+twWp zj0WKODlG@3XTpJBIni>6y`kVnIn97=c8HS9|+OTyX zqnipf?2Lu^7z%FA?qn_pRhCdm=b+Xl@|7czCn1IRv&LMKYVhRa)YO_nSaOL+Wdw_G zz>-bH)I1sjYRhe{CTvS7)xwf)0r}_E-*--@+g%GW zF`K=d%glW9&E@RxUmeTswFNt~zTMh;8!;Ym4eg3&(=xl}?%4(FP1eTDKD8%yY&X`m z@67gW5;dII7yD!#+p}-z`^?ISJF|jkuK7jud`-Yy;9HBU&P%~+1{ZypTg;Nn zxRW^cqTlt&Y zCAbjZjhYwBG4^$~{vT1DodS;%<67x4Dsx7ddehw5iQZpEM#R+{q;g`Ud{Is-8^_GO zjm+*cr$~-@cj0fsJ7?D-md~bpABwivxkg$@eXqV$S9ShlJ^nG ziv6@r+qJf>b8Xp6s;Q0tE7V$>@h&rKab=s)7PI@dVXv6mi?geYHW}|D(PsAsw<50l zs8Xfk=?)Ca_6+PVU`-V#j`W?ecE-EMm*xTpb9fu`<<+U06^D}a8op%z5UuW;z9e5( z;6b!3nN-;~GY#q<8Y#z1G=;s3_#4cnxGFnFTx2*sapEwO&iJ0VqNXJGB4@mbU; zDaB6y-rI828rUz*^}J4+RiE=V%9@kbRAYT&Ud7d_;0;)v@3i%dPzB0s#mLc|R;-4Y zv0_ybX+&R=PS2{w+>XRW(@r1Nm~2X0V*7D@r7lNUM*I#9iiYFY4&PPfMOo!>Qw51b zRm~MK9P&r@}MIG%NrgTad(NmXhOr@2{ zUJF%C(%pq$Rr?LnVxk!@q0rr#Rk&BbpV#>`k^$>EI07B0&GUkh`h}wE-NbVxAfvvb zHRZnkAJRzYtj=S_dk`gM-Txl+9w4c8Rd(5nQm#msdX4@JQl>fDghE~i`kwwK(&?#j ziB6-Gj|qD^_k}>cUHPZpA{5@gyl0jfw1`=qH>p>S&`|C@L|gd}7Wmhaja$6y@g>Yh d_R)4?1QvOc!})pKJ;V!nEba0vF_HdR{s1Z9sr>)| diff --git a/doc/RELEASING.md b/doc/RELEASING.md index 30a265dd..a2f75368 100644 --- a/doc/RELEASING.md +++ b/doc/RELEASING.md @@ -27,9 +27,6 @@ release version 2.0.123: - currently, this _must_ happen on a windows machine because of older .net framework requirements which cannot be met on a Linux machine (or at least, I haven't figured out how - in particular CF) - - TODO: the following are still manual and need to be built into the `release` script: - - log4net.build: update package.version property - - pom.xml: update version 4. Sign release artifacts (zips & nupkg) under `build/artifacts` - eg `gpg --armor --output log4net-2.0.123.nupkg.asc --detach-sig log4net-2.0.123.nupkg` - there is an accompanying `sign-log4net-libraries.sh/ps1` under scripts which you could invoke if you cd @@ -58,12 +55,12 @@ release version 2.0.123: - `svn co https://dist.apache.org/repos/dist/dev/logging -N apache-dist-logging-dev` - `cd apache-dist-logging-dev` - `svn up log4net` - - copy in source & binary artifacts to respective locations - `svn delete *` + - `mkdir 2.0.123` + - copy all artifacts to the new folder - `svn add *` - - `svn commit` - - check https://dist.apache.org/repos/dist/dev/logging/log4net/binaries/ - and https://dist.apache.org/repos/dist/dev/logging/log4net/source/ + - `svn commit -m 'log4net 2.0.123'` + - check https://dist.apache.org/repos/dist/dev/logging/log4net/2.0.123/ 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! @@ -82,4 +79,5 @@ release version 2.0.123: - `git pull --rebase` - `git merge asf-staging` 18. rename the release at github, eg to `rel/2.0.123` - - double-check that the `rel` tag is created \ No newline at end of file + - double-check that the `rel` tag is created +19. apply the next version by calling `./scripts/update-version.ps1 2.0.123 2.0.124` \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml index ebe6e7a3..8ddf83ea 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -31,6 +31,7 @@ + diff --git a/src/site/xdoc/release/manual/installation.xml b/src/site/xdoc/release/manual/installation.xml index 94738fe0..ef17642b 100644 --- a/src/site/xdoc/release/manual/installation.xml +++ b/src/site/xdoc/release/manual/installation.xml @@ -1,13 +1,13 @@ + + + Apache log4net release verification + + + +
+

+ Releases of log4net can be verified with following steps: +

+
    +
  1. +

    Check out the release distribution

    + 
    svn co https://dist.apache.org/repos/dist/dev/logging/log4net/source/{releaseVersion} log4net-{releaseVersion} && cd $_
    +
    2. +
  2. +

    Verify checksums

    + 
    sha512sum --check *.sha512
    +
    3. +
  3. +

    Import the release manager GPG keys, unless you haven’t earlier done so

    + 
    wget -O - https://downloads.apache.org/logging/KEYS | gpg --import
    +
    4. +
  4. +

    Verify signatures

    + 
    for sigFile in *.asc; do gpg --verify $sigFile; done
    +
    5. +
  5. +

    Extract sources

    + 
    umask 0022
+unzip -q *-src.zip -d src
+cd src
    +
    6. +
  6. +

    Verify the build (docker)

    +
      +
    • install docker (if you haven't already)
      • +
    • + 
      docker build -t log4net-builder .
+docker run -it log4net-builder
+# this will
+# - install all dependencies in the container
+# - build src/log4net.sln
+# inside the container run
+dotnet test /logging-log4net/src/log4net.sln
+
      +
      • +
    +
    7. +
  7. +

    Verify the build (Windows)

    + 
    winget install -e --id Mono.Mono
+winget install Microsoft.DotNet.SDK.8
+dotnet test ./log4net.sln`
+
    +
    8. +
+
+ + \ No newline at end of file From 428d723965afc84c443df3976164b8f6fde2b5cf Mon Sep 17 00:00:00 2001 From: Jan Friedrich Date: Thu, 26 Sep 2024 21:26:20 +0200 Subject: [PATCH 2/8] implemented release verification in powershell for windows #190 --- scripts/verify-release.ps1 | 59 +++++++++++++++++++ .../release/release-review-instructions.xml | 44 +++++++++----- 2 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 scripts/verify-release.ps1 diff --git a/scripts/verify-release.ps1 b/scripts/verify-release.ps1 new file mode 100644 index 00000000..373a8581 --- /dev/null +++ b/scripts/verify-release.ps1 @@ -0,0 +1,59 @@ +Param ( + [Parameter()] + [System.IO.DirectoryInfo]$Directory +) + +Set-StrictMode -Version Latest +$ErrorActionPreference = 'Stop' +if (!$Directory) +{ + $Directory = $PSScriptRoot +} + +function Verify-Hash +{ + param + ( + [Parameter(Mandatory=$true, HelpMessage='The file containing the hash.')] + [System.IO.FileInfo]$File + ) + $Line = @(Get-Content $File.FullName)[0] + $Fields = $Line -split '\s+' + $Hash = $Fields[0].Trim().ToUpper() + $Filename = $Fields[1].Trim() + if ($Filename.StartsWith("*")) + { + $Filename = $Filename.Substring(1).Trim() + } + + $ComputedHash = (Get-FileHash -Algorithm 'SHA512' "$($File.DirectoryName)/$Filename").Hash.ToUpper() + + if($Hash -eq $ComputedHash) + { + "$($Filename): Passed" + } + else + { + Write-Error "$($Filename): Not Passed" -ErrorAction Continue + Write-Error "Read from file: $Hash" -ErrorAction Continue + Write-Error "Computed: $ComputedHash" -ErrorAction Continue + } +} + +foreach ($File in Get-ChildItem $Directory *.sha512) +{ + Verify-Hash $File +} + +Invoke-WebRequest https://downloads.apache.org/logging/KEYS -OutFile $Directory/KEYS +gpg --import $Directory/KEYS + +foreach ($File in Get-ChildItem $Directory *.asc) +{ + gpg --verify $File +} + +Expand-Archive $Directory/*source*.zip -DestinationPath $Directory/src +$VersionDirectory = "$Directory/src/$(@(Get-ChildItem $Directory/src)[0])" +$VersionDirectory +pushd $VersionDirectory \ No newline at end of file diff --git a/src/site/xdoc/release/release-review-instructions.xml b/src/site/xdoc/release/release-review-instructions.xml index b006c774..27294390 100644 --- a/src/site/xdoc/release/release-review-instructions.xml +++ b/src/site/xdoc/release/release-review-instructions.xml @@ -31,22 +31,35 @@ limitations under the License. 
svn co https://dist.apache.org/repos/dist/dev/logging/log4net/source/{releaseVersion} log4net-{releaseVersion} && cd $_
  • -

    Verify checksums

    - 
    sha512sum --check *.sha512
    -
    • -
  • -

    Import the release manager GPG keys, unless you haven’t earlier done so

    - 
    wget -O - https://downloads.apache.org/logging/KEYS | gpg --import
    -
    • -
  • -

    Verify signatures

    - 
    for sigFile in *.asc; do gpg --verify $sigFile; done
    -
    • -
  • -

    Extract sources

    - 
    umask 0022
+          
      
+            
    • 
+              Verify and extract (Windows)
+              
      & ./verify-release.ps1
      
+            
      • 
+            
    • 
+              Verify and extract (Linux)
+              
        
+                
      1. 
+                  
        Verify checksums
        
+                  
        sha512sum --check *.sha512
        
+                
        2. 
+                
      2. 
+                  
        Import the release manager GPG keys, unless you haven’t earlier done so
        
+                  
        wget -O - https://downloads.apache.org/logging/KEYS | gpg --import
        
+                
        3. 
+                
      3. 
+                  
        Verify signatures
        
+                  
        for sigFile in *.asc; do gpg --verify $sigFile; done
        
+                
        4. 
+                
      4. 
+                  
        Extract sources
        
+                  
        umask 0022
 unzip -q *-src.zip -d src
 cd src
        
+                
        5. 
+              
      
+            
      • 
+

  • Verify the build (docker)

    @@ -68,8 +81,7 @@ dotnet test /logging-log4net/src/log4net.sln

    Verify the build (Windows)

    winget install -e --id Mono.Mono
 winget install Microsoft.DotNet.SDK.8
-dotnet test ./log4net.sln`
-
    +dotnet test ./log4net.sln
    • From 75c9677f711170dfd851ec90310b5b055b115c3b Mon Sep 17 00:00:00 2001 From: Jan Friedrich Date: Thu, 26 Sep 2024 21:50:07 +0200 Subject: [PATCH 3/8] implemented release verification in powershell for windows #190 --- scripts/verify-release.ps1 | 2 +- .../release/release-review-instructions.xml | 89 ++++++++++--------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/scripts/verify-release.ps1 b/scripts/verify-release.ps1 index 373a8581..6eb46861 100644 --- a/scripts/verify-release.ps1 +++ b/scripts/verify-release.ps1 @@ -46,7 +46,7 @@ foreach ($File in Get-ChildItem $Directory *.sha512) } Invoke-WebRequest https://downloads.apache.org/logging/KEYS -OutFile $Directory/KEYS -gpg --import $Directory/KEYS +gpg --import -q $Directory/KEYS foreach ($File in Get-ChildItem $Directory *.asc) { diff --git a/src/site/xdoc/release/release-review-instructions.xml b/src/site/xdoc/release/release-review-instructions.xml index 27294390..46001e74 100644 --- a/src/site/xdoc/release/release-review-instructions.xml +++ b/src/site/xdoc/release/release-review-instructions.xml @@ -25,65 +25,70 @@ limitations under the License.

    Releases of log4net can be verified with following steps:

    -
      +
      • -

        Check out the release distribution

        - 
        svn co https://dist.apache.org/repos/dist/dev/logging/log4net/source/{releaseVersion} log4net-{releaseVersion} && cd $_
        + Windows +
          +
        1. + Check out the release distribution + 
          svn co https://dist.apache.org/repos/dist/dev/logging/log4net/source/{releaseVersion} log4net-{releaseVersion}
+pushd log4net-{releaseVersion}
          +
          2. +
        2. + Verify and extract + 
          & ./verify-release.ps1
          +
          3. +
        3. +

          Verify the build (Windows)

          + 
          winget install -e --id Mono.Mono
+    winget install Microsoft.DotNet.SDK.8
+    dotnet test ./log4net.sln
          +
          4. +
      • -
          + Linux +
          1. - Verify and extract (Windows) - 
            & ./verify-release.ps1
            +

            Check out the release distribution

            + 
            svn co https://dist.apache.org/repos/dist/dev/logging/log4net/{releaseVersion} log4net-{releaseVersion} && cd $_
          2. - Verify and extract (Linux) -
              -
            1. -

              Verify checksums

              - 
              sha512sum --check *.sha512
              -
              2. -
            2. -

              Import the release manager GPG keys, unless you haven’t earlier done so

              - 
              wget -O - https://downloads.apache.org/logging/KEYS | gpg --import
              -
              3. -
            3. -

              Verify signatures

              - 
              for sigFile in *.asc; do gpg --verify $sigFile; done
              -
              4. -
            4. -

              Extract sources

              - 
              umask 0022
+              
              Verify checksums
              
+              
              sha512sum --check *.sha512
              
+
              5. +
            5. +

              Import the release manager GPG keys, unless you haven’t earlier done so

              + 
              wget -O - https://downloads.apache.org/logging/KEYS | gpg --import
              +
              6. +
            6. +

              Verify signatures

              + 
              for sigFile in *.asc; do gpg --verify $sigFile; done
              +
              7. +
            7. +

              Extract sources

              + 
              umask 0022
 unzip -q *-src.zip -d src
 cd src
              -
              8. -
            3. -
        -
        • -
      • -

        Verify the build (docker)

        -
          -
        • install docker (if you haven't already)
        • - 
          docker build -t log4net-builder .
+              
          Verify the build (docker)
          
+              
            
+                
          • install docker (if you haven't already) 
            • 
+                
          • 
+                  
            docker build -t log4net-builder .
 docker run -it log4net-builder
 # this will
 # - install all dependencies in the container
 # - build src/log4net.sln
 # inside the container run
-dotnet test /logging-log4net/src/log4net.sln
-              
            
+dotnet test /logging-log4net/src/log4net.sln
          +
          • +
        • -
      - -
    1. -

      Verify the build (Windows)

      - 
      winget install -e --id Mono.Mono
-winget install Microsoft.DotNet.SDK.8
-dotnet test ./log4net.sln
      +
    - + \ No newline at end of file From ce9eca1c7219e7f512256ce0c4a28080b04eb3dd Mon Sep 17 00:00:00 2001 From: Jan Friedrich Date: Thu, 26 Sep 2024 21:55:28 +0200 Subject: [PATCH 4/8] implemented release verification in powershell for windows #190 --- src/site/xdoc/release/release-review-instructions.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/site/xdoc/release/release-review-instructions.xml b/src/site/xdoc/release/release-review-instructions.xml index 46001e74..4040027e 100644 --- a/src/site/xdoc/release/release-review-instructions.xml +++ b/src/site/xdoc/release/release-review-instructions.xml @@ -39,10 +39,10 @@ pushd log4net-{releaseVersion} 
    & ./verify-release.ps1
  • -

    Verify the build (Windows)

    +

    Verify the build

    winget install -e --id Mono.Mono
-    winget install Microsoft.DotNet.SDK.8
-    dotnet test ./log4net.sln
    +winget install Microsoft.DotNet.SDK.8 +dotnet test ./src/log4net.sln
    • @@ -72,7 +72,7 @@ unzip -q *-src.zip -d src cd src
  • -

    Verify the build (docker)

    +

    Verify the build

    • install docker (if you haven't already)
    • From 97a9389900ca7e1df8777bd0de32c9f5fef67ec5 Mon Sep 17 00:00:00 2001 From: Jan Friedrich Date: Thu, 26 Sep 2024 22:02:25 +0200 Subject: [PATCH 5/8] implemented release verification in powershell for windows #190 --- src/site/xdoc/release/release-review-instructions.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/site/xdoc/release/release-review-instructions.xml b/src/site/xdoc/release/release-review-instructions.xml index 4040027e..c6ea2c65 100644 --- a/src/site/xdoc/release/release-review-instructions.xml +++ b/src/site/xdoc/release/release-review-instructions.xml @@ -27,8 +27,13 @@ limitations under the License.

      • - Windows + Windows (PowerShell)
          +
        1. + Prerequisites + 
          winget install -e --id GnuPG.Gpg4win
+winget install -e --id TortoiseSVN.TortoiseSVN
          +
        2. Check out the release distribution 
          svn co https://dist.apache.org/repos/dist/dev/logging/log4net/source/{releaseVersion} log4net-{releaseVersion}

From 091821a9f4a592f53cd129bea5e986e86b9931e0 Mon Sep 17 00:00:00 2001
From: Jan Friedrich 
Date: Fri, 27 Sep 2024 00:00:18 +0200
Subject: [PATCH 6/8] added missing license header #190

---
 src/log4net/Core/Serializable.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/log4net/Core/Serializable.cs b/src/log4net/Core/Serializable.cs
index b88f0612..cfef7ed5 100644
--- a/src/log4net/Core/Serializable.cs
+++ b/src/log4net/Core/Serializable.cs
@@ -1,3 +1,21 @@
+#region Apache License
+//
+// 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.
+//
+#endregion
 #if NET462_OR_GREATER
 global using Log4NetSerializableAttribute = System.SerializableAttribute;
 global using ILog4NetSerializable = System.Runtime.Serialization.ISerializable;

From ec8bd4eacc9b5c3775851d4233a0b4ad581437d7 Mon Sep 17 00:00:00 2001
From: Jan Friedrich 
Date: Fri, 27 Sep 2024 09:48:38 +0200
Subject: [PATCH 7/8] #189 separate Vote result from announcement

---
 doc/MailTemplate.Result.txt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/MailTemplate.Result.txt b/doc/MailTemplate.Result.txt
index 5227f5ec..d52577b6 100644
--- a/doc/MailTemplate.Result.txt
+++ b/doc/MailTemplate.Result.txt
@@ -1,15 +1,12 @@
 To: dev@logging.apache.org
 Subject: [RESULT][VOTE] Release Apache Log4net 3.0.1
 
-Hi,
+and here is my +1.
 
-with +3 binding votes (Davyd, Volkan and myself), apache log4net 3.0.1 is released and available:
-https://github.com/apache/logging-log4net/releases/tag/rel%2F3.0.1
+With that the vote passed with 3 +1 votes from Davyd McColl, Christian Grobmeier and myself.
+I will continue the release process.
 
-Source snapshot at:
-https://downloads.apache.org/logging/log4net/source/apache-log4net-source-3.0.1.zip
-
-Thanks
+Jan
 
 ---------------------------------------------------------------------------------------------------
 This is a vote to release the Apache Log4net 3.0.1.

From f140eb38dc9be911f9e9938743647ceeca07b807 Mon Sep 17 00:00:00 2001
From: Jan Friedrich 
Date: Fri, 27 Sep 2024 10:52:16 +0200
Subject: [PATCH 8/8] #189 Link to Github rc no longer needed

---
 doc/MailTemplate.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/MailTemplate.txt b/doc/MailTemplate.txt
index e073fdc2..942c4c75 100644
--- a/doc/MailTemplate.txt
+++ b/doc/MailTemplate.txt
@@ -5,9 +5,8 @@ This is a vote to release the Apache Log4net 3.0.1.
 
 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/rc/3.0.1-rc1
 Commit: 
-Distribution: https://dist.apache.org/repos/dist/dev/logging/log4net
+Distribution: https://dist.apache.org/repos/dist/dev/logging/log4net/3.0.1
 Signing key: 0x7D24496A230E29D6349A99EF583E491578F02D5D
 Review kit: https://logging.apache.org/log4net/release/release-review-instructions.html
 
@@ -16,7 +15,6 @@ 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
+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