Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hutcheb committed Apr 12, 2024
2 parents 7196f34 + 5316de1 commit 4df2438
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>1.13</version>
<version>2</version>
</extension>
</extensions>
8 changes: 7 additions & 1 deletion plc4go/spi/testutils/TestUtils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion plc4j/drivers/ctrlx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.16.1</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>com.hrakaroo</groupId>
Expand Down
10 changes: 5 additions & 5 deletions plc4py/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions src/site/asciidoc/users/integrations/apache-kafka.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 4df2438

Please sign in to comment.