You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by hu...@apache.org on 2022/05/25 08:18:41 UTC
[plc4x] 01/02: fix(plc4j/opcua-server): Moved pinned jaxb-runtime from parent to nifi processor. It isn't needed and causes issue with the milo stack
This is an automated email from the ASF dual-hosted git repository.
hutcheb pushed a commit to branch logix_develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 54c90dba81ed287308fb14c9dec06b8b23310a47
Author: Ben Hutcheson <be...@gmail.com>
AuthorDate: Wed May 25 16:11:17 2022 +1000
fix(plc4j/opcua-server): Moved pinned jaxb-runtime from parent to nifi processor. It isn't needed and causes issue with the milo stack
---
plc4j/integrations/apache-nifi/pom.xml | 16 ++++++++++
plc4j/integrations/opcua-server/pom.xml | 1 +
.../opcua-server/src/main/resources/config.yml | 36 +++++++++++-----------
.../opcua-server/src/test/resources/config.yml | 36 +++++++++++-----------
pom.xml | 20 +-----------
5 files changed, 54 insertions(+), 55 deletions(-)
diff --git a/plc4j/integrations/apache-nifi/pom.xml b/plc4j/integrations/apache-nifi/pom.xml
index de68897213..f89022a2ba 100644
--- a/plc4j/integrations/apache-nifi/pom.xml
+++ b/plc4j/integrations/apache-nifi/pom.xml
@@ -93,6 +93,22 @@
<artifactId>swagger-annotations</artifactId>
<version>1.6.0</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/plc4j/integrations/opcua-server/pom.xml b/plc4j/integrations/opcua-server/pom.xml
index 49b8302616..aed25c810a 100644
--- a/plc4j/integrations/opcua-server/pom.xml
+++ b/plc4j/integrations/opcua-server/pom.xml
@@ -106,6 +106,7 @@
<version>0.10.0-SNAPSHOT</version>
</dependency>
+
<!-- Include all drivers -->
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/integrations/opcua-server/src/main/resources/config.yml b/plc4j/integrations/opcua-server/src/main/resources/config.yml
index b27a805fea..35aacc7530 100644
--- a/plc4j/integrations/opcua-server/src/main/resources/config.yml
+++ b/plc4j/integrations/opcua-server/src/main/resources/config.yml
@@ -66,38 +66,38 @@ devices:
connectionString: "opcua:tcp://127.0.0.1:12687/plc4x"
tags:
- alias: "Simulated_OPC_BOOL"
- address: "ns=2;s=Simulated_BOOL"
+ address: "ns=1;s=Simulated_BOOL"
- alias: "Simulated_OPC_BYTE"
- address: "ns=2;s=Simulated_BYTE"
+ address: "ns=1;s=Simulated_BYTE"
- alias: "Simulated_OPC_WORD"
- address: "ns=2;s=Simulated_WORD"
+ address: "ns=1;s=Simulated_WORD"
- alias: "Simulated_OPC_DWORD"
- address: "ns=2;s=Simulated_DWORD"
+ address: "ns=1;s=Simulated_DWORD"
- alias: "Simulated_OPC_SINT"
- address: "ns=2;s=Simulated_SINT"
+ address: "ns=1;s=Simulated_SINT"
- alias: "Simulated_OPC_USINT"
- address: "ns=2;s=Simulated_USINT"
+ address: "ns=1;s=Simulated_USINT"
- alias: "Simulated_OPC_INT"
- address: "ns=2;s=Simulated_INT"
+ address: "ns=1;s=Simulated_INT"
- alias: "Simulated_OPC_UINT"
- address: "ns=2;s=Simulated_UINT"
+ address: "ns=1;s=Simulated_UINT"
- alias: "Simulated_OPC_DINT"
- address: "ns=2;s=Simulated_DINT"
+ address: "ns=1;s=Simulated_DINT"
- alias: "Simulated_OPC_UDINT"
- address: "ns=2;s=Simulated_UDINT"
+ address: "ns=1;s=Simulated_UDINT"
- alias: "Simulated_OPC_LINT"
- address: "ns=2;s=Simulated_LINT"
+ address: "ns=1;s=Simulated_LINT"
- alias: "Simulated_OPC_ULINT"
- address: "ns=2;s=Simulated_ULINT"
+ address: "ns=1;s=Simulated_ULINT"
- alias: "Simulated_OPC_REAL"
- address: "ns=2;s=Simulated_REAL"
+ address: "ns=1;s=Simulated_REAL"
- alias: "Simulated_OPC_LREAL"
- address: "ns=2;s=Simulated_LREAL"
+ address: "ns=1;s=Simulated_LREAL"
- alias: "Simulated_OPC_CHAR"
- address: "ns=2;s=Simulated_CHAR"
+ address: "ns=1;s=Simulated_CHAR"
- alias: "Simulated_OPC_WCHAR"
- address: "ns=2;s=Simulated_WCHAR"
+ address: "ns=1;s=Simulated_WCHAR"
- alias: "Simulated_OPC_STRING"
- address: "ns=2;s=Simulated_STRING"
+ address: "ns=1;s=Simulated_STRING"
- alias: "Simulated_OPC_WSTRING"
- address: "ns=2;s=Simulated_WSTRING"
+ address: "ns=1;s=Simulated_WSTRING"
diff --git a/plc4j/integrations/opcua-server/src/test/resources/config.yml b/plc4j/integrations/opcua-server/src/test/resources/config.yml
index 2296449ce0..c950e57019 100644
--- a/plc4j/integrations/opcua-server/src/test/resources/config.yml
+++ b/plc4j/integrations/opcua-server/src/test/resources/config.yml
@@ -66,38 +66,38 @@ devices:
connectionString: "opcua:tcp://127.0.0.1:12673/plc4x"
tags:
- alias: "Simulated_OPC_BOOL"
- address: "ns=2;s=Simulated_BOOL"
+ address: "ns=1;s=Simulated_BOOL"
- alias: "Simulated_OPC_BYTE"
- address: "ns=2;s=Simulated_BYTE"
+ address: "ns=1;s=Simulated_BYTE"
- alias: "Simulated_OPC_WORD"
- address: "ns=2;s=Simulated_WORD"
+ address: "ns=1;s=Simulated_WORD"
- alias: "Simulated_OPC_DWORD"
- address: "ns=2;s=Simulated_DWORD"
+ address: "ns=1;s=Simulated_DWORD"
- alias: "Simulated_OPC_SINT"
- address: "ns=2;s=Simulated_SINT"
+ address: "ns=1;s=Simulated_SINT"
- alias: "Simulated_OPC_USINT"
- address: "ns=2;s=Simulated_USINT"
+ address: "ns=1;s=Simulated_USINT"
- alias: "Simulated_OPC_INT"
- address: "ns=2;s=Simulated_INT"
+ address: "ns=1;s=Simulated_INT"
- alias: "Simulated_OPC_UINT"
- address: "ns=2;s=Simulated_UINT"
+ address: "ns=1;s=Simulated_UINT"
- alias: "Simulated_OPC_DINT"
- address: "ns=2;s=Simulated_DINT"
+ address: "ns=1;s=Simulated_DINT"
- alias: "Simulated_OPC_UDINT"
- address: "ns=2;s=Simulated_UDINT"
+ address: "ns=1;s=Simulated_UDINT"
- alias: "Simulated_OPC_LINT"
- address: "ns=2;s=Simulated_LINT"
+ address: "ns=1;s=Simulated_LINT"
- alias: "Simulated_OPC_ULINT"
- address: "ns=2;s=Simulated_ULINT"
+ address: "ns=1;s=Simulated_ULINT"
- alias: "Simulated_OPC_REAL"
- address: "ns=2;s=Simulated_REAL"
+ address: "ns=1;s=Simulated_REAL"
- alias: "Simulated_OPC_LREAL"
- address: "ns=2;s=Simulated_LREAL"
+ address: "ns=1;s=Simulated_LREAL"
- alias: "Simulated_OPC_CHAR"
- address: "ns=2;s=Simulated_CHAR"
+ address: "ns=1;s=Simulated_CHAR"
- alias: "Simulated_OPC_WCHAR"
- address: "ns=2;s=Simulated_WCHAR"
+ address: "ns=1;s=Simulated_WCHAR"
- alias: "Simulated_OPC_STRING"
- address: "ns=2;s=Simulated_STRING"
+ address: "ns=1;s=Simulated_STRING"
- alias: "Simulated_OPC_WSTRING"
- address: "ns=2;s=Simulated_WSTRING"
+ address: "ns=1;s=Simulated_WSTRING"
diff --git a/pom.xml b/pom.xml
index ff07a2ddaa..676c64d11d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<junit.platform.version>1.8.2</junit.platform.version>
<logback.version>1.2.10</logback.version>
<maven.clean.plugin.version>3.2.0</maven.clean.plugin.version>
- <milo.version>0.6.3</milo.version>
+ <milo.version>0.6.6</milo.version>
<mockito.version>4.4.0</mockito.version>
<netty.version>4.1.77.Final</netty.version>
<owasp-dependency-check.version>7.0.4</owasp-dependency-check.version>
@@ -637,18 +637,6 @@
<version>${netty.version}</version>
</dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
@@ -661,12 +649,6 @@
<version>${apiguardian.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
-
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>