Skip to content

Commit 6838b2f

Browse files
committed
- 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
1 parent d1629cb commit 6838b2f

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

LICENSE

+8-3
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,20 @@
203203

204204
===============================================================
205205

206-
The Files:
206+
The files:
207207
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
208208
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
209209
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
210210
Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
211211

212-
The Files:
212+
The files:
213213
.mvn/wrapper/MavenWrapperDownloader.java
214214
mvnw
215215
mvnw.cmd
216216
Are provided from the Github Project: https://github.com/takari/maven-wrapper
217-
which is distributed under the Apache 2.0 license.
217+
which is distributed under the Apache 2.0 license.
218+
219+
The file:
220+
build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
221+
is licensed under the Category A: "UNLICENSE" which is available here:
222+
UNLICENSE file in the licenses directory.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
1+
src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
22
is licensed under the Category A: "UNLICENSE" which is available here:
3-
UNLICENSE file paralell to this file.
3+
UNLICENSE file parallel to this file.

licenses/UNLICENSE

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
This is free and unencumbered software released into the public domain.
2+
3+
Anyone is free to copy, modify, publish, use, compile, sell, or
4+
distribute this software, either in source code form or as a compiled
5+
binary, for any purpose, commercial or non-commercial, and by any
6+
means.
7+
8+
In jurisdictions that recognize copyright laws, the author or authors
9+
of this software dedicate any and all copyright interest in the
10+
software to the public domain. We make this dedication for the benefit
11+
of the public at large and to the detriment of our heirs and
12+
successors. We intend this dedication to be an overt act of
13+
relinquishment in perpetuity of all present and future rights to this
14+
software under copyright law.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.
23+
24+
For more information, please refer to <https://unlicense.org/>

sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.plc4x.java.streampipes.bacnetip.config;
1919

2020
public class ConfigKeys {
21+
2122
final static String KAFKA_HOST = "SP_KAFKA_HOST";
2223
final static String KAFKA_PORT = "SP_KAFKA_PORT";
2324

sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public enum ConnectWorkerConfig {
3838

3939
config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
4040
config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
41-
4241
}
4342

4443
public String getConnectContainerWorkerUrl() {

0 commit comments

Comments
 (0)