You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/12/14 19:24:01 UTC
[11/50] [abbrv] incubator-edgent git commit: Update information for
EDL, EPL and CDDL license items
Update information for EDL, EPL and CDDL license items
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/061e2851
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/061e2851
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/061e2851
Branch: refs/heads/master
Commit: 061e285160d21847ec6a9b12ea92bc52eab49206
Parents: c7a5129
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 14 13:01:16 2016 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 14 13:01:16 2016 -0500
----------------------------------------------------------------------
binary-release/LICENSE | 22 ++++++++++++++----
binary-release/README | 3 +++
licenses/binary-release/mqttv3-1.0.2.EDL-1.0 | 28 +++++++++++++++++++++++
licenses/binary-release/mqttv3-1.0.2.EPL-1.0 | 28 -----------------------
licenses/binary-release/mqttv3-1.1.0.EDL-1.0 | 28 +++++++++++++++++++++++
licenses/binary-release/mqttv3-1.1.0.EPL-1.0 | 28 -----------------------
6 files changed, 77 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/061e2851/binary-release/LICENSE
----------------------------------------------------------------------
diff --git a/binary-release/LICENSE b/binary-release/LICENSE
index cdb7b92..f54d6b7 100644
--- a/binary-release/LICENSE
+++ b/binary-release/LICENSE
@@ -207,6 +207,11 @@ This Apache Edgent binary release includes a number of subcomponents with
separate copyright notices and license terms. Your use of these
components is subject to the terms and conditions of the following licenses.
+The binary release includes some binary content with associated
+Eclipse Public License ("EPL-1.0") and
+Common Development and Distribution License ("CDDL-1.0" and CDDL-1.1")
+licenses as noted below.
+
--------------------------------
ext/ # common dependencies for all Edgent components
gson-2.2.4.jar com.google.code.gson:gson:2.2.4
@@ -242,6 +247,8 @@ connectors/http/ext
connectors/iotp/ext
watson-iot-0.1.5.jar com.ibm.messaging:watson-iot:0.1.5
LICENSE: EPL-1.0 For details, see licenses/binary-release/watson-iot-0.1.5.EPL-1.0
+ Only binary form content is included.
+ https://mvnrepository.com/artifact/com.ibm.messaging/watson-iot/0.1.5
commons-codec-1.10.jar org.apache.commons:commons-codec:1.10
LICENSE: ASL-2.0 For details, see licenses/binary-release/commons-codec-1.10.ASL-2.0
@@ -271,7 +278,7 @@ connectors/iotp/ext
LICENSE: ASL-2.0 For details, see licenses/binary-release/log4j-1.2.17.ASL-2.0
org.eclipse.paho.client.mqttv3-1.1.0.jar org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0
- LICENSE: EPL-1.0 For details, see licenses/binary-release/mqttv3-1.1.0.EPL-1.0
+ LICENSE: EDL-1.0 For details, see licenses/binary-release/mqttv3-1.1.0.EDL-1.0
--------------------------------
connectors/kafka/ext
@@ -299,12 +306,14 @@ connectors/kafka/ext
--------------------------------
connectors/mqtt/ext
org.eclipse.paho.client.mqttv3-1.0.2.jar org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2
- LICENSE: EPL-1.0 For details, see licenses/binary-release/mqttv3-1.0.2.EPL-1.0
+ LICENSE: EDL-1.0 For details, see licenses/binary-release/mqttv3-1.0.2.EDL-1.0
--------------------------------
connectors/edgent.javax.websocket/ext
javax.websocket-api-1.0.jar javax.websocket:javax.websocket-api:1.0
LICENSE: CDDL-1.1 For details, see licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
+ Only binary form content is included.
+ https://mvnrepository.com/artifact/javax.websocket/javax.websocket-api/1.0
--------------------------------
connectors/javax.websocket-client/ext
@@ -313,6 +322,8 @@ connectors/javax.websocket-client/ext
javax.websocket-api-1.0.jar javax.websocket:javax.websocket-api:1.0
LICENSE: CDDL-1.1 For details, see licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
+ Only binary form content is included.
+ https://mvnrepository.com/artifact/javax.websocket/javax.websocket-api/1.0
jetty-io-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
LICENSE: ASL-2.0 For details, see licenses/binary-release/jetty-io-9.3.6.ASL-2.0
@@ -333,6 +344,8 @@ connectors/javax.websocket-client/ext
console/server/ext
javax.servlet-api-3.1.0.jar javax.servlet:javax.servlet-api:3.1.0
LICENSE: CDDL-1.0 For details, see licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
+ Only binary form content is included.
+ https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api/3.1.0
jetty-http-9.3.6.v20151106.jar org.eclipse.jetty:jetty-http:9.3.6.v20151106
LICENSE: ASL-2.0 For details, see licenses/binary-release/jetty-http-9.3.6.ASL-2.0
@@ -360,8 +373,9 @@ console/server/ext
--------------------------------
console/servlets/ext
- javax.servlet-api-3.1.0.jar javax.servlet:javax.servlet-api:3.1.0
- LICENSE: CDDL-1.0 For details, see licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
+ javax.servlet-api-3.1.0.jar javax.servlet:javax.servlet-api:3.1.0
+ LICENSE: CDDL-1.0 For details, see licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
+ https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api/3.1.0
--------------------------------
console/webapps
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/061e2851/binary-release/README
----------------------------------------------------------------------
diff --git a/binary-release/README b/binary-release/README
index 3edba57..52b65ec 100644
--- a/binary-release/README
+++ b/binary-release/README
@@ -8,6 +8,9 @@ of the completeness or stability of the code, it does indicate that the project
has yet to be fully endorsed by the ASF.
Apache Edgent is released under the Apache License Version 2.0.
+This Apache Edgent binary release includes a number of subcomponents with
+separate copyright notices and license terms. It includes some binary content
+with associated EPL and CDDL licenses. See LICENSE for details.
Apache Edgent is supported on several Java target platforms.
For more information see JAVA_SUPPORT.md
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/061e2851/licenses/binary-release/mqttv3-1.0.2.EDL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/mqttv3-1.0.2.EDL-1.0 b/licenses/binary-release/mqttv3-1.0.2.EDL-1.0
new file mode 100644
index 0000000..6555a44
--- /dev/null
+++ b/licenses/binary-release/mqttv3-1.0.2.EDL-1.0
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p><em>December 9, 2013</em></p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
+A copy of the EPL is available at
+<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+and a copy of the EDL is available at
+<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body></html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/061e2851/licenses/binary-release/mqttv3-1.0.2.EPL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/mqttv3-1.0.2.EPL-1.0 b/licenses/binary-release/mqttv3-1.0.2.EPL-1.0
deleted file mode 100644
index 6555a44..0000000
--- a/licenses/binary-release/mqttv3-1.0.2.EPL-1.0
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p><em>December 9, 2013</em></p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
-A copy of the EPL is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-and a copy of the EDL is available at
-<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/061e2851/licenses/binary-release/mqttv3-1.1.0.EDL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/mqttv3-1.1.0.EDL-1.0 b/licenses/binary-release/mqttv3-1.1.0.EDL-1.0
new file mode 100644
index 0000000..6555a44
--- /dev/null
+++ b/licenses/binary-release/mqttv3-1.1.0.EDL-1.0
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p><em>December 9, 2013</em></p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
+A copy of the EPL is available at
+<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+and a copy of the EDL is available at
+<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body></html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/061e2851/licenses/binary-release/mqttv3-1.1.0.EPL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/mqttv3-1.1.0.EPL-1.0 b/licenses/binary-release/mqttv3-1.1.0.EPL-1.0
deleted file mode 100644
index 6555a44..0000000
--- a/licenses/binary-release/mqttv3-1.1.0.EPL-1.0
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p><em>December 9, 2013</em></p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
-A copy of the EPL is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-and a copy of the EDL is available at
-<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>