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/10/27 16:40:58 UTC
[plc4x] branch develop updated: - Addressed license issues as
detected by Justin McLean on the RC2 vote. -- Path to the Expression.g4 was
not correct -- Added additional mentions in the projects root LICENSE file
-- Added a copy of the UNLICENSE file to a "licenses" directory in the
project root
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
The following commit(s) were added to refs/heads/develop by this push:
new 6838b2f - Addressed license issues as detected by Justin McLean on the RC2 vote. -- Path to the Expression.g4 was not correct -- Added additional mentions in the projects root LICENSE file -- Added a copy of the UNLICENSE file to a "licenses" directory in the project root
6838b2f is described below
commit 6838b2f771c0fc1b5ec9cf9dbe3ee8503437f0e0
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Oct 27 17:40:50 2019 +0100
- Addressed license issues as detected by Justin McLean on the RC2 vote.
-- Path to the Expression.g4 was not correct
-- Added additional mentions in the projects root LICENSE file
-- Added a copy of the UNLICENSE file to a "licenses" directory in the project root
---
LICENSE | 11 +++++++---
.../src/remote-resources/LICENSE | 4 ++--
licenses/UNLICENSE | 24 ++++++++++++++++++++++
.../streampipes/bacnetip/config/ConfigKeys.java | 1 +
.../bacnetip/config/ConnectWorkerConfig.java | 1 -
5 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/LICENSE b/LICENSE
index 7f53f08..033d5d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,15 +203,20 @@
===============================================================
-The Files:
+The files:
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
-The Files:
+The files:
.mvn/wrapper/MavenWrapperDownloader.java
mvnw
mvnw.cmd
Are provided from the Github Project: https://github.com/takari/maven-wrapper
-which is distributed under the Apache 2.0 license.
\ No newline at end of file
+which is distributed under the Apache 2.0 license.
+
+The file:
+build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
+is licensed under the Category A: "UNLICENSE" which is available here:
+UNLICENSE file in the licenses directory.
diff --git a/build-utils/protocol-base-mspec/src/remote-resources/LICENSE b/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
index 41526f2..497b8a9 100644
--- a/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
+++ b/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
@@ -1,3 +1,3 @@
-src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
+src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
is licensed under the Category A: "UNLICENSE" which is available here:
-UNLICENSE file paralell to this file.
+UNLICENSE file parallel to this file.
diff --git a/licenses/UNLICENSE b/licenses/UNLICENSE
new file mode 100644
index 0000000..c32dd18
--- /dev/null
+++ b/licenses/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org/>
\ No newline at end of file
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
index ccdf39b..ecce008 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
@@ -18,6 +18,7 @@
package org.apache.plc4x.java.streampipes.bacnetip.config;
public class ConfigKeys {
+
final static String KAFKA_HOST = "SP_KAFKA_HOST";
final static String KAFKA_PORT = "SP_KAFKA_PORT";
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
index 64357f0..2892a94 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
@@ -38,7 +38,6 @@ public enum ConnectWorkerConfig {
config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
-
}
public String getConnectContainerWorkerUrl() {