This is an automated email from the ASF dual-hosted git repository.
chrisdutz 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 d46c3bf9 feat: Updated the plc4x-extras repo to 1.0.0-SNAPSHOT and
resolved all issues caused by a not 100% clean update to SPI3's artifact
structure.
d46c3bf9 is described below
commit d46c3bf9c547f970eaefba5b88b10175237591da
Author: Christofer Dutz <[email protected]>
AuthorDate: Wed Jul 15 22:12:43 2026 +0200
feat: Updated the plc4x-extras repo to 1.0.0-SNAPSHOT and resolved all
issues caused by a not 100% clean update to SPI3's artifact structure.
---
.mvn/maven.config | 1 +
RELEASE_NOTES | 2 +-
plc4c/pom.xml | 2 +-
plc4go/pom.xml | 2 +-
plc4j/examples/hello-ads-telemetry/pom.xml | 2 +-
plc4j/examples/hello-cloud-azure/pom.xml | 2 +-
plc4j/examples/hello-cloud-google/pom.xml | 2 +-
plc4j/examples/hello-connectivity-mqtt/pom.xml | 2 +-
plc4j/examples/hello-discovery/pom.xml | 2 +-
plc4j/examples/hello-influx-data-collection/pom.xml | 4 ++--
.../plc4x/java/examples/helloinflux/HelloInflux.java | 13 ++++++-------
plc4j/examples/hello-integration-iotdb/pom.xml | 2 +-
plc4j/examples/hello-nats/pom.xml | 2 +-
plc4j/examples/hello-opm/pom.xml | 2 +-
plc4j/examples/hello-webservice/pom.xml | 2 +-
plc4j/examples/hello-world-kotlin/pom.xml | 2 +-
.../examples/hello-world-plc4x-discover-and-browse/pom.xml | 2 +-
plc4j/examples/hello-world-plc4x-read/pom.xml | 2 +-
plc4j/examples/hello-world-plc4x-subscribe/pom.xml | 2 +-
plc4j/examples/hello-world-plc4x-write/pom.xml | 2 +-
plc4j/examples/plc4j-s7event/pom.xml | 2 +-
plc4j/examples/poll-loop/pom.xml | 2 +-
plc4j/examples/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 2 +-
plc4j/integrations/apache-kafka/pom.xml | 2 +-
.../integrations/apache-nifi/nifi-1/nifi-plc4x-nar/pom.xml | 4 ++--
.../apache-nifi/nifi-1/nifi-plc4x-processors/pom.xml | 14 +++++++-------
.../org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java | 2 +-
.../plc4x/nifi/record/Plc4xReadResponseRecordSet.java | 10 ++++++----
plc4j/integrations/apache-nifi/nifi-1/pom.xml | 2 +-
.../apache-nifi/nifi-2/nifi-2-plc4x-nar/pom.xml | 4 ++--
.../apache-nifi/nifi-2/nifi-2-plc4x-processors/pom.xml | 14 +++++++-------
.../org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java | 2 +-
.../plc4x/nifi/record/Plc4xReadResponseRecordSet.java | 8 ++++----
plc4j/integrations/apache-nifi/nifi-2/pom.xml | 2 +-
plc4j/integrations/apache-nifi/pom.xml | 2 +-
plc4j/integrations/pom.xml | 2 +-
plc4j/pom.xml | 2 +-
plc4j/tools/opcua-server/pom.xml | 2 +-
plc4j/tools/plc4x-server/pom.xml | 7 +------
plc4j/tools/pom.xml | 2 +-
pom.xml | 4 ++--
42 files changed, 71 insertions(+), 74 deletions(-)
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00000000..3a01982a
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+-P ?with-dotnet,?with-python,?update-generated-code,?reactor-with-extras
\ No newline at end of file
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 9dc66061..6b30d24e 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,5 +1,5 @@
==============================================================
-(Unreleased) Apache PLC4X 0.14.0-SNAPSHOT
+(Unreleased) Apache PLC4X 1.0.0-SNAPSHOT
==============================================================
New Features
diff --git a/plc4c/pom.xml b/plc4c/pom.xml
index ab2b72f7..19c5727f 100644
--- a/plc4c/pom.xml
+++ b/plc4c/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4x-extras-parent</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4c-extras</artifactId>
diff --git a/plc4go/pom.xml b/plc4go/pom.xml
index 6257a07d..0097a280 100644
--- a/plc4go/pom.xml
+++ b/plc4go/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4x-extras-parent</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4go-extras</artifactId>
diff --git a/plc4j/examples/hello-ads-telemetry/pom.xml
b/plc4j/examples/hello-ads-telemetry/pom.xml
index ca108593..e7fb5868 100644
--- a/plc4j/examples/hello-ads-telemetry/pom.xml
+++ b/plc4j/examples/hello-ads-telemetry/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-ads-telemetry</artifactId>
diff --git a/plc4j/examples/hello-cloud-azure/pom.xml
b/plc4j/examples/hello-cloud-azure/pom.xml
index 5e437e64..cdd2348c 100644
--- a/plc4j/examples/hello-cloud-azure/pom.xml
+++ b/plc4j/examples/hello-cloud-azure/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-cloud-azure</artifactId>
diff --git a/plc4j/examples/hello-cloud-google/pom.xml
b/plc4j/examples/hello-cloud-google/pom.xml
index 056300bd..0bd452cc 100644
--- a/plc4j/examples/hello-cloud-google/pom.xml
+++ b/plc4j/examples/hello-cloud-google/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-cloud-google</artifactId>
diff --git a/plc4j/examples/hello-connectivity-mqtt/pom.xml
b/plc4j/examples/hello-connectivity-mqtt/pom.xml
index 8dd4afce..f5c3a248 100644
--- a/plc4j/examples/hello-connectivity-mqtt/pom.xml
+++ b/plc4j/examples/hello-connectivity-mqtt/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-connectivity-mqtt</artifactId>
diff --git a/plc4j/examples/hello-discovery/pom.xml
b/plc4j/examples/hello-discovery/pom.xml
index b86f00dd..0356929e 100644
--- a/plc4j/examples/hello-discovery/pom.xml
+++ b/plc4j/examples/hello-discovery/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-discovery</artifactId>
diff --git a/plc4j/examples/hello-influx-data-collection/pom.xml
b/plc4j/examples/hello-influx-data-collection/pom.xml
index 3ece53fe..246de524 100644
--- a/plc4j/examples/hello-influx-data-collection/pom.xml
+++ b/plc4j/examples/hello-influx-data-collection/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-influx-data-collection</artifactId>
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
+ <artifactId>plc4j-spi-drivers</artifactId>
<version>${plc4x.version}</version>
</dependency>
diff --git
a/plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
b/plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
index 1d520f5e..5382191e 100644
---
a/plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
+++
b/plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
@@ -34,8 +34,8 @@ import
org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent;
-import org.apache.plc4x.java.spi.messages.utils.PlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcSubscriptionEvent;
+import org.apache.plc4x.java.spi.drivers.messages.items.PlcResponseItem;
import org.apache.plc4x.java.spi.values.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,10 +74,9 @@ public class HelloInflux {
DefaultPlcSubscriptionEvent internalEvent =
(DefaultPlcSubscriptionEvent) plcSubscriptionEvent;
final Point point =
Point.measurement(configuration.getString("influx.measurement"))
.time(plcSubscriptionEvent.getTimestamp().toEpochMilli(),
WritePrecision.MS);
- final Map<String, PlcResponseItem<PlcValue>> values =
internalEvent.getValues();
- values.forEach((tagName, tagResponsePair) -> {
- final PlcResponseCode responseCode =
tagResponsePair.getResponseCode();
- final PlcValue plcValue = tagResponsePair.getValue();
+ for (String tagName : internalEvent.getTagNames()) {
+ final PlcResponseCode responseCode =
internalEvent.getResponseCode(tagName);
+ final PlcValue plcValue =
internalEvent.getPlcValue(tagName);
if(responseCode == PlcResponseCode.OK) {
PlcStruct structValue = (PlcStruct) plcValue;
for (String key : structValue.getKeys()) {
@@ -85,7 +84,7 @@ public class HelloInflux {
registerTags(point, key, subValue);
}
}
- });
+ }
writeApi.writePoint(
configuration.getString("influx.bucket"),
configuration.getString("influx.org"), point);
});
diff --git a/plc4j/examples/hello-integration-iotdb/pom.xml
b/plc4j/examples/hello-integration-iotdb/pom.xml
index 3bb8b670..292140d2 100644
--- a/plc4j/examples/hello-integration-iotdb/pom.xml
+++ b/plc4j/examples/hello-integration-iotdb/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-integration-iotdb</artifactId>
diff --git a/plc4j/examples/hello-nats/pom.xml
b/plc4j/examples/hello-nats/pom.xml
index c832ca7a..6d796546 100644
--- a/plc4j/examples/hello-nats/pom.xml
+++ b/plc4j/examples/hello-nats/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-nats</artifactId>
diff --git a/plc4j/examples/hello-opm/pom.xml b/plc4j/examples/hello-opm/pom.xml
index be39d88c..38a79e46 100644
--- a/plc4j/examples/hello-opm/pom.xml
+++ b/plc4j/examples/hello-opm/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-opm</artifactId>
diff --git a/plc4j/examples/hello-webservice/pom.xml
b/plc4j/examples/hello-webservice/pom.xml
index 8b3700f7..35745a98 100644
--- a/plc4j/examples/hello-webservice/pom.xml
+++ b/plc4j/examples/hello-webservice/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-webservice</artifactId>
diff --git a/plc4j/examples/hello-world-kotlin/pom.xml
b/plc4j/examples/hello-world-kotlin/pom.xml
index 2469e5dd..4c297475 100644
--- a/plc4j/examples/hello-world-kotlin/pom.xml
+++ b/plc4j/examples/hello-world-kotlin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-world-kotlin</artifactId>
diff --git a/plc4j/examples/hello-world-plc4x-discover-and-browse/pom.xml
b/plc4j/examples/hello-world-plc4x-discover-and-browse/pom.xml
index 173f70c8..71f3c8d0 100644
--- a/plc4j/examples/hello-world-plc4x-discover-and-browse/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-discover-and-browse/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-world-plc4x-discover-and-browse</artifactId>
diff --git a/plc4j/examples/hello-world-plc4x-read/pom.xml
b/plc4j/examples/hello-world-plc4x-read/pom.xml
index 4ebbb3ac..666ce87d 100644
--- a/plc4j/examples/hello-world-plc4x-read/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-read/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-world-plc4x-read</artifactId>
diff --git a/plc4j/examples/hello-world-plc4x-subscribe/pom.xml
b/plc4j/examples/hello-world-plc4x-subscribe/pom.xml
index 10ec57c7..253f4544 100644
--- a/plc4j/examples/hello-world-plc4x-subscribe/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-subscribe/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-world-plc4x-subscribe</artifactId>
diff --git a/plc4j/examples/hello-world-plc4x-write/pom.xml
b/plc4j/examples/hello-world-plc4x-write/pom.xml
index e568fe56..65af27d4 100644
--- a/plc4j/examples/hello-world-plc4x-write/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-write/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-hello-world-plc4x-write</artifactId>
diff --git a/plc4j/examples/plc4j-s7event/pom.xml
b/plc4j/examples/plc4j-s7event/pom.xml
index a14011f7..cc4ff67f 100644
--- a/plc4j/examples/plc4j-s7event/pom.xml
+++ b/plc4j/examples/plc4j-s7event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-s7event</artifactId>
diff --git a/plc4j/examples/poll-loop/pom.xml b/plc4j/examples/poll-loop/pom.xml
index c3f0d69f..667d2130 100644
--- a/plc4j/examples/poll-loop/pom.xml
+++ b/plc4j/examples/poll-loop/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-examples-poll-loop</artifactId>
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index 575242f9..a65f4ca1 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-extras</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.plc4x.examples</groupId>
diff --git a/plc4j/integrations/apache-calcite/pom.xml
b/plc4j/integrations/apache-calcite/pom.xml
index ded6c7b3..962f412b 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-integrations</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-apache-calcite</artifactId>
diff --git a/plc4j/integrations/apache-kafka/pom.xml
b/plc4j/integrations/apache-kafka/pom.xml
index 358a3fb1..56022159 100644
--- a/plc4j/integrations/apache-kafka/pom.xml
+++ b/plc4j/integrations/apache-kafka/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-integrations</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-apache-kafka</artifactId>
diff --git a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-nar/pom.xml
b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-nar/pom.xml
index 82ec59c2..f5c16d2e 100644
--- a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-nar/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-nar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-apache-nifi-1</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-nifi-plc4x-nar</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-nifi-plc4x-processors</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git
a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/pom.xml
b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/pom.xml
index 0a51214f..1ce1df15 100644
--- a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-apache-nifi-1</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-nifi-plc4x-processors</artifactId>
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
+ <artifactId>plc4j-spi-drivers</artifactId>
<version>${plc4x.version}</version>
</dependency>
@@ -138,31 +138,31 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-pcap-replay</artifactId>
+ <artifactId>plc4j-transports-pcap-replay</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-raw-socket</artifactId>
+ <artifactId>plc4j-transports-raw-socket</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-serial</artifactId>
+ <artifactId>plc4j-transports-serial</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-tcp</artifactId>
+ <artifactId>plc4j-transports-tcp</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-udp</artifactId>
+ <artifactId>plc4j-transports-udp</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
index 8b30bce1..099c1284 100644
---
a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
+++
b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
@@ -58,7 +58,7 @@ import org.apache.nifi.util.StopWatch;
import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
import org.apache.plc4x.java.api.model.PlcTag;
import org.apache.plc4x.java.api.types.PlcValueType;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcSubscriptionEvent;
import org.apache.plc4x.nifi.record.Plc4xWriter;
import org.apache.plc4x.nifi.record.RecordPlc4xWriter;
import org.apache.plc4x.nifi.subscription.Plc4xListenerDispatcher;
diff --git
a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
index ccdc90bf..e7630bb3 100644
---
a/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
+++
b/plc4j/integrations/apache-nifi/nifi-1/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
@@ -33,9 +33,10 @@ import org.apache.nifi.serialization.record.RecordField;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.api.value.PlcValue;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent;
-import org.apache.plc4x.java.spi.messages.utils.PlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcSubscriptionEvent;
+import org.apache.plc4x.java.spi.drivers.messages.items.PlcResponseItem;
import org.apache.plc4x.nifi.util.Plc4xCommon;
public class Plc4xReadResponseRecordSet implements RecordSet, Closeable {
@@ -91,8 +92,9 @@ public class Plc4xReadResponseRecordSet implements RecordSet,
Closeable {
Map<String, PlcValue> responseDataStructure = new HashMap<>();
- for (Map.Entry<String, PlcResponseItem<PlcValue>> entry :
subscriptionEvent.getValues().entrySet()) {
- responseDataStructure.put(entry.getKey(),
entry.getValue().getValue());
+ for (String tagName : subscriptionEvent.getTagNames()) {
+ PlcValue plcValue = subscriptionEvent.getPlcValue(tagName);
+ responseDataStructure.put(tagName, plcValue);
}
return responseDataStructure;
diff --git a/plc4j/integrations/apache-nifi/nifi-1/pom.xml
b/plc4j/integrations/apache-nifi/nifi-1/pom.xml
index a165462d..eb8d96a8 100644
--- a/plc4j/integrations/apache-nifi/nifi-1/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-1/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-apache-nifi</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-apache-nifi-1</artifactId>
diff --git a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-nar/pom.xml
b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-nar/pom.xml
index 157a1a33..335e4fe1 100644
--- a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-nar/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-nar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-apache-nifi-2</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-nifi-2-plc4x-nar</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-nifi-2-plc4x-processors</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git
a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/pom.xml
b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/pom.xml
index 13efc5dc..595c43e0 100644
--- a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-apache-nifi-2</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-nifi-2-plc4x-processors</artifactId>
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
+ <artifactId>plc4j-spi-drivers</artifactId>
<version>${plc4x.version}</version>
</dependency>
@@ -138,31 +138,31 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-pcap-replay</artifactId>
+ <artifactId>plc4j-transports-pcap-replay</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-raw-socket</artifactId>
+ <artifactId>plc4j-transports-raw-socket</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-serial</artifactId>
+ <artifactId>plc4j-transports-serial</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-tcp</artifactId>
+ <artifactId>plc4j-transports-tcp</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-udp</artifactId>
+ <artifactId>plc4j-transports-udp</artifactId>
<version>${plc4x.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
index 5da5e81a..37ca988f 100644
---
a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
+++
b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xListenRecordProcessor.java
@@ -58,7 +58,7 @@ import org.apache.nifi.util.StopWatch;
import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
import org.apache.plc4x.java.api.model.PlcTag;
import org.apache.plc4x.java.api.types.PlcValueType;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcSubscriptionEvent;
import org.apache.plc4x.nifi.record.Plc4xWriter;
import org.apache.plc4x.nifi.record.RecordPlc4xWriter;
import org.apache.plc4x.nifi.subscription.Plc4xListenerDispatcher;
diff --git
a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
index ccdc90bf..1f3c50a2 100644
---
a/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
+++
b/plc4j/integrations/apache-nifi/nifi-2/nifi-2-plc4x-processors/src/main/java/org/apache/plc4x/nifi/record/Plc4xReadResponseRecordSet.java
@@ -34,8 +34,7 @@ import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.value.PlcValue;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent;
-import org.apache.plc4x.java.spi.messages.utils.PlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcSubscriptionEvent;
import org.apache.plc4x.nifi.util.Plc4xCommon;
public class Plc4xReadResponseRecordSet implements RecordSet, Closeable {
@@ -91,8 +90,9 @@ public class Plc4xReadResponseRecordSet implements RecordSet,
Closeable {
Map<String, PlcValue> responseDataStructure = new HashMap<>();
- for (Map.Entry<String, PlcResponseItem<PlcValue>> entry :
subscriptionEvent.getValues().entrySet()) {
- responseDataStructure.put(entry.getKey(),
entry.getValue().getValue());
+ for (String tagName : subscriptionEvent.getTagNames()) {
+ PlcValue plcValue = subscriptionEvent.getPlcValue(tagName);
+ responseDataStructure.put(tagName, plcValue);
}
return responseDataStructure;
diff --git a/plc4j/integrations/apache-nifi/nifi-2/pom.xml
b/plc4j/integrations/apache-nifi/nifi-2/pom.xml
index 41f4e7c9..58566f15 100644
--- a/plc4j/integrations/apache-nifi/nifi-2/pom.xml
+++ b/plc4j/integrations/apache-nifi/nifi-2/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-apache-nifi</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-apache-nifi-2</artifactId>
diff --git a/plc4j/integrations/apache-nifi/pom.xml
b/plc4j/integrations/apache-nifi/pom.xml
index a4252608..911cd7eb 100644
--- a/plc4j/integrations/apache-nifi/pom.xml
+++ b/plc4j/integrations/apache-nifi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-integrations</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-apache-nifi</artifactId>
diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml
index df789ed7..9f2f8599 100644
--- a/plc4j/integrations/pom.xml
+++ b/plc4j/integrations/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-extras</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-integrations</artifactId>
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index c0002c83..e0d40fce 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4x-extras-parent</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-extras</artifactId>
diff --git a/plc4j/tools/opcua-server/pom.xml b/plc4j/tools/opcua-server/pom.xml
index 86ab46cf..f0948a47 100644
--- a/plc4j/tools/opcua-server/pom.xml
+++ b/plc4j/tools/opcua-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-tools</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4x-opcua-server</artifactId>
diff --git a/plc4j/tools/plc4x-server/pom.xml b/plc4j/tools/plc4x-server/pom.xml
index c0f232b5..e0e2d1aa 100644
--- a/plc4j/tools/plc4x-server/pom.xml
+++ b/plc4j/tools/plc4x-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-tools</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-plc4x-server</artifactId>
@@ -103,11 +103,6 @@
<artifactId>plc4j-api</artifactId>
<version>${plc4x.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
- <version>${plc4x.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/tools/pom.xml b/plc4j/tools/pom.xml
index 7093eccb..8239c0e1 100644
--- a/plc4j/tools/pom.xml
+++ b/plc4j/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4j-extras</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-tools</artifactId>
diff --git a/pom.xml b/pom.xml
index b03a3732..7dce3255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.plc4x.extras</groupId>
<artifactId>plc4x-extras-parent</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>PLC4X-Extras</name>
@@ -87,7 +87,7 @@
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
<project.build.outputTimestamp>2025-08-06T15:45:09Z</project.build.outputTimestamp>
- <plc4x.version>0.14.0-SNAPSHOT</plc4x.version>
+ <plc4x.version>1.0.0-SNAPSHOT</plc4x.version>
</properties>
<!--