This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/develop by this push:
new ebd4b37 feat: more 21 upgrade
ebd4b37 is described below
commit ebd4b3775087723de670eabc6114bd119d1f1037
Author: Sebastian Rühl <[email protected]>
AuthorDate: Mon Sep 1 10:28:51 2025 +0200
feat: more 21 upgrade
---
.github/workflows/c-platform.yml | 3 +--
.github/workflows/go-platform-test-report.yml | 3 +--
.github/workflows/go-platform.yml | 3 +--
.github/workflows/java-platform-test-report.yml | 2 +-
plc4j/examples/pom.xml | 13 +------------
plc4j/tools/pom.xml | 18 +-----------------
pom.xml | 6 ------
7 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/c-platform.yml b/.github/workflows/c-platform.yml
index 3efbc54..c6a5699 100644
--- a/.github/workflows/c-platform.yml
+++ b/.github/workflows/c-platform.yml
@@ -40,8 +40,7 @@ jobs:
test:
strategy:
matrix:
- # 8 not anymore supported for building
- java: [ 17 ]
+ java: [ 21 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/go-platform-test-report.yml
b/.github/workflows/go-platform-test-report.yml
index 3671f50..c166c35 100644
--- a/.github/workflows/go-platform-test-report.yml
+++ b/.github/workflows/go-platform-test-report.yml
@@ -31,8 +31,7 @@ jobs:
report:
strategy:
matrix:
- # 8 not anymore supported for building
- java: [ 17 ]
+ java: [ 21 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/go-platform.yml
b/.github/workflows/go-platform.yml
index b0effa6..d1d1102 100644
--- a/.github/workflows/go-platform.yml
+++ b/.github/workflows/go-platform.yml
@@ -80,8 +80,7 @@ jobs:
test:
strategy:
matrix:
- # 8 not anymore supported for building
- java: [ 17 ]
+ java: [ 21 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/java-platform-test-report.yml
b/.github/workflows/java-platform-test-report.yml
index 9d7fa0d..f54893b 100644
--- a/.github/workflows/java-platform-test-report.yml
+++ b/.github/workflows/java-platform-test-report.yml
@@ -31,7 +31,7 @@ jobs:
report:
strategy:
matrix:
- java: [ 11, 17, 21 ]
+ java: [ 21 ]
# TODO: only works on windows due to
https://github.com/dorny/test-reporter/issues/249
#os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ windows-latest ]
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index 580043e..ded467e 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -49,6 +49,7 @@
<module>hello-cloud-google</module>
<module>hello-discovery</module>
<module>hello-connectivity-mqtt</module>
+ <module>hello-influx-data-collection</module>
<module>hello-integration-iotdb</module>
<module>hello-nats</module>
<module>hello-opm</module>
@@ -140,16 +141,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>.above-or-equal-java-17</id>
- <activation>
- <jdk>[17,)</jdk>
- </activation>
- <modules>
- <module>hello-influx-data-collection</module>
- </modules>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file
diff --git a/plc4j/tools/pom.xml b/plc4j/tools/pom.xml
index 124a3ad..07adc16 100644
--- a/plc4j/tools/pom.xml
+++ b/plc4j/tools/pom.xml
@@ -39,23 +39,7 @@
<modules>
<module>plc4x-server</module>
+ <module>opcua-server</module>
</modules>
- <!--
- As the OPCUA-Server is a standalone application not meant for being
integrated into anything,
- we don't want to limit us to old java versions and therefore be stuck with
old Spring versions.
- Therefore, at least Java 19 is needed to build this module.
- -->
- <profiles>
- <profile>
- <id>.above-or-equal-java-17</id>
- <activation>
- <jdk>[17,)</jdk>
- </activation>
- <modules>
- <module>opcua-server</module>
- </modules>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bdfcf7c..dff45b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,12 +216,6 @@
<exclude>**/go.sum</exclude>
<!-- Exclude Node related files -->
- <!--
- This is actually only needed when having built with Java 19
- or higher and then building with a version below 19. Because
- in this case, the "ui" module is disabled, and the left-over
- build files make rat complain.
- -->
<exclude>ui/frontend/project/dist/**</exclude>
<exclude>ui/frontend/project/node/**</exclude>
<exclude>ui/frontend/project/node_modules/**</exclude>
