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/01/31 11:20:30 UTC
[plc4x] 18/45: - Some version updates of dependencies prior to
cutting the release branch
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/plc4c
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f8261ed0545fb022651cec61ca6509344393ca09
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jan 25 09:42:07 2021 +0100
- Some version updates of dependencies prior to cutting the release branch
---
plc4j/examples/hello-integration-iotdb/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 2 +-
plc4j/integrations/apache-camel/pom.xml | 4 ++--
.../src/test/java/org/apache/plc4x/camel/ManualTest.java | 2 +-
plc4j/integrations/apache-nifi/pom.xml | 2 +-
plc4j/osgi/pom.xml | 5 ++++-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/plc4j/examples/hello-integration-iotdb/pom.xml b/plc4j/examples/hello-integration-iotdb/pom.xml
index bae5bcb..d6ec58c 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.10.1</iotdb.version>
+ <iotdb.version>0.11.2</iotdb.version>
<app.main.class>org.apache.plc4x.java.examples.integration.iotdb.PlcLogger</app.main.class>
</properties>
diff --git a/plc4j/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml
index d2e52dc..ba66ab1 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -31,7 +31,7 @@
<name>PLC4J: Integrations: Apache Calcite</name>
<properties>
- <calcite-core.version>1.21.0</calcite-core.version>
+ <calcite-core.version>1.26.0</calcite-core.version>
</properties>
<dependencies>
diff --git a/plc4j/integrations/apache-camel/pom.xml b/plc4j/integrations/apache-camel/pom.xml
index 37b57d4..1cde2ad 100644
--- a/plc4j/integrations/apache-camel/pom.xml
+++ b/plc4j/integrations/apache-camel/pom.xml
@@ -199,7 +199,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<!-- TODO: version temporary defined due to PLC4X-22-->
- <version>3.1.0</version>
+ <version>${camel.version}</version>
<scope>test</scope>
</dependency>
@@ -225,7 +225,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-main</artifactId>
- <version>3.1.0</version>
+ <version>${camel.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java
index 9b5e2ad..b5a6a97 100644
--- a/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java
+++ b/plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ManualTest.java
@@ -39,7 +39,7 @@ public class ManualTest {
// bind MyBean into the registry
main.bind("foo", new MyBean());
// add routes
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
// add event listener
main.addMainListener(new Events());
// set the properties from a file
diff --git a/plc4j/integrations/apache-nifi/pom.xml b/plc4j/integrations/apache-nifi/pom.xml
index 790658d..45d6cc6 100644
--- a/plc4j/integrations/apache-nifi/pom.xml
+++ b/plc4j/integrations/apache-nifi/pom.xml
@@ -29,7 +29,7 @@
<description>Integration module for integrating PLC4X into Apache Nifi.</description>
<properties>
- <nifi.version>1.12.0</nifi.version>
+ <nifi.version>1.12.1</nifi.version>
</properties>
<modules>
diff --git a/plc4j/osgi/pom.xml b/plc4j/osgi/pom.xml
index 4365f4d..1946dc1 100644
--- a/plc4j/osgi/pom.xml
+++ b/plc4j/osgi/pom.xml
@@ -18,16 +18,19 @@
-->
<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</artifactId>
<version>0.8.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>plc4j-osgi</artifactId>
+
<name>PLC4J: OSGi</name>
<description>OSGi Module for PLC4X</description>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>