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/06/18 11:24:35 UTC
[plc4x] branch develop updated: - Resolved the license issues in RAT
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 3f4f712 - Resolved the license issues in RAT
3f4f712 is described below
commit 3f4f712aaa5c38b2e35bdee425a9ca637808f302
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Jun 18 13:24:28 2019 +0200
- Resolved the license issues in RAT
---
pom.xml | 8 ++++++++
sandbox/code-gen/src/main/antlr4/imaginary.g4 | 18 ++++++++++++++++
.../plc4x-maven-plugin/remote-resources/LICENSE | 3 +++
.../plc4x-maven-plugin/remote-resources/UNLICENSE | 24 ++++++++++++++++++++++
.../codegenerator/parser/expression/Expression.g4 | 7 +++++++
.../src/main/resources/protocol.spec | 19 +++++++++++++++++
.../src/test/resources/specs/s7.spec | 19 +++++++++++++++++
7 files changed, 98 insertions(+)
diff --git a/pom.xml b/pom.xml
index b426ac0..e53e289 100644
--- a/pom.xml
+++ b/pom.xml
@@ -762,6 +762,14 @@
<exclude>**/.git/**</exclude>
<exclude>**/.gitignore</exclude>
+ <!-- License Files for other licenses -->
+ <exclude>**/UNLICENSE</exclude>
+ <!--
+ Explicitly exclude this file as I was unable
+ to add a new license to the configuration.
+ -->
+ <exclude>**/Expression.g4</exclude>
+
<!-- Maven related files -->
<exclude>**/target/**</exclude>
diff --git a/sandbox/code-gen/src/main/antlr4/imaginary.g4 b/sandbox/code-gen/src/main/antlr4/imaginary.g4
index f99ef09..bebf548 100644
--- a/sandbox/code-gen/src/main/antlr4/imaginary.g4
+++ b/sandbox/code-gen/src/main/antlr4/imaginary.g4
@@ -1,4 +1,22 @@
grammar imaginary;
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
file
: statement*
diff --git a/sandbox/code-generation/plc4x-maven-plugin/remote-resources/LICENSE b/sandbox/code-generation/plc4x-maven-plugin/remote-resources/LICENSE
new file mode 100644
index 0000000..41526f2
--- /dev/null
+++ b/sandbox/code-generation/plc4x-maven-plugin/remote-resources/LICENSE
@@ -0,0 +1,3 @@
+src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
+is licensed under the Category A: "UNLICENSE" which is available here:
+UNLICENSE file paralell to this file.
diff --git a/sandbox/code-generation/plc4x-maven-plugin/remote-resources/UNLICENSE b/sandbox/code-generation/plc4x-maven-plugin/remote-resources/UNLICENSE
new file mode 100644
index 0000000..c32dd18
--- /dev/null
+++ b/sandbox/code-generation/plc4x-maven-plugin/remote-resources/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/code-generation/plc4x-maven-plugin/src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4 b/sandbox/code-generation/plc4x-maven-plugin/src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
index 663bec2..d4f8ef4 100644
--- a/sandbox/code-generation/plc4x-maven-plugin/src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
+++ b/sandbox/code-generation/plc4x-maven-plugin/src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
@@ -1,5 +1,12 @@
grammar Expression;
+// Borrowed part of this Grammar:
+// https://github.com/bkiers/tiny-language-antlr4/blob/master/src/main/antlr4/tl/antlr4/TL.g4
+// Which is under UNLICENCE:
+// https://unlicense.org/
+// Which is regarded beint Category A:
+// https://issues.apache.org/jira/browse/LEGAL-463
+
expressionString
: expression EOF
;
diff --git a/sandbox/code-generation/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec b/sandbox/code-generation/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec
index 9c6ebdc..5c4aae1 100644
--- a/sandbox/code-generation/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec
+++ b/sandbox/code-generation/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec
@@ -1,3 +1,22 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
////////////////////////////////////////////////////////////////
// IsoOnTcp/TPKT
////////////////////////////////////////////////////////////////
diff --git a/sandbox/code-generation/plc4x-maven-plugin/src/test/resources/specs/s7.spec b/sandbox/code-generation/plc4x-maven-plugin/src/test/resources/specs/s7.spec
index 3ae0a1b..1f4b52e 100644
--- a/sandbox/code-generation/plc4x-maven-plugin/src/test/resources/specs/s7.spec
+++ b/sandbox/code-generation/plc4x-maven-plugin/src/test/resources/specs/s7.spec
@@ -1,3 +1,22 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
////////////////////////////////////////////////////////////////
// IsoOnTcp/TPKT
////////////////////////////////////////////////////////////////