#461 Updated license to EPL-v2.0

eclipse-paho · Nov 18, 2023 · a7e9b12 · a7e9b12
1 parent 39bfbe1
commit a7e9b12
Show file tree

Hide file tree

Showing 93 changed files with 456 additions and 274 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,11 +9,11 @@
 # Copyright (c) 2017, Frank Pagliughi
 #
 # 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
+#   http://www.eclipse.org/legal/epl-v20.html
 # and the Eclipse Distribution License is available at
 #   http://www.eclipse.org/org/documents/edl-v10.php.
 # 

diff --git a/README.md b/README.md
@@ -376,32 +376,7 @@ int main(int argc, char* argv[])
 }
 ```
 
------------
-
-The original API organization and documentation were adapted from:
-
-The Paho Java library
-by Dave Locke et al.
-Copyright (c) 2012, IBM Corp
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
------------
-
 This code requires:
 
-The Paho C library by Ian Craggs
-Copyright (c) 2013-2018, IBM Corp.
-
- All rights reserved. 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.
-
- The Eclipse Public License is available at
-    http://www.eclipse.org/legal/epl-v10.html
- and the Eclipse Distribution License is available at
-   http://www.eclipse.org/org/documents/edl-v10.php.
-
+The Paho C library by Ian Craggs, et al.
+https://github.com/eclipse/paho.mqtt.c
diff --git a/about.html b/about.html
@@ -13,7 +13,7 @@ <h3>License</h3>
 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> 
+<a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.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>

diff --git a/dist/paho-cpp.spec b/dist/paho-cpp.spec
@@ -49,7 +49,7 @@ cd build.paho.cpp
 make install DESTDIR=%{buildroot}
 
 %files
-%doc edl-v10 epl-v10
+%doc edl-v10 epl-v20
 %{_libdir}/*
 
 %files devel

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -2,11 +2,11 @@
 #  Copyright (c) 2016
 # 
 #  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
+#     http://www.eclipse.org/legal/epl-v20.html
 #  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