You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2021/12/25 16:00:25 UTC
[plc4x] branch develop updated (13fc3d0 -> f2c0578)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 13fc3d0 fix: Fixed a potential exception if the serializer produces more bytes than the testsuite expects.
new 9d0151c fix: Updated to the latest version of Apache NiFi
new b45ec67 fix: Updated to the latest version of Apache Kafka
new 17ae381 fix: Updated to the latest version of Apache Calcite
new f2c0578 fix: Bumped most dependencies and cleaned up dependency management throughout the project.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
plc4j/examples/hello-cloud-azure/pom.xml | 35 +--
plc4j/examples/hello-cloud-google/pom.xml | 23 +-
plc4j/examples/hello-connectivity-kafka/pom.xml | 45 ----
plc4j/examples/hello-connectivity-mqtt/pom.xml | 2 +-
plc4j/examples/hello-discovery/pom.xml | 2 -
.../examples/hello-influx-data-collection/pom.xml | 2 +-
plc4j/examples/hello-integration-edgent/pom.xml | 1 -
plc4j/examples/hello-integration-iotdb/pom.xml | 20 +-
plc4j/examples/hello-opm/pom.xml | 1 -
plc4j/examples/hello-webapp/pom.xml | 2 +-
plc4j/examples/hello-webapp/webapp/pom.xml | 13 +-
plc4j/examples/hello-webservice/pom.xml | 1 -
.../hello-world-plc4x-subscription/pom.xml | 2 -
plc4j/examples/hello-world-plc4x-write/pom.xml | 2 -
plc4j/examples/hello-world-plc4x/pom.xml | 2 -
plc4j/examples/plc4j-s7event/pom.xml | 1 -
plc4j/examples/poll-loop/pom.xml | 1 -
plc4j/examples/pom.xml | 1 +
plc4j/integrations/apache-calcite/pom.xml | 17 +-
plc4j/integrations/apache-camel/pom.xml | 2 +-
plc4j/integrations/apache-kafka/pom.xml | 2 +-
plc4j/integrations/apache-nifi/pom.xml | 38 +---
plc4j/integrations/opcua-server/pom.xml | 5 -
pom.xml | 235 ++++++++++++---------
24 files changed, 157 insertions(+), 298 deletions(-)
[plc4x] 04/04: fix: Bumped most dependencies and cleaned up dependency management throughout the project.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f2c0578a9244ae87c55c5eef441eff7d7bdd6f4e
Author: cdutz <ch...@c-ware.de>
AuthorDate: Sat Dec 25 17:00:12 2021 +0100
fix: Bumped most dependencies and cleaned up dependency management throughout the project.
---
plc4j/examples/hello-cloud-azure/pom.xml | 35 +--
plc4j/examples/hello-cloud-google/pom.xml | 23 +-
plc4j/examples/hello-connectivity-kafka/pom.xml | 45 ----
plc4j/examples/hello-connectivity-mqtt/pom.xml | 2 +-
plc4j/examples/hello-discovery/pom.xml | 2 -
.../examples/hello-influx-data-collection/pom.xml | 2 +-
plc4j/examples/hello-integration-edgent/pom.xml | 1 -
plc4j/examples/hello-integration-iotdb/pom.xml | 20 +-
plc4j/examples/hello-opm/pom.xml | 1 -
plc4j/examples/hello-webapp/pom.xml | 2 +-
plc4j/examples/hello-webapp/webapp/pom.xml | 13 +-
plc4j/examples/hello-webservice/pom.xml | 1 -
.../hello-world-plc4x-subscription/pom.xml | 2 -
plc4j/examples/hello-world-plc4x-write/pom.xml | 2 -
plc4j/examples/hello-world-plc4x/pom.xml | 2 -
plc4j/examples/plc4j-s7event/pom.xml | 1 -
plc4j/examples/poll-loop/pom.xml | 1 -
plc4j/examples/pom.xml | 1 +
plc4j/integrations/apache-calcite/pom.xml | 10 +-
plc4j/integrations/apache-camel/pom.xml | 2 +-
plc4j/integrations/apache-nifi/pom.xml | 36 +---
plc4j/integrations/opcua-server/pom.xml | 5 -
pom.xml | 235 ++++++++++++---------
23 files changed, 148 insertions(+), 296 deletions(-)
diff --git a/plc4j/examples/hello-cloud-azure/pom.xml b/plc4j/examples/hello-cloud-azure/pom.xml
index 64e215d..7fba9db 100644
--- a/plc4j/examples/hello-cloud-azure/pom.xml
+++ b/plc4j/examples/hello-cloud-azure/pom.xml
@@ -43,46 +43,13 @@
<dependency>
<groupId>com.microsoft.azure.sdk.iot</groupId>
<artifactId>iot-device-client</artifactId>
- <version>1.16.0</version>
+ <version>1.34.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
</dependencies>
- <!-- Managed dependencies to eliminate transitively importing libraries with CVEs -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.10.0</version>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- <version>2.1.8</version>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jffi</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jffi</artifactId>
- <version>1.2.17</version>
- <classifier>native</classifier>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- <version>1.60</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-cloud-google/pom.xml b/plc4j/examples/hello-cloud-google/pom.xml
index 19185ed..9af0ac6 100644
--- a/plc4j/examples/hello-cloud-google/pom.xml
+++ b/plc4j/examples/hello-cloud-google/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
- <version>1.2.1</version>
+ <version>1.2.5</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -57,12 +57,10 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -84,23 +82,4 @@
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>proton-j</artifactId>
- <version>0.18.0</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp</groupId>
- <artifactId>okhttp</artifactId>
- <version>2.7.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.6</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-kafka/pom.xml b/plc4j/examples/hello-connectivity-kafka/pom.xml
index 47811ee..1bbc6e7 100644
--- a/plc4j/examples/hello-connectivity-kafka/pom.xml
+++ b/plc4j/examples/hello-connectivity-kafka/pom.xml
@@ -96,49 +96,4 @@
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>com.101tec</groupId>
- <artifactId>zkclient</artifactId>
- <version>0.11</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.10</artifactId>
- <version>0.10.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.10.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.4.14</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.13.7</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.25</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-mqtt/pom.xml b/plc4j/examples/hello-connectivity-mqtt/pom.xml
index 8ee5541..9f77351 100644
--- a/plc4j/examples/hello-connectivity-mqtt/pom.xml
+++ b/plc4j/examples/hello-connectivity-mqtt/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
- <version>2.1.12</version>
+ <version>2.2.21</version>
</dependency>
<dependency>
diff --git a/plc4j/examples/hello-discovery/pom.xml b/plc4j/examples/hello-discovery/pom.xml
index e1c7916..f69e276 100644
--- a/plc4j/examples/hello-discovery/pom.xml
+++ b/plc4j/examples/hello-discovery/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -54,7 +53,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/hello-influx-data-collection/pom.xml b/plc4j/examples/hello-influx-data-collection/pom.xml
index 94bc866..40b265f 100644
--- a/plc4j/examples/hello-influx-data-collection/pom.xml
+++ b/plc4j/examples/hello-influx-data-collection/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
- <version>1.4.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
diff --git a/plc4j/examples/hello-integration-edgent/pom.xml b/plc4j/examples/hello-integration-edgent/pom.xml
index b06fc29..fc28214 100644
--- a/plc4j/examples/hello-integration-edgent/pom.xml
+++ b/plc4j/examples/hello-integration-edgent/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/hello-integration-iotdb/pom.xml b/plc4j/examples/hello-integration-iotdb/pom.xml
index 60465f4..f8b201d 100644
--- a/plc4j/examples/hello-integration-iotdb/pom.xml
+++ b/plc4j/examples/hello-integration-iotdb/pom.xml
@@ -32,7 +32,7 @@
<description>Application using Edgent to output PLC data to the IoTDB.</description>
<properties>
- <iotdb.version>0.12.1</iotdb.version>
+ <iotdb.version>0.12.4</iotdb.version>
<app.main.class>org.apache.plc4x.java.examples.integration.iotdb.PlcLogger</app.main.class>
</properties>
@@ -77,7 +77,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
@@ -112,7 +111,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -120,20 +118,4 @@
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <!-- Without these the docker build won't work -->
- <dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>3.0.11</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- <version>2.0.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-opm/pom.xml b/plc4j/examples/hello-opm/pom.xml
index 9827e5e..87a5d58 100644
--- a/plc4j/examples/hello-opm/pom.xml
+++ b/plc4j/examples/hello-opm/pom.xml
@@ -54,7 +54,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/hello-webapp/pom.xml b/plc4j/examples/hello-webapp/pom.xml
index 047d809..c03279d 100644
--- a/plc4j/examples/hello-webapp/pom.xml
+++ b/plc4j/examples/hello-webapp/pom.xml
@@ -33,7 +33,7 @@
<properties>
<royale.version>0.9.8</royale.version>
- <spring-boot.version>2.2.5.RELEASE</spring-boot.version>
+ <spring-boot.version>2.6.2</spring-boot.version>
</properties>
<modules>
diff --git a/plc4j/examples/hello-webapp/webapp/pom.xml b/plc4j/examples/hello-webapp/webapp/pom.xml
index ae0bbf8..8376152 100644
--- a/plc4j/examples/hello-webapp/webapp/pom.xml
+++ b/plc4j/examples/hello-webapp/webapp/pom.xml
@@ -228,7 +228,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.15.12</version>
+ <version>5.16.3</version>
</dependency>
<dependency>
@@ -249,17 +249,6 @@
</dependency>
<dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-opcua</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
diff --git a/plc4j/examples/hello-webservice/pom.xml b/plc4j/examples/hello-webservice/pom.xml
index 4be8f99..d214940 100644
--- a/plc4j/examples/hello-webservice/pom.xml
+++ b/plc4j/examples/hello-webservice/pom.xml
@@ -66,7 +66,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/hello-world-plc4x-subscription/pom.xml b/plc4j/examples/hello-world-plc4x-subscription/pom.xml
index 446def9..36d5a9c 100644
--- a/plc4j/examples/hello-world-plc4x-subscription/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-subscription/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
@@ -55,7 +54,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/hello-world-plc4x-write/pom.xml b/plc4j/examples/hello-world-plc4x-write/pom.xml
index 59c0a8e..9f8ca49 100644
--- a/plc4j/examples/hello-world-plc4x-write/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-write/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
@@ -55,7 +54,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/hello-world-plc4x/pom.xml b/plc4j/examples/hello-world-plc4x/pom.xml
index 1c5d9bf..0a30e65 100644
--- a/plc4j/examples/hello-world-plc4x/pom.xml
+++ b/plc4j/examples/hello-world-plc4x/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -54,7 +53,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/examples/plc4j-s7event/pom.xml b/plc4j/examples/plc4j-s7event/pom.xml
index a5c3cb9..8174204 100644
--- a/plc4j/examples/plc4j-s7event/pom.xml
+++ b/plc4j/examples/plc4j-s7event/pom.xml
@@ -74,7 +74,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.30</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/examples/poll-loop/pom.xml b/plc4j/examples/poll-loop/pom.xml
index 0087b4e..f47b7e8 100644
--- a/plc4j/examples/poll-loop/pom.xml
+++ b/plc4j/examples/poll-loop/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
</dependencies>
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index 66d3ad1..99fd597 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -125,6 +125,7 @@
</pluginManagement>
</build>
+ <!-- Change the default scope to "compile" to include logback in all examples -->
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/plc4j/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml
index 7ecfd67..90588c3 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -149,16 +149,16 @@
<dependencyManagement>
<dependencies>
- <!--dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>3.6.1</version>
- </dependency-->
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.10.0</version>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.9.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/plc4j/integrations/apache-camel/pom.xml b/plc4j/integrations/apache-camel/pom.xml
index aba413b..c5b2814 100644
--- a/plc4j/integrations/apache-camel/pom.xml
+++ b/plc4j/integrations/apache-camel/pom.xml
@@ -33,7 +33,7 @@
<description>Integration module for integrating PLC4X into Apache Camel.</description>
<properties>
- <camel.version>3.10.0</camel.version>
+ <camel.version>3.14.0</camel.version>
</properties>
<build>
diff --git a/plc4j/integrations/apache-nifi/pom.xml b/plc4j/integrations/apache-nifi/pom.xml
index 136ea5a..0ebea78 100644
--- a/plc4j/integrations/apache-nifi/pom.xml
+++ b/plc4j/integrations/apache-nifi/pom.xml
@@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.3.3</version>
<extensions>true</extensions>
</plugin>
<!-- Makes buildRevision and buildBranch available to the NAR Plugin so they can be populated in the MANIFEST -->
@@ -80,49 +80,15 @@
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi</artifactId>
- <version>${nifi.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-utils</artifactId>
- <version>${nifi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<version>${nifi.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-nar-bundles</artifactId>
- <version>${nifi.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>5.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- <version>1.4.10</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-common</artifactId>
- <version>1.4.10</version>
- </dependency>
- <dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.0</version>
diff --git a/plc4j/integrations/opcua-server/pom.xml b/plc4j/integrations/opcua-server/pom.xml
index a6fc4ab..3f23d5b 100644
--- a/plc4j/integrations/opcua-server/pom.xml
+++ b/plc4j/integrations/opcua-server/pom.xml
@@ -215,11 +215,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
-
<!-- Build a fat jar containing all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 95d2a7d..e0bd7a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
-->
<maven.version>3.6.3</maven.version>
- <java.version>1.8</java.version>
+ <java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
@@ -106,21 +106,21 @@
<plc4x-code-generation.version>1.6.0-SNAPSHOT</plc4x-code-generation.version>
- <antlr.version>4.9.2</antlr.version>
- <apiguardian.version>1.1.1</apiguardian.version>
- <assertj.version>3.20.2</assertj.version>
- <awaitility.version>4.1.0</awaitility.version>
+ <antlr.version>4.9.3</antlr.version>
+ <apiguardian.version>1.1.2</apiguardian.version>
+ <assertj.version>3.21.0</assertj.version>
+ <awaitility.version>4.1.1</awaitility.version>
<!-- The currently available version is 2.0.5 and anything above 1.4.3 is no longer compatible with our code -->
<bit-io.version>1.4.3</bit-io.version>
- <bouncycastle.version>1.69</bouncycastle.version>
- <boost.version>1.77.0</boost.version>
- <boost.version.underline-short>1_77</boost.version.underline-short>
+ <bouncycastle.version>1.70</bouncycastle.version>
+ <boost.version>1.78.0</boost.version>
+ <boost.version.underline-short>1_78</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
- <byte-buddy.version>1.11.15</byte-buddy.version>
+ <byte-buddy.version>1.12.6</byte-buddy.version>
<!-- Be sure to keep this version set to the version of the cmake-maven-plugin -->
<cmake-version>3.18.4</cmake-version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
- <commons-cli.version>1.4</commons-cli.version>
+ <commons-cli.version>1.5.0</commons-cli.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-compress.version>1.21</commons-compress.version>
@@ -133,35 +133,32 @@
<commons-text.version>1.9</commons-text.version>
<commons-csv.version>1.9.0</commons-csv.version>
<dom4j.version>2.1.3</dom4j.version>
- <elasticsearch.version>7.10.0</elasticsearch.version>
- <equalsverifier.version>3.7.1</equalsverifier.version>
+ <equalsverifier.version>3.8.1</equalsverifier.version>
<freemarker.version>2.3.31</freemarker.version>
<groovy.version>3.0.9</groovy.version>
- <gson.version>2.8.8</gson.version>
- <guava.version>30.1.1-jre</guava.version>
+ <gson.version>2.8.9</gson.version>
+ <guava.version>31.0.1-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.14</httpcore.version>
- <jackson.version>2.12.5</jackson.version>
+ <jackson.version>2.13.1</jackson.version>
<!-- When updating this to the latest version, we're getting errors in the opcua server tests -->
<jaxb.version>3.0.2</jaxb.version>
- <jetty-util.version>11.0.6</jetty-util.version>
- <jna.version>5.9.0</jna.version>
- <joda-time.version>2.10.10</joda-time.version>
+ <jetty-util.version>11.0.7</jetty-util.version>
+ <jna.version>5.10.0</jna.version>
+ <joda-time.version>2.10.13</joda-time.version>
<jserialcom.version>2.7.0</jserialcom.version>
- <junit.jupiter.version>5.7.2</junit.jupiter.version>
- <junit.platform.version>1.7.2</junit.platform.version>
- <log4j.version>2.17.0</log4j.version>
- <logback.version>1.2.5</logback.version>
+ <junit.jupiter.version>5.8.2</junit.jupiter.version>
+ <junit.platform.version>1.8.2</junit.platform.version>
+ <logback.version>1.2.10</logback.version>
<milo.version>0.6.3</milo.version>
- <mockito.version>3.12.4</mockito.version>
- <netty.version>4.1.67.Final</netty.version>
- <owasp-dependency-check.version>6.3.1</owasp-dependency-check.version>
+ <mockito.version>4.2.0</mockito.version>
+ <netty.version>4.1.72.Final</netty.version>
+ <owasp-dependency-check.version>6.5.1</owasp-dependency-check.version>
<pcap4j.version>1.8.2</pcap4j.version>
<slf4j.version>1.7.32</slf4j.version>
- <thrift.version>0.13.0</thrift.version>
<vavr.version>0.10.4</vavr.version>
- <xmlunit.version>2.8.3</xmlunit.version>
+ <xmlunit.version>2.8.4</xmlunit.version>
<!-- Site properties -->
<asciidoctor.maven.plugin.version>2.1.0</asciidoctor.maven.plugin.version>
@@ -233,11 +230,6 @@
<artifactId>netty-common</artifactId>
<version>${netty.version}</version>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
- </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -307,29 +299,12 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</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>
- </dependency>
-
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
@@ -428,11 +403,6 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-csv</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
@@ -467,21 +437,11 @@
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
@@ -508,11 +468,6 @@
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -537,6 +492,37 @@
</dependency>
<dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>sdk-server</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>sdk-core</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>stack-core</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>stack-server</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>stack-client</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>dictionary-manager</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
@@ -596,54 +582,61 @@
****************************************************************************** -->
<dependency>
- <groupId>org.apiguardian</groupId>
- <artifactId>apiguardian-api</artifactId>
- <version>${apiguardian.version}</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
</dependency>
+
<dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-engine</artifactId>
- <version>${junit.platform.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.version}</version>
</dependency>
+
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-server</artifactId>
- <version>${milo.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
</dependency>
+
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-core</artifactId>
- <version>${milo.version}</version>
+ <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>org.eclipse.milo</groupId>
- <artifactId>stack-core</artifactId>
- <version>${milo.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
</dependency>
+
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>stack-server</artifactId>
- <version>${milo.version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
+
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>stack-client</artifactId>
- <version>${milo.version}</version>
+ <groupId>org.apiguardian</groupId>
+ <artifactId>apiguardian-api</artifactId>
+ <version>${apiguardian.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>dictionary-manager</artifactId>
- <version>${milo.version}</version>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
</dependency>
<dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>3.2</version>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-engine</artifactId>
+ <version>${junit.platform.version}</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
@@ -850,6 +843,30 @@
</executions>
</plugin>
+ <!--
+ Check the referenced dependencies for known vulnerabilities
+ and fail the build if there are critical ones in our classpath
+ -->
+ <!--plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <suppressionFiles>
+ <suppressionFile>owasp-suppressions.xml</suppressionFile>
+ </suppressionFiles>
+ <failBuildOnCVSS>8</failBuildOnCVSS>
+ <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+ <failOnError>true</failOnError>
+ </configuration>
+ </plugin-->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -1081,12 +1098,26 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -1161,7 +1192,7 @@
<outputEncoding>${project.reporting.outputencoding}</outputEncoding>
<!--
IntelliJ can't find the asciidoc config option in the site plugin, which is correct.
- However this config section is used by the asciidoctor site plugin extension. So plead
+ However, this config section is used by the asciidoctor site plugin extension. So plead
ignore this error, it's actually ok.
-->
<asciidoc>
[plc4x] 01/04: fix: Updated to the latest version of Apache NiFi
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 9d0151cf73346b6a2a8e55c426f0dd255ad75c57
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Dec 23 16:17:55 2021 +0100
fix: Updated to the latest version of Apache NiFi
---
plc4j/integrations/apache-nifi/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plc4j/integrations/apache-nifi/pom.xml b/plc4j/integrations/apache-nifi/pom.xml
index 93735bd..136ea5a 100644
--- a/plc4j/integrations/apache-nifi/pom.xml
+++ b/plc4j/integrations/apache-nifi/pom.xml
@@ -33,7 +33,7 @@
<description>Integration module for integrating PLC4X into Apache Nifi.</description>
<properties>
- <nifi.version>1.14.0</nifi.version>
+ <nifi.version>1.15.2</nifi.version>
</properties>
<modules>
[plc4x] 03/04: fix: Updated to the latest version of Apache Calcite
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 17ae38192a150022e9ffadec2bd141d42926f35b
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Dec 23 16:21:53 2021 +0100
fix: Updated to the latest version of Apache Calcite
---
plc4j/integrations/apache-calcite/pom.xml | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/plc4j/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml
index e246a4a..7ecfd67 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -18,19 +18,21 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-integrations</artifactId>
<version>0.10.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>plc4j-apache-calcite</artifactId>
<name>PLC4J: Integrations: Apache Calcite</name>
<properties>
- <calcite-core.version>1.26.0</calcite-core.version>
+ <calcite-core.version>1.28.0</calcite-core.version>
</properties>
<build>
@@ -147,10 +149,15 @@
<dependencyManagement>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.6.1</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>3.10.0</version>
</dependency>
</dependencies>
</dependencyManagement>
[plc4x] 02/04: fix: Updated to the latest version of Apache Kafka
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b45ec67d1ab2c7faa9bec3e805e92b795b7e53b7
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Dec 23 16:19:05 2021 +0100
fix: Updated to the latest version of Apache Kafka
---
plc4j/integrations/apache-kafka/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plc4j/integrations/apache-kafka/pom.xml b/plc4j/integrations/apache-kafka/pom.xml
index 0e80b19..6405897 100644
--- a/plc4j/integrations/apache-kafka/pom.xml
+++ b/plc4j/integrations/apache-kafka/pom.xml
@@ -32,7 +32,7 @@
<description>Integration module for integrating PLC4X into Apache Kafka (Kafka-Connect-Plugin)</description>
<properties>
- <kafka.version>2.8.0</kafka.version>
+ <kafka.version>3.0.0</kafka.version>
<kafka.connect.maven.plugin.version>0.12.0</kafka.connect.maven.plugin.version>
</properties>