diff --git a/website/antora-playbook.yml b/website/antora-playbook.yml index fd5d448ffa8..2e0518fb7bc 100644 --- a/website/antora-playbook.yml +++ b/website/antora-playbook.yml @@ -19,11 +19,14 @@ site: title: PLC4X content: - sources: + sources: - url: ../.. branches: HEAD edit_url: '{web_url}/edit/develop/{path}' start_path: website/asciidoc + - url: https://github.com/apache/plc4x.git + branches: ['rel/0.12'] + start_path: website/asciidoc ui: bundle: url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable @@ -38,4 +41,6 @@ asciidoc: attributes: allow-uri-read: 'true' output: - dir: ./target/site \ No newline at end of file + dir: ./target/site +runtime: + fetch: true \ No newline at end of file diff --git a/website/asciidoc/antora.yml b/website/asciidoc/antora.yml index 43be8010a35..d21406d56ad 100644 --- a/website/asciidoc/antora.yml +++ b/website/asciidoc/antora.yml @@ -17,7 +17,7 @@ # under the License. # name: plc4x -version: '0.13.0-SNAPSHOT' +version: 'latest' prerelease: True title: PLC4X start_page: users:index.adoc @@ -25,3 +25,8 @@ nav: - modules/ROOT/nav.adoc - modules/users/nav.adoc - modules/developers/nav.adoc +asciidoc: + attributes: + current-last-released-version: '0.13.0-SNAPSHOT' + current-full-version: '0.13.0' + diff --git a/website/asciidoc/modules/developers/pages/building.adoc b/website/asciidoc/modules/developers/pages/building.adoc index 2a70162c82a..c2989fce7de 100644 --- a/website/asciidoc/modules/developers/pages/building.adoc +++ b/website/asciidoc/modules/developers/pages/building.adoc @@ -156,8 +156,8 @@ repositories { } dependencies { - implementation group: 'org.apache.plc4x', name: 'plc4j-api', version: '{page-component-version}' - implementation group: 'org.apache.plc4x', name: 'plc4j-driver-s7', version: '{page-component-version}' - implementation group: 'org.apache.plc4x', name: 'plc4j-connection-pool', version: '{page-component-version}' + implementation group: 'org.apache.plc4x', name: 'plc4j-api', version: '{current-last-released-version}' + implementation group: 'org.apache.plc4x', name: 'plc4j-driver-s7', version: '{current-last-released-version}' + implementation group: 'org.apache.plc4x', name: 'plc4j-connection-pool', version: '{current-last-released-version}' } ---- diff --git a/website/asciidoc/modules/developers/pages/code-gen/index.adoc b/website/asciidoc/modules/developers/pages/code-gen/index.adoc index 996eb64927c..ef4bb937dd4 100644 --- a/website/asciidoc/modules/developers/pages/code-gen/index.adoc +++ b/website/asciidoc/modules/developers/pages/code-gen/index.adoc @@ -199,7 +199,7 @@ Here's an example of a driver pom for building a `S7` driver for `java`: org.apache.plc4x.plugins plc4x-code-generation - {page-component-version} + {current-last-released-version} test-java-s7-driver @@ -231,13 +231,13 @@ Here's an example of a driver pom for building a `S7` driver for `java`: org.apache.plc4x.plugins plc4x-code-generation-driver-base-java - {page-component-version} + {current-last-released-version} org.apache.plc4x.plugins plc4x-code-generation-language-java - {page-component-version} + {current-last-released-version} provided @@ -245,7 +245,7 @@ Here's an example of a driver pom for building a `S7` driver for `java`: org.apache.plc4x.plugins plc4x-code-generation-protocol-s7 - {page-component-version} + {current-last-released-version} provided @@ -263,7 +263,7 @@ The dependency: org.apache.plc4x.plugins plc4x-code-generation-driver-base-java - {page-component-version} + {current-last-released-version} .... @@ -276,7 +276,7 @@ The definitions of both the `s7` protocol and `java` language are provided by th org.apache.plc4x.plugins plc4x-code-generation-language-java - {page-component-version} + {current-last-released-version} provided @@ -289,7 +289,7 @@ and: org.apache.plc4x.plugins plc4x-code-generation-protocol-s7 - {page-component-version} + {current-last-released-version} provided diff --git a/website/asciidoc/modules/developers/pages/contributing.adoc b/website/asciidoc/modules/developers/pages/contributing.adoc index 191571ef606..b06500721c7 100644 --- a/website/asciidoc/modules/developers/pages/contributing.adoc +++ b/website/asciidoc/modules/developers/pages/contributing.adoc @@ -136,7 +136,7 @@ The same model is used for a wide variety of other projects, so it should be pre - `release` contains the latest released state. - Development is performed on the `develop` branch. - Features are developed in Feature-Branches with a prefix `feature/` -- Each minor release has a corresponding release branch `rel/{page-component-version}` +- Each minor release has a corresponding release branch `rel/{current-last-released-version}` - A release branch is spawned from `develop` only - Bugfix releases don't have a dedicated release branch, they are just performed on the corresponding minor versions release branch diff --git a/website/asciidoc/modules/developers/pages/release/build-tools.adoc b/website/asciidoc/modules/developers/pages/release/build-tools.adoc index 73ee4342da6..fee79120f17 100644 --- a/website/asciidoc/modules/developers/pages/release/build-tools.adoc +++ b/website/asciidoc/modules/developers/pages/release/build-tools.adoc @@ -38,7 +38,7 @@ According to SemVer, we have: Major, Minor and Bugfix releases. For each new Major and Minor release we create a new branch at the beginning of a code-freeze phase. -So if currently the project version in develop is `{{page-component-version}}`, we create a branch `release/{code-generation-short-version}`. +So if currently the project version in develop is `{{current-last-released-version}}`, we create a branch `release/{code-generation-short-version}`. When creating the branch is exactly the moment in which the version in `develop` is incremented to the next minor version. @@ -50,7 +50,7 @@ This is the version the `develop` branch will be changed to. mvn release:branch -DbranchName=releases/code-generation/{minor-version} Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version. -So in case of preparing the release branch for `{{page-component-version}}` the command would be the following: +So in case of preparing the release branch for `{{current-last-released-version}}` the command would be the following: [subs="verbatim,attributes"] ---- @@ -130,7 +130,7 @@ After that, the following command will to all preparation steps for the release: In general the plugin will now ask you 3 questions: 1. The version we want to release as (It will suggest the version you get by omitting the `-SNAPSHOT` suffix, keep it as it is) -2. The name of the tag the release commit will be tagged with in the SCM (Name it `releases/code-generation/{release-version}` (`releases/code-generation/{{page-component-version}}` in our case) +2. The name of the tag the release commit will be tagged with in the SCM (Name it `releases/code-generation/{release-version}` (`releases/code-generation/{{current-last-released-version}}` in our case) 3. The next development version (The version present in the pom after the release) (leave it as it is suggested by the plugin) Usually for 1 and 3 the defaults are just fine, make sure the tag name is correct as this usually is different. @@ -142,7 +142,7 @@ What the plugin now does, is automatically to execute the following operations: 1. Check we aren't referencing any `SNAPSHOT` dependencies. 2. Update all pom versions to the release version. 3. Run a build with all tests -4. Commit the changes (commit message: `[maven-release-plugin] prepare release releases/code-generation/{{page-component-version}}`) +4. Commit the changes (commit message: `[maven-release-plugin] prepare release releases/code-generation/{{current-last-released-version}}`) 5. Push the commit 6. Tag the commit 7. Update all poms to the next development version. @@ -156,7 +156,7 @@ is in the correct state. Please select the release branch and verify the commit image::release-git-history.png[] -It is important that the commit with the message "[maven-release-plugin] prepare release releases/code-generation/{{page-component-version}}" is tagged with the release tag (in this case releases/code-generation/{{page-component-version}}) +It is important that the commit with the message "[maven-release-plugin] prepare release releases/code-generation/{{current-last-released-version}}" is tagged with the release tag (in this case releases/code-generation/{{current-last-released-version}}) If you check the commit itself, it should mainly consist of version updates like this: @@ -230,20 +230,20 @@ The directory structure of this directory is as follows: [subs="verbatim,attributes"] ---- ./KEYS - ./build-tools/code-generation/{{page-component-version}} - ./build-tools/code-generation/{{page-component-version}}/rc1 - ./build-tools/code-generation/{{page-component-version}}/rc1/README - ./build-tools/code-generation/{{page-component-version}}/rc1/RELEASE_NOTES - ./build-tools/code-generation/{{page-component-version}}/rc1/apache-plc4x-code-generation-{{page-component-version}}-source-release.zip - ./build-tools/code-generation/{{page-component-version}}/rc1/apache-plc4x-code-generation-{{page-component-version}}-source-release.zip.asc - ./build-tools/code-generation/{{page-component-version}}/rc1/apache-plc4x-code-generation-{{page-component-version}}-source-release.zip.sha512 + ./build-tools/code-generation/{{current-last-released-version}} + ./build-tools/code-generation/{{current-last-released-version}}/rc1 + ./build-tools/code-generation/{{current-last-released-version}}/rc1/README + ./build-tools/code-generation/{{current-last-released-version}}/rc1/RELEASE_NOTES + ./build-tools/code-generation/{{current-last-released-version}}/rc1/apache-plc4x-code-generation-{{current-last-released-version}}-source-release.zip + ./build-tools/code-generation/{{current-last-released-version}}/rc1/apache-plc4x-code-generation-{{current-last-released-version}}-source-release.zip.asc + ./build-tools/code-generation/{{current-last-released-version}}/rc1/apache-plc4x-code-generation-{{current-last-released-version}}-source-release.zip.sha512 ---- -I usually prepare exactly the same directory structure, starting with the {{page-component-version}} locally and then just import everything using the following command: +I usually prepare exactly the same directory structure, starting with the {{current-last-released-version}} locally and then just import everything using the following command: [subs="verbatim,attributes"] ---- -svn import {{page-component-version}} https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{{page-component-version}} -m"Staging of rc1 of PLC4X Build-Tools (Code-Generation) {{page-component-version}}" +svn import {{current-last-released-version}} https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{{current-last-released-version}} -m"Staging of rc1 of PLC4X Build-Tools (Code-Generation) {{current-last-released-version}}" ---- The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts. @@ -269,10 +269,10 @@ The following would be the one used to do our first TLP release: [subs="verbatim,attributes"] ---- E-Mail Topic: - [VOTE] Apache PLC4X Build-Tools Code-Generation {{page-component-version}} RC1 + [VOTE] Apache PLC4X Build-Tools Code-Generation {{current-last-released-version}} RC1 Message: - Apache PLC4X Build-Tools Code-Generation {{page-component-version}} has been staged under [2] + Apache PLC4X Build-Tools Code-Generation {{current-last-released-version}} has been staged under [2] and it’s time to vote on accepting it for release. All Maven artifacts are available under [1]. Voting will be open for 72hr. @@ -281,7 +281,7 @@ The following would be the one used to do our first TLP release: are required to pass. Repository: https://gitbox.apache.org/repos/asf/plc4x-build-tools.git - Release tag: releases/code-generation/{{page-component-version}} + Release tag: releases/code-generation/{{current-last-released-version}} Hash for the release tag: {replacethiswiththerealgitcommittag} Per [3] "Before voting +1 PMC members are required to download @@ -297,7 +297,7 @@ The following would be the one used to do our first TLP release: [1] https://repository.apache.org/content/repositories/orgapacheplc4x-{somefourdigitnumber} - [2] https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{{page-component-version}}/rc1/ + [2] https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{{current-last-released-version}}/rc1/ [3] https://www.apache.org/dev/release/validation.html#approving-a-release [4] https://plc4x.apache.org/developers/release/validation.html ---- @@ -308,7 +308,7 @@ As it is sometimes to do the vote counting, if voting and discussions are going [subs="verbatim,attributes"] ---- E-Mail Topic: - [DISCUSS] Apache PLC4X Build-Tools Code-Generation {{page-component-version}} RC1 + [DISCUSS] Apache PLC4X Build-Tools Code-Generation {{current-last-released-version}} RC1 Message: This is the discussion thread for the corresponding VOTE thread. @@ -329,7 +329,7 @@ After the 72-our minimum wait period is over, and we have fulfilled the requirem [subs="verbatim,attributes"] ---- E-Mail Topic: - [RESULT] [VOTE] Apache PLC4X Build-Tools Code-Generation {{page-component-version}} RC1 + [RESULT] [VOTE] Apache PLC4X Build-Tools Code-Generation {{current-last-released-version}} RC1 Message: So, the vote passes with 3 +1 votes by PMC members and one +1 vote by a non PMC member. @@ -344,9 +344,9 @@ This is done by moving them inside the Apache SVN. [subs="verbatim,attributes"] ---- - svn move -m "Release Apache PLC4X {{page-component-version}}" \ - https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{{page-component-version}}/rc1 \ - https://dist.apache.org/repos/dist/release/plc4x/build-tools/code-generation/{{page-component-version}} + svn move -m "Release Apache PLC4X {{current-last-released-version}}" \ + https://dist.apache.org/repos/dist/dev/plc4x/build-tools/code-generation/{{current-last-released-version}}/rc1 \ + https://dist.apache.org/repos/dist/release/plc4x/build-tools/code-generation/{{current-last-released-version}} ---- This will make the release artifacts available and will trigger them being copied to mirror sites. @@ -381,14 +381,14 @@ This has to be done with git [subs="verbatim,attributes"] ---- git checkout release -git merge releases/code-generation/{{page-component-version}} +git merge releases/code-generation/{{current-last-released-version}} ---- When there are conflicts it could help to use the `theirs` merge strategy, i.e., [subs="verbatim,attributes"] ---- -git merge -X theirs releases/code-generation/{{page-component-version}} +git merge -X theirs releases/code-generation/{{current-last-released-version}} ---- Possibly a manual conflict resolution has to be done afterwards. After that, changes need to diff --git a/website/asciidoc/modules/users/pages/getting-started/plc4j.adoc b/website/asciidoc/modules/users/pages/getting-started/plc4j.adoc index 44cc01e7c9e..9618b415402 100644 --- a/website/asciidoc/modules/users/pages/getting-started/plc4j.adoc +++ b/website/asciidoc/modules/users/pages/getting-started/plc4j.adoc @@ -29,7 +29,7 @@ When using Maven, all you need to do is add this dependency: org.apache.plc4x plc4j-api - {page-component-version} + {current-last-released-version} ---- @@ -43,7 +43,7 @@ For example in order to communicate with an `S7 device` using the `S7 Protocol`, org.apache.plc4x plc4j-driver-s7 - {page-component-version} + {current-last-released-version} runtime ---- diff --git a/website/asciidoc/modules/users/pages/getting-started/virtual-modbus.adoc b/website/asciidoc/modules/users/pages/getting-started/virtual-modbus.adoc index f31532eb320..38d12557add 100644 --- a/website/asciidoc/modules/users/pages/getting-started/virtual-modbus.adoc +++ b/website/asciidoc/modules/users/pages/getting-started/virtual-modbus.adoc @@ -157,7 +157,7 @@ When using Maven, all you need to do is add this dependency: org.apache.plc4x plc4j-api - {page-component-version} + {current-last-released-version} ---- @@ -171,7 +171,7 @@ For example in order to communicate using the `Modbus` protocol, you would need org.apache.plc4x plc4j-driver-modbus - {page-component-version} + {current-last-released-version} runtime ---- diff --git a/website/asciidoc/modules/users/pages/tools/capture-replay.adoc b/website/asciidoc/modules/users/pages/tools/capture-replay.adoc index 0833c46a828..58ceb64deb2 100644 --- a/website/asciidoc/modules/users/pages/tools/capture-replay.adoc +++ b/website/asciidoc/modules/users/pages/tools/capture-replay.adoc @@ -47,11 +47,11 @@ Now you need to copy the `pcapng` file ideally to your development system. The capture can be replayed by the tool you find in `plc4j/tools/capture-replay`. -Here simply look for the `target/plc4j-capture-replay-{page-component-version}-uber-jar.jar` and run: +Here simply look for the `target/plc4j-capture-replay-{current-last-released-version}-uber-jar.jar` and run: [subs=attributes+] ---- - java -jar target/plc4j-capture-replay-{page-component-version}-uber-jar.jar --input-file {path to capture} --output-device {name of the network device} --replay-speed 1 --loop true + java -jar target/plc4j-capture-replay-{current-last-released-version}-uber-jar.jar --input-file {path to capture} --output-device {name of the network device} --replay-speed 1 --loop true ---- The options `input-file` and `output-device` are mandatory, the rest is optional: diff --git a/website/asciidoc/modules/users/pages/tools/connection-cache.adoc b/website/asciidoc/modules/users/pages/tools/connection-cache.adoc index 6f67064743c..f7bc2b41aec 100644 --- a/website/asciidoc/modules/users/pages/tools/connection-cache.adoc +++ b/website/asciidoc/modules/users/pages/tools/connection-cache.adoc @@ -82,7 +82,7 @@ To use the Connection Cache you have to add a dependency to the `plc4j-connectio org.apache.plc4x plc4j-connection-cache - {page-component-version} + {current-last-released-version} ---- ===================================================================== diff --git a/website/asciidoc/modules/users/pages/tools/scraper.adoc b/website/asciidoc/modules/users/pages/tools/scraper.adoc index bca1171b3a8..de12281abfc 100644 --- a/website/asciidoc/modules/users/pages/tools/scraper.adoc +++ b/website/asciidoc/modules/users/pages/tools/scraper.adoc @@ -39,7 +39,7 @@ The Scraper can be found in the Maven module: org.apache.plc4x plc4j-scraper - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/tools/testing.adoc b/website/asciidoc/modules/users/pages/tools/testing.adoc index 706635c6f26..0ebcc685a14 100644 --- a/website/asciidoc/modules/users/pages/tools/testing.adoc +++ b/website/asciidoc/modules/users/pages/tools/testing.adoc @@ -30,7 +30,7 @@ The driver can be found in the Maven module org.apache.plc4x plc4j-driver-mock - {page-component-version} + {current-last-released-version} test ---- diff --git a/website/asciidoc/modules/users/pages/transports/can.adoc b/website/asciidoc/modules/users/pages/transports/can.adoc index ac809f0317e..43f4bf0de36 100644 --- a/website/asciidoc/modules/users/pages/transports/can.adoc +++ b/website/asciidoc/modules/users/pages/transports/can.adoc @@ -48,7 +48,7 @@ Note this API is available since Apache PLC4X 0.9. org.apache.plc4x plc4j-transport-can - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/transports/pcap-replay.adoc b/website/asciidoc/modules/users/pages/transports/pcap-replay.adoc index ee7371978cb..e6855d96630 100644 --- a/website/asciidoc/modules/users/pages/transports/pcap-replay.adoc +++ b/website/asciidoc/modules/users/pages/transports/pcap-replay.adoc @@ -38,7 +38,7 @@ org.apache.plc4x plc4j-transport-pcap-replay - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/transports/raw-socket.adoc b/website/asciidoc/modules/users/pages/transports/raw-socket.adoc index 1422e7cd799..cdb35fc2d47 100644 --- a/website/asciidoc/modules/users/pages/transports/raw-socket.adoc +++ b/website/asciidoc/modules/users/pages/transports/raw-socket.adoc @@ -38,7 +38,7 @@ org.apache.plc4x plc4j-transport-raw-socket - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/transports/serial.adoc b/website/asciidoc/modules/users/pages/transports/serial.adoc index b85abffc9b2..b9ae09f0aaf 100644 --- a/website/asciidoc/modules/users/pages/transports/serial.adoc +++ b/website/asciidoc/modules/users/pages/transports/serial.adoc @@ -38,7 +38,7 @@ org.apache.plc4x plc4j-transport-serial - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/transports/socketcan.adoc b/website/asciidoc/modules/users/pages/transports/socketcan.adoc index b321e061743..70897371761 100644 --- a/website/asciidoc/modules/users/pages/transports/socketcan.adoc +++ b/website/asciidoc/modules/users/pages/transports/socketcan.adoc @@ -38,7 +38,7 @@ org.apache.plc4x plc4j-transport-socketcan - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/transports/tcp.adoc b/website/asciidoc/modules/users/pages/transports/tcp.adoc index 65765242115..41b92f805a6 100644 --- a/website/asciidoc/modules/users/pages/transports/tcp.adoc +++ b/website/asciidoc/modules/users/pages/transports/tcp.adoc @@ -38,7 +38,7 @@ org.apache.plc4x plc4j-transport-tcp - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/pages/transports/udp.adoc b/website/asciidoc/modules/users/pages/transports/udp.adoc index 0c2101f7a2d..7af2b9ea10b 100644 --- a/website/asciidoc/modules/users/pages/transports/udp.adoc +++ b/website/asciidoc/modules/users/pages/transports/udp.adoc @@ -38,7 +38,7 @@ org.apache.plc4x plc4j-transport-udp - {page-component-version} + {current-last-released-version} ---- diff --git a/website/asciidoc/modules/users/partials/ab-eth.adoc b/website/asciidoc/modules/users/partials/ab-eth.adoc index e345f4c29fe..5e168930bb5 100644 --- a/website/asciidoc/modules/users/partials/ab-eth.adoc +++ b/website/asciidoc/modules/users/partials/ab-eth.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-ab-eth - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`raw` diff --git a/website/asciidoc/modules/users/partials/ads.adoc b/website/asciidoc/modules/users/partials/ads.adoc index ae4fd474d27..3412f6097c7 100644 --- a/website/asciidoc/modules/users/partials/ads.adoc +++ b/website/asciidoc/modules/users/partials/ads.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-ads - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/bacnet-ip.adoc b/website/asciidoc/modules/users/partials/bacnet-ip.adoc index f6f6c6bcb60..0e6150f14f6 100644 --- a/website/asciidoc/modules/users/partials/bacnet-ip.adoc +++ b/website/asciidoc/modules/users/partials/bacnet-ip.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-bacnet - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`udp` diff --git a/website/asciidoc/modules/users/partials/c-bus.adoc b/website/asciidoc/modules/users/partials/c-bus.adoc index b19dc5fc63a..98da125d166 100644 --- a/website/asciidoc/modules/users/partials/c-bus.adoc +++ b/website/asciidoc/modules/users/partials/c-bus.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-c-bus - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/canopen.adoc b/website/asciidoc/modules/users/partials/canopen.adoc index fd9b02c8746..ff87b26c636 100644 --- a/website/asciidoc/modules/users/partials/canopen.adoc +++ b/website/asciidoc/modules/users/partials/canopen.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-canopen - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`socketcan` diff --git a/website/asciidoc/modules/users/partials/eip.adoc b/website/asciidoc/modules/users/partials/eip.adoc index 1f8d2bbf1a3..9380b23e8ba 100644 --- a/website/asciidoc/modules/users/partials/eip.adoc +++ b/website/asciidoc/modules/users/partials/eip.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-eip - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/firmata.adoc b/website/asciidoc/modules/users/partials/firmata.adoc index 551e1a2b61c..89061a08c98 100644 --- a/website/asciidoc/modules/users/partials/firmata.adoc +++ b/website/asciidoc/modules/users/partials/firmata.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-firmata - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`serial` diff --git a/website/asciidoc/modules/users/partials/genericcan.adoc b/website/asciidoc/modules/users/partials/genericcan.adoc index b49a50d4add..193c38fe041 100644 --- a/website/asciidoc/modules/users/partials/genericcan.adoc +++ b/website/asciidoc/modules/users/partials/genericcan.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-can - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`socketcan` diff --git a/website/asciidoc/modules/users/partials/iec-60870-5-104.adoc b/website/asciidoc/modules/users/partials/iec-60870-5-104.adoc index 982376f3f8f..8368dee5c5d 100644 --- a/website/asciidoc/modules/users/partials/iec-60870-5-104.adoc +++ b/website/asciidoc/modules/users/partials/iec-60870-5-104.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-iec-60870 - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/knxnet-ip.adoc b/website/asciidoc/modules/users/partials/knxnet-ip.adoc index 2e5c1435d26..482254e81f1 100644 --- a/website/asciidoc/modules/users/partials/knxnet-ip.adoc +++ b/website/asciidoc/modules/users/partials/knxnet-ip.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-knxnetip - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`udp` diff --git a/website/asciidoc/modules/users/partials/logix.adoc b/website/asciidoc/modules/users/partials/logix.adoc index 6bea88dbc33..773e9d3934c 100644 --- a/website/asciidoc/modules/users/partials/logix.adoc +++ b/website/asciidoc/modules/users/partials/logix.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-eip - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/modbus-ascii.adoc b/website/asciidoc/modules/users/partials/modbus-ascii.adoc index 0187e48935c..22f7ebe060a 100644 --- a/website/asciidoc/modules/users/partials/modbus-ascii.adoc +++ b/website/asciidoc/modules/users/partials/modbus-ascii.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-modbus - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`serial` diff --git a/website/asciidoc/modules/users/partials/modbus-rtu.adoc b/website/asciidoc/modules/users/partials/modbus-rtu.adoc index 2c045d71da2..589e96f7db7 100644 --- a/website/asciidoc/modules/users/partials/modbus-rtu.adoc +++ b/website/asciidoc/modules/users/partials/modbus-rtu.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-modbus - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`serial` diff --git a/website/asciidoc/modules/users/partials/modbus-tcp.adoc b/website/asciidoc/modules/users/partials/modbus-tcp.adoc index 5b4bb7c3677..0d8c3d8d10e 100644 --- a/website/asciidoc/modules/users/partials/modbus-tcp.adoc +++ b/website/asciidoc/modules/users/partials/modbus-tcp.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-modbus - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/opcua.adoc b/website/asciidoc/modules/users/partials/opcua.adoc index aec5ae8e595..b27e3e9bf14 100644 --- a/website/asciidoc/modules/users/partials/opcua.adoc +++ b/website/asciidoc/modules/users/partials/opcua.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-opcua - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/open-protocol.adoc b/website/asciidoc/modules/users/partials/open-protocol.adoc index 7291d8cf219..164ee59d751 100644 --- a/website/asciidoc/modules/users/partials/open-protocol.adoc +++ b/website/asciidoc/modules/users/partials/open-protocol.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-open-protocol - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/plc4x.adoc b/website/asciidoc/modules/users/partials/plc4x.adoc index 3eff6a20e0d..4c50a337c8c 100644 --- a/website/asciidoc/modules/users/partials/plc4x.adoc +++ b/website/asciidoc/modules/users/partials/plc4x.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-plc4x - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/profinet.adoc b/website/asciidoc/modules/users/partials/profinet.adoc index aca4434a6f9..116490b3846 100644 --- a/website/asciidoc/modules/users/partials/profinet.adoc +++ b/website/asciidoc/modules/users/partials/profinet.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-profinet-ng - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`raw` diff --git a/website/asciidoc/modules/users/partials/s7.adoc b/website/asciidoc/modules/users/partials/s7.adoc index bbdaa7b2b19..8b3050507a0 100644 --- a/website/asciidoc/modules/users/partials/s7.adoc +++ b/website/asciidoc/modules/users/partials/s7.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-s7 - {page-component-version} + {current-last-released-version} ---- |Default Transport 4+|`tcp` diff --git a/website/asciidoc/modules/users/partials/simulated.adoc b/website/asciidoc/modules/users/partials/simulated.adoc index 1bf4acf1e1a..c2ed88f83f0 100644 --- a/website/asciidoc/modules/users/partials/simulated.adoc +++ b/website/asciidoc/modules/users/partials/simulated.adoc @@ -29,7 +29,7 @@ org.apache.plc4x plc4j-driver-simulated - {page-component-version} + {current-last-released-version} ---- |Supported Transports 4+| diff --git a/website/resources/index.html b/website/resources/index.html index 3be66189825..ae2a926b476 100644 --- a/website/resources/index.html +++ b/website/resources/index.html @@ -49,7 +49,7 @@