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 505210cee Site checkin for project PLC4X: Jenkins Tools
505210cee is described below
commit 505210cee956beaa0dfde9a7fe2c40ff9c833d26
Author: jenkins <[email protected]>
AuthorDate: Fri Aug 22 19:03:24 2025 +0000
Site checkin for project PLC4X: Jenkins Tools
---
plc4x/latest/developers/preparing/linux.html | 29 +++++++++++++-------------
plc4x/latest/developers/preparing/macos.html | 10 ++++-----
plc4x/latest/developers/preparing/windows.html | 14 +++++++------
plc4x/latest/developers/release/release.html | 15 +++++--------
search-index.js | 2 +-
5 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/plc4x/latest/developers/preparing/linux.html
b/plc4x/latest/developers/preparing/linux.html
index c2dac7044..cbf4acbc8 100644
--- a/plc4x/latest/developers/preparing/linux.html
+++ b/plc4x/latest/developers/preparing/linux.html
@@ -484,7 +484,7 @@
</div>
<div class="paragraph">
<p>The number of checks is highly dependent on which profiles are enabled.
-So for example the availability and version of the C compiler is only checked
if the <code>with-c</code> profile is enabled.</p>
+So for example, the availability and version of the C compiler is only checked
if the <code>with-c</code> profile is enabled.</p>
</div>
<div class="paragraph">
<p>If the check is reporting any issues, please feel free to follow the
corresponding steps in this guide to install the tools.</p>
@@ -514,7 +514,7 @@ So for example the availability and version of the C
compiler is only checked if
</div>
</div>
<div class="paragraph">
-<p>Yum based systems:</p>
+<p>Yum-based systems:</p>
</div>
<div class="literalblock">
<div class="content">
@@ -535,10 +535,10 @@ So for example the availability and version of the C
compiler is only checked if
</div>
</div>
<div class="paragraph">
-<p>If you get successful output indicating at least Java 11, you don’t
need to do anything.</p>
+<p>If you get output successfully indicating at least Java 11, you don’t
need to do anything.</p>
</div>
<div class="paragraph">
-<p>Apt based systems:</p>
+<p>Apt-based systems:</p>
</div>
<div class="literalblock">
<div class="content">
@@ -564,7 +564,7 @@ So for example the availability and version of the C
compiler is only checked if
</div>
</div>
<div class="paragraph">
-<p>Yum based systems:</p>
+<p>Yum-based systems:</p>
</div>
<div class="literalblock">
<div class="content">
@@ -572,7 +572,8 @@ So for example the availability and version of the C
compiler is only checked if
</div>
</div>
<div class="paragraph">
-<p>Using libpcap usually requires root privileges, however the java process
can be granted permission to do so by executing the following command.</p>
+<p>Using libpcap usually requires root privileges.
+However, the java process can be granted permission to do so by executing the
following command.</p>
</div>
<div class="literalblock">
<div class="content">
@@ -581,7 +582,7 @@ So for example the availability and version of the C
compiler is only checked if
</div>
<div class="paragraph">
<p><code>/path/to/java</code> however needs to be a real file and not a
symlink.
-So on my Ubuntu 22.04 system, where I installed java as described above the
command is as follows:</p>
+So on my Ubuntu 22.04 system, where I installed java as described above, the
command is as follows:</p>
</div>
<div class="literalblock">
<div class="content">
@@ -589,7 +590,7 @@ So on my Ubuntu 22.04 system, where I installed java as
described above the comm
</div>
</div>
<div class="paragraph">
-<p>Sometimes I had to set the uid to execute the java executable with the
permissions of the owner (root) …​ however this is quite suboptimal
solution.</p>
+<p>Sometimes I had to set the uid to execute the java executable with the
permissions of the owner (root) …​ However, this is a quite
suboptimal solution.</p>
</div>
<div class="literalblock">
<div class="content">
@@ -631,7 +632,7 @@ It seems that when running Linux on <code>aarch64</code>
(Apple’s Silicon
</div>
</div>
<div class="paragraph">
-<p>Yum based systems:</p>
+<p>Yum-based systems:</p>
</div>
<div class="literalblock">
<div class="content">
@@ -660,11 +661,11 @@ It seems that when running Linux on <code>aarch64</code>
(Apple’s Silicon
</div>
<div class="literalblock">
<div class="content">
-<pre>wget -q
https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
-sudo dpkg -i packages-microsoft-prod.deb
-sudo apt install apt-transport-https
+<pre>sudo mkdir -p /etc/apt/keyrings
+wget https://packages.microsoft.com/keys/microsoft.asc -O
/etc/apt/keyrings/microsoft.asc
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/microsoft.asc]
https://packages.microsoft.com/ubuntu/24.04/prod noble main" | sudo tee
/etc/apt/sources.list.d/microsoft-dotnet.list
sudo apt update
-sudo apt install dotnet-sdk-6.0</pre>
+sudo apt install dotnet-sdk-8.0</pre>
</div>
</div>
<div class="paragraph">
@@ -704,7 +705,7 @@ sudo apt install dotnet-sdk-6.0</pre>
</div>
</div>
<div class="paragraph">
-<p>Yum based systems:</p>
+<p>Yum-based systems:</p>
</div>
<div class="literalblock">
<div class="content">
diff --git a/plc4x/latest/developers/preparing/macos.html
b/plc4x/latest/developers/preparing/macos.html
index a8360a8ce..9124c78eb 100644
--- a/plc4x/latest/developers/preparing/macos.html
+++ b/plc4x/latest/developers/preparing/macos.html
@@ -490,7 +490,7 @@ So for example the availability and version of the C
compiler is only checked if
<p>Most libraries on Mac are installed using <code>Homebrew</code>.</p>
</div>
<div class="paragraph">
-<p>Make sure <code>Homebrew</code> ist installed in order to install most of
these.</p>
+<p>Make sure <code>Homebrew</code> ist installed to install most of these.</p>
</div>
<div class="literalblock">
<div class="content">
@@ -515,7 +515,7 @@ So for example the availability and version of the C
compiler is only checked if
</div>
<div class="paragraph">
<p>If you are running this command on a really fresh and clean system, it
might be that you are asked to finish installing the XCode commandline tools.
-If this happens, just follow the process and re-try after it has finished.</p>
+If this happens, follow the process and re-try after it has finished.</p>
</div>
<div class="paragraph">
<p>If you get a response that indicates that git needs to be installed, please
execute the following command:</p>
@@ -604,11 +604,11 @@ So it’s best to update to a newer version using
brew:</p>
<p>Microsoft is offering an installer for macOS which is available from <a
href="https://dotnet.microsoft.com/download/dotnet-core/2.2";>here</a>.</p>
</div>
<div class="paragraph">
-<p>Alternatively you can also install it via homebrew:</p>
+<p>Alternatively, you can also install it via homebrew:</p>
</div>
<div class="literalblock">
<div class="content">
-<pre>brew install --cask dotnet-sdk</pre>
+<pre>brew install --cask dotnet-sdk8</pre>
</div>
</div>
</div>
@@ -626,7 +626,7 @@ So it’s best to update to a newer version using
brew:</p>
<p>If you get a version of 3.0.0 or higher reported, you probably don’t
need to do anything.</p>
</div>
<div class="paragraph">
-<p>In order to install it, please execute the following command:</p>
+<p>To install it, please execute the following command:</p>
</div>
<div class="literalblock">
<div class="content">
diff --git a/plc4x/latest/developers/preparing/windows.html
b/plc4x/latest/developers/preparing/windows.html
index c159e1495..e27ea5d95 100644
--- a/plc4x/latest/developers/preparing/windows.html
+++ b/plc4x/latest/developers/preparing/windows.html
@@ -530,12 +530,14 @@ So for example the availability and version of the C
compiler is only checked if
</div>
</div>
<div class="paragraph">
-<p>If you get successful output, check that the version reported is at least
Java 11.
-If you need to install or update Java, unfortunately this doesn’t seem
to be available via Chocolatey, but needs to be installed directly from a
distribution.</p>
+<p>If you get output successfully, check that the version reported is at least
Java 11.
+If you need to install or update Java.
+Unfortunately, this doesn’t seem available via Chocolatey, but needs to
be installed directly from a distribution.</p>
</div>
<div class="paragraph">
<p>For Oracles OpenJDK 21 this would be from here: <a
href="https://learn.microsoft.com/de-de/java/openjdk/download";
class="bare">https://learn.microsoft.com/de-de/java/openjdk/download</a>
-If you are using a Windows VM on <code>aarch64</code> (Apple M1 or M2 virtual
machine), the download available from Microsoft build seem to be one of the few
options you have. When installing make sure to select the option to configure
the "JAVA_HOME" environment variable (deactivated per default).</p>
+If you are using a Windows VM on <code>aarch64</code> (Apple M1 or M2 virtual
machine), the download available from Microsoft build seems to be one of the
few options you have.
+When installing, make sure to select the option to configure the "JAVA_HOME"
environment variable (deactivated per default).</p>
</div>
</div>
</div>
@@ -543,15 +545,15 @@ If you are using a Windows VM on <code>aarch64</code>
(Apple M1 or M2 virtual ma
<h2 id="_optional_and_other_language_support"><a class="anchor"
href="#_optional_and_other_language_support"></a>Optional and other language
support</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>Git an Java should be all you need for building the Java part of PLC4X.</p>
+<p>Git and Java should be all you need for building the Java part of PLC4X.</p>
</div>
<div class="sect2">
<h3 id="_libpcap_for_raw_ethernet_support"><a class="anchor"
href="#_libpcap_for_raw_ethernet_support"></a>LibPCAP (For raw-ethernet
support)</h3>
<div class="paragraph">
-<p>In order to use the raw ethernet transport capabilities of PLC4X, we need
to ensure the NPcap library is installed.</p>
+<p>To use the raw ethernet transport capabilities of PLC4X, we need to ensure
the NPcap library is installed.</p>
</div>
<div class="paragraph">
-<p>In order to check if NPcap is installed, check the following
directories:</p>
+<p>To check if NPcap is installed, check the following directories:</p>
</div>
<div class="paragraph">
<p>64-bit versions:</p>
diff --git a/plc4x/latest/developers/release/release.html
b/plc4x/latest/developers/release/release.html
index b7cdb5683..289edabc8 100644
--- a/plc4x/latest/developers/release/release.html
+++ b/plc4x/latest/developers/release/release.html
@@ -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.13.0</pre>
+git merge -X theirs v0.13.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.13.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 1da9377ee..abcd0a96e 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.099]],["name/1",[1,1.533]],["text/1",[]],["component/1",[2,0.399]],["title/2-1",[3,34.134,4,29.69]],["name/2-1",[]],["text/2-1",[]],["component/2-1",[]],["title/2-2",[5,42.526]],["name/2-2",[]],["text/2-2",[]],["component/2-2",[]],["title/2-3",[6,11.927,7,12.564,8,9.44,9,16.176,10,15.839,11,21.028,12,27.488,13,12.253]],["name/2-3",[]],["text/2-3",[]],["c
[...]
\ No newline at end of file
+antoraSearch.initSearch(lunr,
{"index":{"version":"2.3.9","fields":["title","name","text","component"],"fieldVectors":[["title/1",[0,68.099]],["name/1",[1,1.533]],["text/1",[]],["component/1",[2,0.399]],["title/2-1",[3,34.134,4,29.69]],["name/2-1",[]],["text/2-1",[]],["component/2-1",[]],["title/2-2",[5,42.526]],["name/2-2",[]],["text/2-2",[]],["component/2-2",[]],["title/2-3",[6,11.927,7,12.564,8,9.44,9,16.176,10,15.839,11,21.028,12,27.488,13,12.253]],["name/2-3",[]],["text/2-3",[]],["c
[...]
\ No newline at end of file
