From 273d36b98e2124974ded99a0cc177e2ffb06c370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericDelaporte@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:23:11 +0100
Subject: [PATCH 1/3] Release 5.4.1

---
 build-common/NHibernate.props |  2 +-
 releasenotes.txt              | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 75b3475d442..ce7a53ef53a 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -5,7 +5,7 @@
     <NhVersion     Condition="'$(NhVersion)' == ''"    >5.4</NhVersion>
     <VersionPatch  Condition="'$(VersionPatch)'  == ''">1</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     <LangVersion Condition="'$(MSBuildProjectExtension)' != '.vbproj'">9.0</LangVersion>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
diff --git a/releasenotes.txt b/releasenotes.txt
index f13a62621a9..82e136618ac 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,4 +1,23 @@
-Build 5.4.0
+Build 5.4.1
+=============================
+
+Release notes - NHibernate - Version 5.4.1
+
+5 issues were resolved in this release.
+
+** Bug
+
+   * #3216 Enable one-to-one optimistic lock handling in mapping
+   * #3215 Count(Distinct ...) does not work
+   * #3203 Fix a wrong example in configuration documentation
+
+** Task
+
+   * #3232 Release 5.4.1
+   * #3206 Update actions/setup-dotnet action to v3
+
+
+Build 5.4.0
 =============================
 
 Release notes - NHibernate - Version 5.4.0

From cecf98c67fc428901d5f7bf8f71d2d256aa109f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericDelaporte@users.noreply.github.com>
Date: Tue, 7 Feb 2023 19:11:33 +0100
Subject: [PATCH 2/3] Add a missing possible breaking change

And remove a task done in another branch.
---
 releasenotes.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index 82e136618ac..b19ea7ea7a0 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -3,7 +3,7 @@
 
 Release notes - NHibernate - Version 5.4.1
 
-5 issues were resolved in this release.
+4 issues were resolved in this release.
 
 ** Bug
 
@@ -14,7 +14,9 @@ Release notes - NHibernate - Version 5.4.1
 ** Task
 
    * #3232 Release 5.4.1
-   * #3206 Update actions/setup-dotnet action to v3
+
+As part of releasing 5.4.1, a missing 5.4.0 possible breaking change has been added, about
+one-to-one associations and optimistic locking. See 5.4.0 possible breaking changes.
 
 
 Build 5.4.0
@@ -31,6 +33,8 @@ Release notes - NHibernate - Version 5.4.0
     * 201 issues were resolved in this release.
 
     ##### Possible Breaking Changes #####
+        * One-to-one changes does now trigger a version increment, consistently with the default behavior of other kinds of
+          associations.
         * Linq and criteria queries on unmapped entities will throw instead of returning an empty result list. See #1106, #1095.
         * The second level cache UpdateTimestampsCache does not use locks anymore. This may slightly increase the number of cases
           where stale data is returned by the query cache. See #2742.

From 2fa37d766d3f6d0d2cb885b87da3bacc5282dcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericDelaporte@users.noreply.github.com>
Date: Wed, 8 Feb 2023 17:40:24 +0100
Subject: [PATCH 3/3] Add a reference for the new breaking change

---
 releasenotes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index b19ea7ea7a0..420c05ea2ff 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -34,7 +34,7 @@ Release notes - NHibernate - Version 5.4.0
 
     ##### Possible Breaking Changes #####
         * One-to-one changes does now trigger a version increment, consistently with the default behavior of other kinds of
-          associations.
+          associations. See #3204.
         * Linq and criteria queries on unmapped entities will throw instead of returning an empty result list. See #1106, #1095.
         * The second level cache UpdateTimestampsCache does not use locks anymore. This may slightly increase the number of cases
           where stale data is returned by the query cache. See #2742.