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 2019/02/22 14:02:41 UTC
[incubator-plc4x] branch develop updated (78f84b4 -> 1c85380)
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/incubator-plc4x.git.
from 78f84b4 PLC4X-84 - NPE when reading Marker
new b799c2f - Fixed a bug in the code
new 1c85380 - Fixed a problem with the logging setup of the elastic example
The 2 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:
examples/hello-storage-elasticsearch/pom.xml | 18 ++++++++++--------
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
[incubator-plc4x] 02/02: - Fixed a problem with the logging setup
of the elastic example
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/incubator-plc4x.git
commit 1c8538036c45abf13567143ae96a451c79a4c248
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Feb 22 15:02:38 2019 +0100
- Fixed a problem with the logging setup of the elastic example
---
examples/hello-storage-elasticsearch/pom.xml | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/examples/hello-storage-elasticsearch/pom.xml b/examples/hello-storage-elasticsearch/pom.xml
index 2ecc99a..198ea09 100644
--- a/examples/hello-storage-elasticsearch/pom.xml
+++ b/examples/hello-storage-elasticsearch/pom.xml
@@ -67,6 +67,12 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
@@ -90,13 +96,9 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>2.11.2</version>
</dependency>
</dependencies>
@@ -108,7 +110,7 @@
<configuration>
<usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
- <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
+ <usedDependency>org.apache.logging.log4j:log4j-slf4j-impl</usedDependency>
</usedDependencies>
</configuration>
</plugin>
[incubator-plc4x] 01/02: - Fixed a bug in the code
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/incubator-plc4x.git
commit b799c2f0b201cdc0ea151c51d954d2a4de157fdd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Feb 21 20:38:43 2019 +0100
- Fixed a bug in the code
---
.../main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index 46a0832..9a236ae 100644
--- a/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -78,7 +78,7 @@ public class HelloPlc4x {
CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
asyncResponse.whenComplete((readResponse, throwable) -> {
if (readResponse != null) {
- printResponse(syncResponse);
+ printResponse(readResponse);
} else {
logger.error("An error occurred: " + throwable.getMessage(), throwable);
}