Update license from EPL v1 to v2

smurfy · Apr 6, 2020 · 1e91229 · 1e91229
1 parent 3af6029
commit 1e91229
Show file tree

Hide file tree

Showing 108 changed files with 531 additions and 323 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,11 +2,11 @@
 #  Copyright (c) 2015, 2020 logi.cals GmbH and others
 #
 #  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
+#  are made available under the terms of the Eclipse Public License v2.0
 #  and Eclipse Distribution License v1.0 which accompany this distribution.
 #
 #  The Eclipse Public License is available at
-#     http://www.eclipse.org/legal/epl-v10.html
+#     https://www.eclipse.org/legal/epl-2.0/
 #  and the Eclipse Distribution License is available at
 #    http://www.eclipse.org/org/documents/edl-v10.php.
 #

diff --git a/LICENSE b/LICENSE
@@ -1,11 +1,11 @@
-Eclipse Public License - v 1.0
+Eclipse Public License - v 2.0
 
 This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-and Eclipse Distribution License v1.0 which accompany this distribution.
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v2.0 which accompany this distribution.
 
 The Eclipse Public License is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0/
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 

diff --git a/Makefile b/Makefile
@@ -2,11 +2,11 @@
 #  Copyright (c) 2009, 2019 IBM Corp.
 #
 #  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
+#  are made available under the terms of the Eclipse Public License v2.0
 #  and Eclipse Distribution License v1.0 which accompany this distribution.
 #
 #  The Eclipse Public License is available at
-#     http://www.eclipse.org/legal/epl-v10.html
+#     https://www.eclipse.org/legal/epl-2.0/
 #  and the Eclipse Distribution License is available at
 #    http://www.eclipse.org/org/documents/edl-v10.php.
 #

diff --git a/about.html b/about.html
@@ -6,14 +6,14 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
 
-<p><em>December 9, 2013</em></p>	
+<p><em>April 6, 2020</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").
+Eclipse Public License Version 2.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> 
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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>

diff --git a/build.xml b/build.xml
@@ -1,12 +1,12 @@
 <!--****************************************************************************
-  Copyright (c) 2012, 2019 IBM Corp.
+  Copyright (c) 2012, 2020 IBM Corp.
 
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License v2.0
   and Eclipse Distribution License v1.0 which accompany this distribution.
 
   The Eclipse Public License is available at
-     http://www.eclipse.org/legal/epl-v10.html
+     https://www.eclipse.org/legal/epl-2.0/
   and the Eclipse Distribution License is available at
     http://www.eclipse.org/org/documents/edl-v10.php.
 
@@ -221,7 +221,7 @@
       <fileset dir="src" includes="MQTTClient.h,MQTTAsync.h,MQTTClientPersistence.h"/>
     </copy>
     <copy overwrite="true" todir="${output.folder}">
-      <fileset dir="." includes="README.md,CONTRIBUTING.md,about.html,notice.html,edl-v10,epl-v10"/>
+      <fileset dir="." includes="README.md,CONTRIBUTING.md,about.html,notice.html,edl-v10,epl-v20"/>
     </copy>
     <mkdir dir="${output.folder}/lib"/>
     <move overwrite="true" todir="${output.folder}/lib">
@@ -250,7 +250,7 @@
       <arg value="notice.html"/>
       <arg value="README.md"/>
       <arg value="CONTRIBUTING.md"/>
-      <arg value="epl-v10"/>
+      <arg value="epl-v20"/>
       <arg value="edl-v10"/>
       <arg value="include"/>
 	  <arg value="samples"/>
@@ -266,7 +266,7 @@
       <arg value="notice.html"/>
       <arg value="README.md"/>
       <arg value="CONTRIBUTING.md"/>
-      <arg value="epl-v10"/>
+      <arg value="epl-v20"/>
       <arg value="edl-v10"/>
       <arg value="include"/>
 	  <arg value="samples"/>
@@ -286,7 +286,7 @@
       <arg value="notice.html"/>
       <arg value="README.md"/>
       <arg value="CONTRIBUTING.md"/>
-      <arg value="epl-v10"/>
+      <arg value="epl-v20"/>
       <arg value="edl-v10"/>
       <arg value="Makefile"/>
       <arg value="build.xml"/>

diff --git a/conanfile.py b/conanfile.py
@@ -4,7 +4,7 @@
 class PahocConan(ConanFile):
     name = "paho.mqtt.c"
     version = "1.3.1"
-    license = "Eclipse Public License - v 1.0"
+    license = "Eclipse Public License - v 2.0"
     url = "https://github.com/eclipse/paho.mqtt.c"
     description = """The Eclipse Paho project provides open-source client implementations of MQTT
 and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -2,11 +2,11 @@
 #  Copyright (c) 2015 logi.cals GmbH
 # 
 #  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
+#  are made available under the terms of the Eclipse Public License v2.0
 #  and Eclipse Distribution License v1.0 which accompany this distribution. 
 # 
 #  The Eclipse Public License is available at 
-#     http://www.eclipse.org/legal/epl-v10.html
+#     https://www.eclipse.org/legal/epl-2.0/
 #  and the Eclipse Distribution License is available at 
 #    http://www.eclipse.org/org/documents/edl-v10.php.
 # 

diff --git a/epl-v10 b/epl-v10