You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by mh...@apache.org on 2021/03/01 14:20:15 UTC

[incubator-streampipes-extensions] 02/02: Merge branch 'dev' of github.com:apache/incubator-streampipes-extensions into dev

This is an automated email from the ASF dual-hosted git repository.

mheyden pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git

commit 5dc0f66b25cacf6a7b8f079d965a12578e968f89
Merge: 71bacb9 fc2395c
Author: heymarco <he...@gmail.com>
AuthorDate: Mon Mar 1 15:18:20 2021 +0100

    Merge branch 'dev' of github.com:apache/incubator-streampipes-extensions into dev

 pom.xml                                            |  14 +-
 .../streampipes/connect/adapters/opcua/OpcUa.java  | 103 +++++++++++--
 .../connect/adapters/opcua/OpcUaAdapter.java       | 161 +++++++--------------
 .../connect/adapters/opcua/utils/OpcUaConnect.java |  30 ++++
 .../opcua/{ => utils}/OpcUaNodeVariants.java       |   2 +-
 .../adapters/opcua/{ => utils}/OpcUaTypes.java     |   2 +-
 .../documentation.md                               |  33 +++++
 .../strings.en                                     |   9 +-
 streampipes-pipeline-elements-all-flink/pom.xml    |   5 +-
 streampipes-processors-aggregation-flink/pom.xml   |   5 +-
 streampipes-processors-enricher-flink/pom.xml      |   5 +-
 streampipes-processors-geo-flink/pom.xml           |   5 +-
 .../pom.xml                                        |   5 +-
 streampipes-processors-statistics-flink/pom.xml    |   5 +-
 streampipes-processors-text-mining-flink/pom.xml   |   5 +-
 .../pom.xml                                        |   5 +-
 streampipes-sinks-databases-flink/pom.xml          |   8 +-
 streampipes-sinks-databases-jvm/pom.xml            |   8 +
 .../sinks/databases/jvm/opcua/OpcUa.java           |  10 +-
 .../strings.en                                     |   4 +-
 20 files changed, 274 insertions(+), 150 deletions(-)

diff --cc pom.xml
index 28977ae,001762b..10a767b
--- a/pom.xml
+++ b/pom.xml
@@@ -668,11 -668,10 +668,15 @@@
                  <version>2.3.3</version>
              </dependency>
              <dependency>
+                 <groupId>org.glassfish.jaxb</groupId>
+                 <artifactId>jaxb-runtime</artifactId>
+                 <version>2.3.3</version>
+             </dependency>
++            <dependency>
 +                <groupId>jakarta.activation</groupId>
 +                <artifactId>jakarta.activation-api</artifactId>
 +                <version>1.2.2</version>
 +            </dependency>
- 
          </dependencies>
      </dependencyManagement>