updated mail template for antora

Author: FreeAndNil

doc/MailTemplate.txt

@@ -3,12 +3,12 @@ Subject: [VOTE] Release Apache Log4net 3.1.0
 
 This is a vote to release the Apache Log4net 3.1.0.
 
-Website: https://logging.staged.apache.org/log4net/release/release-notes.html
+Website: https://logging.staged.apache.org/log4net/release-notes.html
 GitHub: https://github.com/apache/logging-log4net
-Commit: <todo insert>
+Commit: <todo>
 Distribution: https://dist.apache.org/repos/dist/dev/logging/log4net/3.1.0
 Signing key: 0x7D24496A230E29D6349A99EF583E491578F02D5D
-Review kit: https://logging.apache.org/log4net/release/release-review-instructions.html
+Review kit: https://logging.staged.apache.org/log4net/release-review.html
 
 Please download, test, and cast your votes on this mailing list.
 

doc/RELEASING.md

@@ -12,8 +12,8 @@ release version 2.0.123:
 
 1. Update the documentation under `src/site`
     - minimally, this means at least:
-        - `src/site/xdoc/release/release-notes.xml`
-            - copy an existing release section & think about:
+        - `src/changelog`
+            - copy an existing release folder & think about:
                 - what does this release change?
                 - bug fixes?
                 - enhancements
@@ -28,7 +28,7 @@ release version 2.0.123:
 4. Clone out the log4net doc repo (https://github.com/apache/logging-log4net-site)
     - check out the `asf-staging` branch
     - create a folder which includes the version, eg `log4net-2.0.123`
-5. Copy the contents of `target/site` from this repo into the folder created in (5)
+5. Copy the contents of `target/site` from this repo into the folder created in (4)
     - remember to either update or link in sdk docs from a prior release
 6. Update the symlinks in the base of the docs repo, ie:
     - 2.0.x -> 2.0.123
@@ -60,8 +60,9 @@ release version 2.0.123:
     - `svn co https://dist.apache.org/repos/dist/release/logging -N apache-dist-logging-release`
     - `cd apache-dist-logging-release`
     - `svn up log4net`
-    - copy in source & binary artifacts to respective locations
     - `svn delete` old items
+    - copy all artifacts to the new folder
+    - `svn add *`
     - `svn commit`
 16. push the .nupkg to nuget.org
     - via `dotnet`: `dotnet nuget push <path to package> -s nuget.org -k <your nuget api key>`
@@ -72,4 +73,4 @@ release version 2.0.123:
     - `git merge asf-staging`
 18. rename the release at github, eg to `rel/2.0.123`
     - 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`
+19. apply the next version by calling `./scripts/update-version.ps1 2.0.123 2.0.124`

scripts/build-release.ps1

@@ -0,0 +1,41 @@
+param(
+  $Version = '3.1.0'
+)
+"cleaning $PSScriptRoot/../build/ ..."
+rm -rf $PSScriptRoot/../build/*
+'building ...'
+dotnet test -c Release "-p:GeneratePackages=true;PackageVersion=$Version" $PSScriptRoot/../src/log4net/log4net.csproj
+'compressing source ...'
+pushd $PSScriptRoot/..
+git archive --format=zip --output $PSScriptRoot/../build/artifacts/apache-log4net-source-$Version.zip master
+popd
+'compressing binaries ...'
+cp $PSScriptRoot/verify-release.ps1 $PSScriptRoot/../build/artifacts/
+cp $PSScriptRoot/../LICENSE $PSScriptRoot/../build/Release/
+cp $PSScriptRoot/../NOTICE $PSScriptRoot/../build/Release/
+pushd $PSScriptRoot/../build/Release
+zip -r $PSScriptRoot/../build/artifacts/apache-log4net-binaries-$Version.zip .
+popd
+'signing ...'
+mv $PSScriptRoot/../build/artifacts/log4net.$Version.nupkg $PSScriptRoot/../build/artifacts/apache-log4net.$Version.nupkg
+pushd $PSScriptRoot/../build/artifacts
+gpg --armor --output ./apache-log4net.$Version.nupkg.asc --detach-sig ./apache-log4net.$Version.nupkg
+sha512sum -b ./apache-log4net.$Version.nupkg > ./apache-log4net.$Version.nupkg.sha512
+gpg --armor --output ./apache-log4net-source-$Version.zip.asc --detach-sig ./apache-log4net-source-$Version.zip
+sha512sum -b ./apache-log4net-source-$Version.zip > ./apache-log4net-source-$Version.zip.sha512
+gpg --armor --output ./apache-log4net-binaries-$Version.zip.asc --detach-sig ./apache-log4net-binaries-$Version.zip
+sha512sum -b ./apache-log4net-binaries-$Version.zip > ./apache-log4net-binaries-$Version.zip.sha512
+gpg --armor --output ./verify-release.ps1.asc --detach-sig ./verify-release.ps1
+sha512sum -b ./verify-release.ps1 > ./verify-release.ps1.sha512
+popd
+'cleaning site ...'
+rm -rf $PSScriptRoot/../target/*
+'building site ...'
+pushd $PSScriptRoot/..
+./mvnw site
+popd
+'creating tag ...'
+pause
+git tag "rc/$Version-rc1"
+'pushing tag ...'
+git push --tags