This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 528d02eac6 docs: Updated one of the post-release step documentations
528d02eac6 is described below
commit 528d02eac6eceba9d6ade6724bb856592bc7d24a
Author: Christofer Dutz <[email protected]>
AuthorDate: Tue Aug 5 18:05:25 2025 +0200
docs: Updated one of the post-release step documentations
---
.../modules/developers/pages/release/release.adoc | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/website/asciidoc/modules/developers/pages/release/release.adoc
b/website/asciidoc/modules/developers/pages/release/release.adoc
index 6639a8972f..0754cdbda0 100644
--- a/website/asciidoc/modules/developers/pages/release/release.adoc
+++ b/website/asciidoc/modules/developers/pages/release/release.adoc
@@ -494,7 +494,7 @@ As a lot of mirrors are serving our releases, it is the
Apache policy to clean o
This can be done like this:
- svn delete
https://dist.apache.org/repos/dist/release/plc4x/{current-full-version}/
-m"deleted version {current-full-version}"
+ svn delete
https://dist.apache.org/repos/dist/release/plc4x/{previously-latest-full-version}/
-m"deleted version {previously-current-full-version}"
After this https://dist.apache.org/repos/dist/release/plc4x should only
contain the latest release directory.
@@ -502,7 +502,7 @@ After this https://dist.apache.org/repos/dist/release/plc4x
should only contain
Probably the simplest part is releasing the Maven artifacts.
-In order to do this, the release manager logs into Nexus at
https://repository.apache.org/, selects the staging repository and clicks on
the `Release` button.
+To do this, the release manager logs into Nexus at
https://repository.apache.org/, selects the staging repository and clicks on
the `Release` button.
This will move all artifacts into the Apache release repository and delete the
staging repository after that.
@@ -528,18 +528,13 @@ This has to be done with git
[subs="verbatim,attributes"]
----
git checkout release
-git merge v{current-full-version}
-----
-
-When there are conflicts it could help to use the `theirs` merge strategy,
i.e.,
-
-[subs="verbatim,attributes"]
-----
git merge -X theirs v{current-full-version}
----
-Possibly a manual conflict resolution has to be done afterwards. After that,
changes need to
-be pushed.
+When there are conflicts the `theirs` merge strategy will most probably help
resolve them,
+
+Possibly a manual conflict resolution has to be done afterward.
+After that, changes need to be pushed.
== Updating GitHub Issues
