From a80d648b65106a9e035775ea76583f94f1f3991b Mon Sep 17 00:00:00 2001 From: Cesar Garcia Date: Sun, 17 Apr 2022 11:40:10 -0400 Subject: [PATCH 1/4] Comment wrong calls. --- .../language/mspec/expression/ExpressionStringListener.java | 2 ++ .../mspec/model/definitions/DefaultComplexTypeDefinition.java | 3 ++- pom.xml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java index 4c5f3dd313a..6bc2cc9c328 100644 --- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java +++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java @@ -153,6 +153,7 @@ private void schedulePropertyResolution(String propertyName, CompletableFuture defaultArgument = complexTypeDefinition.getAllParserArguments().orElseThrow().stream() diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java index 3114f2f9e57..e9068bfcd8a 100644 --- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java +++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java @@ -123,6 +123,7 @@ public List getVirtualFields() { .collect(Collectors.toList()); } + /* @Override public List getAllFields() { List fields = new LinkedList<>(); @@ -132,7 +133,7 @@ public List getAllFields() { fields.addAll(getFields()); return fields; } - +*/ @Override public List getAllPropertyFields() { List fields = new LinkedList<>(); diff --git a/pom.xml b/pom.xml index 3b5eb17b6e3..fdd0df0ee94 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,8 @@ true true + 1.8 + 1.8 From cc82b7764bc7219c836597fc088d708ac344c5fa Mon Sep 17 00:00:00 2001 From: Cesar Garcia Date: Fri, 20 May 2022 21:19:29 -0400 Subject: [PATCH 2/4] Update repo. --- .../mspec/model/definitions/DefaultComplexTypeDefinition.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java index e9068bfcd8a..3114f2f9e57 100644 --- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java +++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java @@ -123,7 +123,6 @@ public List getVirtualFields() { .collect(Collectors.toList()); } - /* @Override public List getAllFields() { List fields = new LinkedList<>(); @@ -133,7 +132,7 @@ public List getAllFields() { fields.addAll(getFields()); return fields; } -*/ + @Override public List getAllPropertyFields() { List fields = new LinkedList<>(); From 61ded6161630196cc459633c7f0a168c60fef282 Mon Sep 17 00:00:00 2001 From: Cesar Garcia Date: Fri, 24 Jun 2022 08:40:54 -0400 Subject: [PATCH 3/4] Make rebase. --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index fdd0df0ee94..3b5eb17b6e3 100644 --- a/pom.xml +++ b/pom.xml @@ -168,8 +168,6 @@ true true - 1.8 - 1.8 From 2961fd5fa4f25be526f21ba98b35b10f348b6b29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 21:55:09 +0000 Subject: [PATCH 4/4] build(deps): bump kafka.version from 3.2.0 to 7.2.2-ce Bumps `kafka.version` from 3.2.0 to 7.2.2-ce. Updates `kafka-clients` from 3.2.0 to 7.2.2-ce Updates `connect-api` from 3.2.0 to 7.2.2-ce --- updated-dependencies: - dependency-name: org.apache.kafka:kafka-clients dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.kafka:connect-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- plc4j/integrations/apache-kafka/pom.xml | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/plc4j/integrations/apache-kafka/pom.xml b/plc4j/integrations/apache-kafka/pom.xml index b5ce1334171..9e2c5b92b0b 100644 --- a/plc4j/integrations/apache-kafka/pom.xml +++ b/plc4j/integrations/apache-kafka/pom.xml @@ -23,7 +23,7 @@ org.apache.plc4x plc4j-integrations - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT plc4j-apache-kafka @@ -32,7 +32,7 @@ Integration module for integrating PLC4X into Apache Kafka (Kafka-Connect-Plugin) - 3.2.0 + 7.2.2-ce 0.12.0 @@ -180,17 +180,17 @@ org.apache.plc4x plc4j-api - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT org.apache.plc4x plc4j-scraper - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT org.apache.plc4x plc4j-connection-cache - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT @@ -210,67 +210,67 @@ org.apache.plc4x plc4j-driver-ab-eth - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-ads - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-canopen - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-eip - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-firmata - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-knxnetip - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-modbus - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-opcua - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-s7 - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-driver-simulated - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime org.apache.plc4x plc4j-transport-tcp - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT runtime