This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/plc4x-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 0e4951f80 Site checkin for project PLC4X: Jenkins Tools
0e4951f80 is described below
commit 0e4951f809a24c74ac5a60367a4a7588f5e1f5d7
Author: jenkins <[email protected]>
AuthorDate: Tue Aug 5 17:00:43 2025 +0000
Site checkin for project PLC4X: Jenkins Tools
---
plc4x/pre-release/developers/release/release.html | 17 ++++++-----------
search-index.js | 2 +-
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/plc4x/pre-release/developers/release/release.html
b/plc4x/pre-release/developers/release/release.html
index 60cd1fced..14b97fb2a 100644
--- a/plc4x/pre-release/developers/release/release.html
+++ b/plc4x/pre-release/developers/release/release.html
@@ -1279,7 +1279,7 @@ This is done by moving them inside the Apache SVN.</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>svn delete
https://dist.apache.org/repos/dist/release/plc4x/{current-full-version}/
-m"deleted version {current-full-version}"</pre>
+<pre>svn delete
https://dist.apache.org/repos/dist/release/plc4x/{previously-latest-full-version}/
-m"deleted version {previously-current-full-version}"</pre>
</div>
</div>
<div class="paragraph">
@@ -1294,7 +1294,7 @@ This is done by moving them inside the Apache SVN.</p>
<p>Probably the simplest part is releasing the Maven artifacts.</p>
</div>
<div class="paragraph">
-<p>In order to do this, the release manager logs into Nexus at <a
href="https://repository.apache.org/";
class="bare">https://repository.apache.org/</a>, selects the staging repository
and clicks on the <code>Release</code> button.</p>
+<p>To do this, the release manager logs into Nexus at <a
href="https://repository.apache.org/";
class="bare">https://repository.apache.org/</a>, selects the staging repository
and clicks on the <code>Release</code> button.</p>
</div>
<div class="paragraph">
<p>This will move all artifacts into the Apache release repository and delete
the staging repository after that.</p>
@@ -1336,20 +1336,15 @@ This has to be done with git</p>
<div class="listingblock">
<div class="content">
<pre>git checkout release
-git merge v0.14.0</pre>
+git merge -X theirs v0.14.0</pre>
</div>
</div>
<div class="paragraph">
-<p>When there are conflicts it could help to use the <code>theirs</code> merge
strategy, i.e.,</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>git merge -X theirs v0.14.0</pre>
-</div>
+<p>When there are conflicts the <code>theirs</code> merge strategy will most
probably help resolve them,</p>
</div>
<div class="paragraph">
-<p>Possibly a manual conflict resolution has to be done afterwards. After
that, changes need to
-be pushed.</p>
+<p>Possibly a manual conflict resolution has to be done afterward.
+After that, changes need to be pushed.</p>
</div>
</div>
</div>
diff --git a/search-index.js b/search-index.js
index 58c1e7f12..512f99d8a 100644
--- a/search-index.js
+++ b/search-index.js
@@ -1 +1 @@
-antoraSearch.initSearch(lunr,
{"index":{"version":"2.3.9","fields":["title","name","text","component"],"fieldVectors":[["title/1",[0,68.031]],["name/1",[1,1.532]],["text/1",[]],["component/1",[2,0.399]],["title/2-1",[3,34.078,4,29.636]],["name/2-1",[]],["text/2-1",[]],["component/2-1",[]],["title/2-2",[5,42.465]],["name/2-2",[]],["text/2-2",[]],["component/2-2",[]],["title/2-3",[6,11.897,7,12.533,8,9.412,9,16.213,10,15.806,11,20.991,12,27.447,13,12.223]],["name/2-3",[]],["text/2-3",[]],[
[...]
\ No newline at end of file
+antoraSearch.initSearch(lunr,
{"index":{"version":"2.3.9","fields":["title","name","text","component"],"fieldVectors":[["title/1",[0,68.031]],["name/1",[1,1.532]],["text/1",[]],["component/1",[2,0.399]],["title/2-1",[3,34.078,4,29.636]],["name/2-1",[]],["text/2-1",[]],["component/2-1",[]],["title/2-2",[5,42.465]],["name/2-2",[]],["text/2-2",[]],["component/2-2",[]],["title/2-3",[6,11.897,7,12.533,8,9.412,9,16.213,10,15.806,11,20.991,12,27.447,13,12.223]],["name/2-3",[]],["text/2-3",[]],[
[...]
\ No newline at end of file
