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/05/20 13:43:10 UTC
[plc4x] branch develop updated (da9ac33 -> 1d6985a)
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/plc4x.git.
from da9ac33 [Fixed] wrong regex description space
new f832e53 PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
new 03d2469 PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
new 7e19d81 Updated the status of the languages and drivers on the website.
new 1d6985a Started updating the RELEASE_NOTES for the next release
The 4 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:
RELEASE_NOTES | 11 ++++++++++-
.../examples/storage/elasticsearch/ElasticsearchStorage.java | 5 +++--
.../src/test/java/org/apache/plc4x/java/deltav/PoCES.java | 5 +++--
pom.xml | 4 ++--
src/site/asciidoc/index.adoc | 4 ++--
5 files changed, 20 insertions(+), 9 deletions(-)
[plc4x] 01/04: PLC4X-125 - Update the ElasticSearch example to a
more recent ElasticSearch version
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/plc4x.git
commit f832e535b3f011914d111e2bfa1e99aaf82a6030
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon May 20 15:14:24 2019 +0200
PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
- Updated the ElasticSearch example to the newest version (7.0.1)
---
.../java/examples/storage/elasticsearch/ElasticsearchStorage.java | 5 +++--
pom.xml | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
index 7cf704f..18ca35e 100644
--- a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
+++ b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
@@ -68,7 +68,8 @@ public class ElasticsearchStorage {
private static class MyNode extends Node {
private MyNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
- super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins);
+ super(InternalSettingsPreparer.prepareEnvironment(
+ preparedSettings, Collections.emptyMap(), null, () -> "hello-es"), classpathPlugins, true);
}
}
@@ -79,7 +80,7 @@ public class ElasticsearchStorage {
Node node = new MyNode(Settings.builder()
.put("transport.type", "netty4")
.put("http.type", "netty4")
- .put("http.enabled", "true")
+ .put("http.cors.enabled", "true")
.put("path.home", "elasticsearch-data")
.build(), Collections.singletonList(Netty4Plugin.class));
node.start();
diff --git a/pom.xml b/pom.xml
index d14ea55..8786d0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<commons-text.version>1.4</commons-text.version>
<crc.version>1.0.1</crc.version>
<daffodil.version>2.3.0</daffodil.version>
- <elasticsearch.version>6.4.2</elasticsearch.version>
+ <elasticsearch.version>7.0.1</elasticsearch.version>
<equalsverifier.version>3.0.2</equalsverifier.version>
<findbugs.version>3.0.1</findbugs.version>
<groovy.version>2.5.3</groovy.version>
@@ -139,7 +139,7 @@
<junit.version>4.12</junit.version>
<log4j.version>2.11.1</log4j.version>
<logback.version>1.2.3</logback.version>
- <lucene.version>7.4.0</lucene.version>
+ <lucene.version>8.0.0</lucene.version>
<metrics-core.version>3.1.2</metrics-core.version>
<mockito.version>2.24.5</mockito.version>
<netty.version>4.1.35.Final</netty.version>
[plc4x] 03/04: Updated the status of the languages and drivers on
the website.
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/plc4x.git
commit 7e19d81fd1390bfe5f2ee3dd86d15c34062d052d
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon May 20 15:42:40 2019 +0200
Updated the status of the languages and drivers on the website.
---
src/site/asciidoc/index.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 38bb3fb..f21d14c 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -58,7 +58,7 @@ At first we will be concentrating on providing adapters for the most widely used
- icon:wrench[role=yellow] link:protocols/ethernet-ip/index.html[EtherNet/IP (TCP)]
- icon:wrench[role=yellow] KNXNet/IP (UDP)
- icon:check[role=green] link:protocols/modbus/index.html[Modbus (TCP)]
-- icon:pause-circle[role=light-gray] link:protocols/opc-ua/index.html[OPC-UA (TCP)]
+- icon:check[role=green] link:protocols/opc-ua/index.html[OPC-UA (TCP)]
- icon:pause-circle[role=light-gray] Profinet
- icon:check[role=green] link:protocols/s7/index.html[S7-STEP7 (TCP)]
- icon:wrench[role=yellow] link:protocols/s7/index.html[S7-TIA (TCP)]
@@ -66,7 +66,7 @@ At first we will be concentrating on providing adapters for the most widely used
We are planning on providing support for the following programming languages:
- icon:wrench[role=yellow] C++
-- icon:pause-circle[role=light-gray] C# (.Net)
+- con:wrench[role=yellow] C# (.Net)
- icon:check[role=green] link:plc4j/index.html[Java]
- icon:wrench[role=yellow] Python
[plc4x] 04/04: Started updating the RELEASE_NOTES for the next
release
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/plc4x.git
commit 1d6985a4a5482f8db44063272e9f22941bd41e02
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon May 20 15:43:02 2019 +0200
Started updating the RELEASE_NOTES for the next release
---
RELEASE_NOTES | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 692868b..0db3644 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,13 +1,22 @@
==============================================================
-(Unreleased) Apache PLC4X (incubating) 0.4.0-SNAPSHOT
+(Unreleased) Apache PLC4X 0.4.0-SNAPSHOT
==============================================================
New Features
------------
+- The PlcConnection now supports a `ping` method to allow checking if an existing connection is still alive.
+- Support of the OPC-UA protocol with the `opc-ua-driver`.
+- Other Languages Support:
+-- Added first versions of a C# .Net PLC4X API (plc4net)
+-- Added first versions of a Python PLC4X API (plc4py)
+- Added an Interop server which allows to relay requests from other languages to a Java Server
+
Incompatible changes
--------------------
+- ElasticSearch example was updated to use ElasticSearch 7.0.1, this might cause problems with older Kibana versions.
+
Bug Fixes
---------
[plc4x] 02/04: PLC4X-125 - Update the ElasticSearch example to a
more recent ElasticSearch version
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/plc4x.git
commit 03d2469a6f78d53112fa3f987d8ea18a29ad5241
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon May 20 15:35:40 2019 +0200
PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
- Updated the ElasticSearch example to the newest version (7.0.1)
---
.../delta-v/src/test/java/org/apache/plc4x/java/deltav/PoCES.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/plc4j/protocols/delta-v/src/test/java/org/apache/plc4x/java/deltav/PoCES.java b/plc4j/protocols/delta-v/src/test/java/org/apache/plc4x/java/deltav/PoCES.java
index 26bfb9a..80c6c72 100644
--- a/plc4j/protocols/delta-v/src/test/java/org/apache/plc4x/java/deltav/PoCES.java
+++ b/plc4j/protocols/delta-v/src/test/java/org/apache/plc4x/java/deltav/PoCES.java
@@ -1434,7 +1434,8 @@ public class PoCES {
private static class MyNode extends Node {
private MyNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
- super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins);
+ super(InternalSettingsPreparer.prepareEnvironment(
+ preparedSettings, Collections.emptyMap(), null, () -> "hello-es"), classpathPlugins, true);
}
}
@@ -1443,7 +1444,7 @@ public class PoCES {
Node node = new MyNode(Settings.builder()
.put("transport.type", "netty4")
.put("http.type", "netty4")
- .put("http.enabled", "true")
+ .put("http.cors.enabled", "true")
.put("path.home", "elasticsearch-data")
.build(), Collections.singletonList(Netty4Plugin.class));
node.start();