diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index e307d1f348c..83bf992c87c 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -24,6 +24,6 @@ com.gradle common-custom-user-data-maven-extension - 1.13 + 2 \ No newline at end of file diff --git a/plc4go/spi/testutils/TestUtils.go b/plc4go/spi/testutils/TestUtils.go index 57fdf32ab6d..45005dd91ac 100644 --- a/plc4go/spi/testutils/TestUtils.go +++ b/plc4go/spi/testutils/TestUtils.go @@ -180,8 +180,14 @@ func shouldNoColor() bool { return noColor } +type TestingLog interface { + Log(args ...interface{}) + Logf(format string, args ...interface{}) + Helper() +} + // ProduceTestingLogger produces a logger which redirects to testing.T -func ProduceTestingLogger(t *testing.T) zerolog.Logger { +func ProduceTestingLogger(t TestingLog) zerolog.Logger { noColor := shouldNoColor() consoleWriter := zerolog.NewConsoleWriter( zerolog.ConsoleTestWriter(t), diff --git a/plc4j/drivers/ctrlx/pom.xml b/plc4j/drivers/ctrlx/pom.xml index 31a03e68e03..66b0b6653fd 100644 --- a/plc4j/drivers/ctrlx/pom.xml +++ b/plc4j/drivers/ctrlx/pom.xml @@ -163,7 +163,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.16.1 + 2.17.0 com.hrakaroo diff --git a/plc4py/requirements.txt b/plc4py/requirements.txt index c35f6ec5173..5481f6aa8a5 100644 --- a/plc4py/requirements.txt +++ b/plc4py/requirements.txt @@ -19,20 +19,20 @@ aenum==3.1.15 annotated-types==0.6.0 bitarray==2.9.2 -black==24.1.1 +black==24.3.0 build==1.2.1 cfgv==3.4.0 click==8.1.7 coverage==7.4.1 distlib==0.3.8 -filelock==3.13.1 +filelock==3.13.4 flake8==7.0.0 funkify==0.4.5 identify==2.5.35 iniconfig==2.0.0 mccabe==0.7.0 mock==5.1.0 -mypy==1.8.0 +mypy==1.9.0 mypy-extensions==1.0.0 nodeenv==1.8.0 packaging==24.0 @@ -49,6 +49,6 @@ pytest-asyncio==0.23.6 pytest-mock==3.14.0 PyYAML==6.0.1 requires==0.10.5 -typing_extensions==4.9.0 -virtualenv==20.25.0 +typing_extensions==4.11.0 +virtualenv==20.25.1 xtyping==0.8.2 diff --git a/src/site/asciidoc/users/integrations/apache-kafka.adoc b/src/site/asciidoc/users/integrations/apache-kafka.adoc index c141734eada..6a0a244573f 100644 --- a/src/site/asciidoc/users/integrations/apache-kafka.adoc +++ b/src/site/asciidoc/users/integrations/apache-kafka.adoc @@ -26,7 +26,7 @@ mission-critical applications. # PLC4X Kafka Connectors The PLC4X connectors have the ability to pass data between Kafka and devices using industrial protocols. -They can be built from source from the latest https://plc4x.apache.org/users/download.html[release] of +They can be built from source from the latest https://github.com/apache/plc4x-extras/tree/main/plc4j/integrations/apache-kafka[plc4x extras - kafka integration] and plc4x https://plc4x.apache.org/users/download.html[release] of PLC4X or from the latest snapshot from https://github.com/apache/plc4x[github]. ## Introduction @@ -88,7 +88,7 @@ A sample configuration file is provided in the PLC4X Kafka integration repositor This includes comments as well as meaningful properties that can be used with the worker. The configuration of the connectors via the REST interface expects the same properties as are specified within the -example https://github.com/apache/plc4x/tree/develop/plc4j/integrations/apache-kafka/config[config/plc4x-source.properties] file. These will need to be in JSON format and included with a couple of headers. +example https://github.com/apache/plc4x-extras/blob/main/plc4j/integrations/apache-kafka/config/plc4x-source.properties[config/plc4x-source.properties] file. These will need to be in JSON format and included with a couple of headers. An example below shows the format it expects:- curl -X POST -H "Content-Type: application/json" --data '{"name": "plc-source-test", "config": {"connector.class":"org.apache.plc4x.kafka.Plc4xSourceConnector", @@ -134,7 +134,7 @@ The configuration of the Connectors is then provided via REST interface: ## Sink Connector -See https://github.com/apache/plc4x/tree/develop/plc4j/integrations/apache-kafka/config[config/sink.properties] for an example configuration. +See https://github.com/apache/plc4x-extras/blob/main/plc4j/integrations/apache-kafka/config/plc4x-sink.properties[config/sink.properties] for an example configuration. ### Start a Kafka Connect Sink Worker (Standalone)