Updated license to EPL 2.0 and fixed copyrights

Change-Id: Ib6e4608e8cf48c9c56dddf125655a1761feb843a
Signed-off-by: Guillaume Garzone <guillaume.garzone@laas.fr>
diff --git a/com.orange.om2m.p2.repo/pom.xml b/com.orange.om2m.p2.repo/pom.xml
index b1b1ddf..d456850 100644
--- a/com.orange.om2m.p2.repo/pom.xml
+++ b/com.orange.om2m.p2.repo/pom.xml
@@ -3,9 +3,9 @@
 /*******************************************************************************

 * Copyright (c) 2013, 2015 Orange.

 * 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 2.0

 * which accompanies this distribution, and is available at

-* http://www.eclipse.org/legal/epl-v10.html

+* https://www.eclipse.org/legal/epl-2.0/

 *

 * Contributors:

 *    BOLLE Sébastien, <sebastien.bolle@orange.com>

diff --git a/epl-2.0.html b/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/epl-2.0.html
@@ -0,0 +1,300 @@
+<!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" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
\ No newline at end of file
diff --git a/epl-v10.html b/epl-v10.html
deleted file mode 100644
index d04ca1c..0000000
--- a/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<!-- saved from url=(0041)http://www.eclipse.org/legal/epl-v10.html -->

-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<h2>Eclipse Public License - v 1.0</h2>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>"Contribution" means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>"Contributor" means any person or entity that distributes

-the Program.</p>

-

-<p>"Licensed Patents" mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>"Program" means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>"Recipient" means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-("Commercial Contributor") hereby agrees to defend and

-indemnify every other Contributor ("Indemnified Contributor")

-against any losses, damages and costs (collectively "Losses")

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-

-

-</body></html>
\ No newline at end of file
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ACP.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ACP.java
index 9215694..e46da68 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ACP.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ACP.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/AE.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/AE.java
index da71923..6d10998 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/AE.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/AE.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/CSEBase.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/CSEBase.java
index f32b817..4d95372 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/CSEBase.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/CSEBase.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Container.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Container.java
index f09f921..109a156 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Container.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Container.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ContentInstance.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ContentInstance.java
index 28bfb01..f1bdf86 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ContentInstance.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/ContentInstance.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Discovery.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Discovery.java
index 88b1aee..0755c37 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Discovery.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Discovery.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/FanoutPoint.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/FanoutPoint.java
index a83d5b8..9c08051 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/FanoutPoint.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/FanoutPoint.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Group.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Group.java
index 26fafe6..e10d9a4 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Group.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Group.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/LongPolling.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/LongPolling.java
index 11272ee..89507dc 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/LongPolling.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/LongPolling.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Node.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Node.java
index 722fe96..b4739ab 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Node.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Node.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/RemoteCSE.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/RemoteCSE.java
index e52f707..ad78371 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/RemoteCSE.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/RemoteCSE.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Subscription.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Subscription.java
index 719e396..f9349ef 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Subscription.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/Subscription.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/TestConfig.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/TestConfig.java
index 3f31f2c..9626e8d 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/TestConfig.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tests/TestConfig.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tests;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/HttpResponse.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/HttpResponse.java
index 879b789..b4297ce 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/HttpResponse.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/HttpResponse.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tools;
 
diff --git a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/RestHttpClient.java b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/RestHttpClient.java
index c12da8d..5cc25b9 100644
--- a/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/RestHttpClient.java
+++ b/org.eclipse.om2m.adntest/src/test/java/org/eclipse/om2m/adn/tools/RestHttpClient.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.adn.tools;
 
diff --git a/org.eclipse.om2m.android.dashboard/pom.xml b/org.eclipse.om2m.android.dashboard/pom.xml
index ab4627d..9e5c813 100644
--- a/org.eclipse.om2m.android.dashboard/pom.xml
+++ b/org.eclipse.om2m.android.dashboard/pom.xml
@@ -1,9 +1,9 @@
 <!--
     Copyright (c) 2013, 2017 Orange.
     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 2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/legal/epl-2.0/
    
     Contributors:
        BAREAU Cyrille <cyrille.bareau@orange.com>, 
diff --git a/org.eclipse.om2m.android.dashboard/project.properties b/org.eclipse.om2m.android.dashboard/project.properties
index 3073f9c..293a3e2 100644
--- a/org.eclipse.om2m.android.dashboard/project.properties
+++ b/org.eclipse.om2m.android.dashboard/project.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2017 Orange.
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Contributors:
 #    BAREAU Cyrille <cyrille.bareau@orange.com>, 
diff --git a/org.eclipse.om2m.android.dashboard/res/anim/animation1.xml b/org.eclipse.om2m.android.dashboard/res/anim/animation1.xml
index 23b20d3..4d6598b 100644
--- a/org.eclipse.om2m.android.dashboard/res/anim/animation1.xml
+++ b/org.eclipse.om2m.android.dashboard/res/anim/animation1.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/anim/animation2.xml b/org.eclipse.om2m.android.dashboard/res/anim/animation2.xml
index a12e627..836d599 100644
--- a/org.eclipse.om2m.android.dashboard/res/anim/animation2.xml
+++ b/org.eclipse.om2m.android.dashboard/res/anim/animation2.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/color/sel_button_text.xml b/org.eclipse.om2m.android.dashboard/res/color/sel_button_text.xml
index 5c75cbe..4d682bc 100644
--- a/org.eclipse.om2m.android.dashboard/res/color/sel_button_text.xml
+++ b/org.eclipse.om2m.android.dashboard/res/color/sel_button_text.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow.xml b/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow.xml
index e6eaaf7..ab28c82 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow_wizard.xml b/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow_wizard.xml
index b6eb04a..012ff48 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow_wizard.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/blur_shadow_wizard.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/custom_action_bar.xml b/org.eclipse.om2m.android.dashboard/res/drawable/custom_action_bar.xml
index 5d64858..7a6a6f4 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/custom_action_bar.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/custom_action_bar.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_boy.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_boy.xml
index ad258d0..04abe12 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_boy.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_boy.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_businessman.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_businessman.xml
index 5529a5d..ffb355f 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_businessman.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_businessman.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female.xml
index ca9b5b6..f7ec1c4 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female_headset.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female_headset.xml
index 9ae17ef..4b4b6a1 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female_headset.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_female_headset.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_girl.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_girl.xml
index 87b5914..77868ae 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_girl.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_girl.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandma.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandma.xml
index 056106a..0dea946 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandma.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandma.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandpa.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandpa.xml
index aff7f79..8a1f2b8 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandpa.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_grandpa.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male.xml
index 2212621..bac06a7 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male_headset.xml b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male_headset.xml
index 6182a9c..bd26d7b 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male_headset.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/radio_btn_avatar_male_headset.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_blue.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_blue.xml
index 608c7d5..1f17ea1 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_blue.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_blue.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_green.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_green.xml
index d898ae8..cb80fca 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_green.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_green.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_orange.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_orange.xml
index cac6342..8402502 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_orange.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_orange.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_red.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_red.xml
index 9aa84b2..bc81673 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_red.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_button_red.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_blue.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_blue.xml
index 8be6571..a1ff842 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_blue.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_blue.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_green.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_green.xml
index 48a9611..2600a3d 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_green.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_green.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_red.xml b/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_red.xml
index c0058a7..d5813e3 100644
--- a/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_red.xml
+++ b/org.eclipse.om2m.android.dashboard/res/drawable/sel_card_red.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout-land/main_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout-land/main_activity.xml
index 64cc366..01cb407 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout-land/main_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout-land/main_activity.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/application_config_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/application_config_activity.xml
index 900128a..ede4e14 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/application_config_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/application_config_activity.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/application_details_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/application_details_activity.xml
index 6a3d276..e88d585 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/application_details_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/application_details_activity.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/config_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/config_activity.xml
index 5f9f86d..f278d84 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/config_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/config_activity.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/config_view.xml b/org.eclipse.om2m.android.dashboard/res/layout/config_view.xml
index 8882076..fb814c9 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/config_view.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/config_view.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/device_details_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/device_details_activity.xml
index 3218399..182f443 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/device_details_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/device_details_activity.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/device_simple_view.xml b/org.eclipse.om2m.android.dashboard/res/layout/device_simple_view.xml
index 17bedab..7acea11 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/device_simple_view.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/device_simple_view.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/device_type_container_view.xml b/org.eclipse.om2m.android.dashboard/res/layout/device_type_container_view.xml
index 6ac0a89..1c737b3 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/device_type_container_view.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/device_type_container_view.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/devices_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/devices_activity.xml
index b5452fc..c7d39e0 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/devices_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/devices_activity.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/main_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/main_activity.xml
index c674b4f..30ef9ca 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/main_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/main_activity.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/main_app_entry_view.xml b/org.eclipse.om2m.android.dashboard/res/layout/main_app_entry_view.xml
index 5e8fe34..7e7b6f5 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/main_app_entry_view.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/main_app_entry_view.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/main_dev_view.xml b/org.eclipse.om2m.android.dashboard/res/layout/main_dev_view.xml
index 5975850..f7154f3 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/main_dev_view.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/main_dev_view.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/layout/settings_activity.xml b/org.eclipse.om2m.android.dashboard/res/layout/settings_activity.xml
index 5129fea..b9e4015 100644
--- a/org.eclipse.om2m.android.dashboard/res/layout/settings_activity.xml
+++ b/org.eclipse.om2m.android.dashboard/res/layout/settings_activity.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/menu/menu_main.xml b/org.eclipse.om2m.android.dashboard/res/menu/menu_main.xml
index b75526b..71efa99 100644
--- a/org.eclipse.om2m.android.dashboard/res/menu/menu_main.xml
+++ b/org.eclipse.om2m.android.dashboard/res/menu/menu_main.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/menu/menu_panel.xml b/org.eclipse.om2m.android.dashboard/res/menu/menu_panel.xml
index 097652f..c32219b 100644
--- a/org.eclipse.om2m.android.dashboard/res/menu/menu_panel.xml
+++ b/org.eclipse.om2m.android.dashboard/res/menu/menu_panel.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/menu/menu_secondary.xml b/org.eclipse.om2m.android.dashboard/res/menu/menu_secondary.xml
index 8a2eea9..0583b7f 100644
--- a/org.eclipse.om2m.android.dashboard/res/menu/menu_secondary.xml
+++ b/org.eclipse.om2m.android.dashboard/res/menu/menu_secondary.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values-en/strings.xml b/org.eclipse.om2m.android.dashboard/res/values-en/strings.xml
index 3021839..af7bbea 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-en/strings.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-en/strings.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values-fr/strings.xml b/org.eclipse.om2m.android.dashboard/res/values-fr/strings.xml
index f3c3870..ace104d 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-fr/strings.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-fr/strings.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values-sw600dp/dimens.xml b/org.eclipse.om2m.android.dashboard/res/values-sw600dp/dimens.xml
index 34e7124..01ca809 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-sw600dp/dimens.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-sw600dp/dimens.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values-sw720dp-land/dimens.xml b/org.eclipse.om2m.android.dashboard/res/values-sw720dp-land/dimens.xml
index 096a93c..445a325 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-sw720dp-land/dimens.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-sw720dp-land/dimens.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values-v11/styles.xml b/org.eclipse.om2m.android.dashboard/res/values-v11/styles.xml
index 17b4a46..4fee2fc 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-v11/styles.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-v11/styles.xml
@@ -2,9 +2,9 @@
 <!--
     Copyright (c) 2013, 2017 Orange.
     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 2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/legal/epl-2.0/
    
     Contributors:
        BAREAU Cyrille <cyrille.bareau@orange.com>, 
diff --git a/org.eclipse.om2m.android.dashboard/res/values-v14/styles.xml b/org.eclipse.om2m.android.dashboard/res/values-v14/styles.xml
index d0e6e21..73b2df4 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-v14/styles.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-v14/styles.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values-w820dp/dimens.xml b/org.eclipse.om2m.android.dashboard/res/values-w820dp/dimens.xml
index e1abdf9..70aa7ad 100644
--- a/org.eclipse.om2m.android.dashboard/res/values-w820dp/dimens.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values-w820dp/dimens.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values/attrs.xml b/org.eclipse.om2m.android.dashboard/res/values/attrs.xml
index a8e88ab..459339e 100644
--- a/org.eclipse.om2m.android.dashboard/res/values/attrs.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values/attrs.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values/colors.xml b/org.eclipse.om2m.android.dashboard/res/values/colors.xml
index dd8964c..e4cab9b 100644
--- a/org.eclipse.om2m.android.dashboard/res/values/colors.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values/colors.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values/dimens.xml b/org.eclipse.om2m.android.dashboard/res/values/dimens.xml
index c25bea8..e93fb47 100644
--- a/org.eclipse.om2m.android.dashboard/res/values/dimens.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values/dimens.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values/strings.xml b/org.eclipse.om2m.android.dashboard/res/values/strings.xml
index c3d939b..898cd12 100644
--- a/org.eclipse.om2m.android.dashboard/res/values/strings.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values/strings.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/res/values/styles.xml b/org.eclipse.om2m.android.dashboard/res/values/styles.xml
index 71c5795..929effa 100644
--- a/org.eclipse.om2m.android.dashboard/res/values/styles.xml
+++ b/org.eclipse.om2m.android.dashboard/res/values/styles.xml
@@ -1,9 +1,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/AndroidManifest.xml b/org.eclipse.om2m.android.dashboard/src/main/AndroidManifest.xml
index 7909090..5fd629c 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/AndroidManifest.xml
+++ b/org.eclipse.om2m.android.dashboard/src/main/AndroidManifest.xml
@@ -2,9 +2,9 @@
 <!--

     Copyright (c) 2013, 2017 Orange.

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Contributors:

        BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomMainActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomMainActivity.java
index 5356822..db75934 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomMainActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomMainActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomSecondaryActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomSecondaryActivity.java
index c828c62..0dbc148 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomSecondaryActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/CustomSecondaryActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/DashboardActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/DashboardActivity.java
index c3c822b..9474cf6 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/DashboardActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/DashboardActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/SettingsActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/SettingsActivity.java
index e4d006b..ee4491b 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/SettingsActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/SettingsActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/applications/ApplicationConfigActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/applications/ApplicationConfigActivity.java
index e1f64e6..e3c25ad 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/applications/ApplicationConfigActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/applications/ApplicationConfigActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MConnector.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MConnector.java
index f6906f1..ed4d945 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MConnector.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MConnector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MListener.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MListener.java
index 98ae972..a798bb2 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MListener.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequest.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequest.java
index c6f6b5e..ea628db 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequest.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequester.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequester.java
index 109b3ca..eb538bc 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequester.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/OneM2MRequester.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Container.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Container.java
index 25df8eb..515b04e 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Container.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Container.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/ContentInstance.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/ContentInstance.java
index a26a3dd..3346d92 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/ContentInstance.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/ContentInstance.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/DatapointType.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/DatapointType.java
index 372e045..989d57b 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/DatapointType.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/DatapointType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.android.dashboard.cse.models;
 
diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainer.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainer.java
index 4e444a4..1d36559 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainer.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainerAnnounced.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainerAnnounced.java
index 744774a..3e56140 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainerAnnounced.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/FlexContainerAnnounced.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/OneM2MApplication.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/OneM2MApplication.java
index c2c474e..4fc841b 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/OneM2MApplication.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/OneM2MApplication.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Resource.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Resource.java
index 94550b8..467cbcd 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Resource.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Resource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 
diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Response.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Response.java
index c6be884..a13997b 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Response.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Response.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTDevice.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTDevice.java
index 8caf701..d2a9006 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTDevice.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTDevice.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTModule.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTModule.java
index 056dd14..8a00d3c 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTModule.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/SDTModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Uril.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Uril.java
index 448c3e9..66d6ec3 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Uril.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/models/Uril.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationRequest.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationRequest.java
index 6bb45f7..1a8a34e 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationRequest.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationsRequest.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationsRequest.java
index 3164893..a8d46ae 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationsRequest.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetApplicationsRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDeviceRequest.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDeviceRequest.java
index c13134f..c005ca4 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDeviceRequest.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDeviceRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDevicesRequest.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDevicesRequest.java
index 292a104..4bf1079 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDevicesRequest.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetDevicesRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetIncseStatusRequest.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetIncseStatusRequest.java
index 0ea0e2f..bb077e3 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetIncseStatusRequest.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MGetIncseStatusRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MRequestParams.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MRequestParams.java
index f450370..12922f8 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MRequestParams.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/cse/requests/OneM2MRequestParams.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceDetailsActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceDetailsActivity.java
index d4e13d0..44f6b39 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceDetailsActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceDetailsActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceSimpleView.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceSimpleView.java
index e0ef17c..1e35937 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceSimpleView.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceSimpleView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceTypeContainerView.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceTypeContainerView.java
index 0a04975..005d337 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceTypeContainerView.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DeviceTypeContainerView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DevicesActivity.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DevicesActivity.java
index 23fe48e..7b4b495 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DevicesActivity.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/devices/DevicesActivity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainAppEntryView.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainAppEntryView.java
index 2121201..fc892e2 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainAppEntryView.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainAppEntryView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainDevView.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainDevView.java
index cfc3352..8462d77 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainDevView.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/main/MainDevView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/CustomLineView.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/CustomLineView.java
index 1f702ce..d643db0 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/CustomLineView.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/CustomLineView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/DashboardWebViewClient.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/DashboardWebViewClient.java
index fa4a775..c09ab52 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/DashboardWebViewClient.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/DashboardWebViewClient.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/IconManager.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/IconManager.java
index 9795634..ff72c2b 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/IconManager.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/IconManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/OneM2MDeviceType.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/OneM2MDeviceType.java
index f570edf..68036ef 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/OneM2MDeviceType.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/OneM2MDeviceType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/SettingsManager.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/SettingsManager.java
index 65d8728..cb47c8c 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/SettingsManager.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/SettingsManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/Sorter.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/Sorter.java
index 9fdb36f..b62a519 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/Sorter.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/tools/Sorter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/utils/OTBUtils.java b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/utils/OTBUtils.java
index 67a54bb..ffb8aee 100644
--- a/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/utils/OTBUtils.java
+++ b/org.eclipse.om2m.android.dashboard/src/main/java/org/eclipse/om2m/android/dashboard/utils/OTBUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2013, 2017 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Contributors:

  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 

diff --git a/org.eclipse.om2m.binding.coap/build.properties b/org.eclipse.om2m.binding.coap/build.properties
index f38a998..d8d8852 100644
--- a/org.eclipse.om2m.binding.coap/build.properties
+++ b/org.eclipse.om2m.binding.coap/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################
-# Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+# Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
 # 7 Colonel Roche 31077 Toulouse - France
 # 
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Initial Contributors:
 # 	Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/pom.xml b/org.eclipse.om2m.binding.coap/pom.xml
index a2cfb5a..105dae0 100644
--- a/org.eclipse.om2m.binding.coap/pom.xml
+++ b/org.eclipse.om2m.binding.coap/pom.xml
@@ -1,11 +1,11 @@
 <!--
-Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
 7 Colonel Roche 31077 Toulouse - France
 
 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 2.0
 which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+https://www.eclipse.org/legal/epl-2.0/
 
 Initial Contributors:
 	Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/Activator.java b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/Activator.java
index bab3751..ea8ac88 100644
--- a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/Activator.java
+++ b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/Activator.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapClient.java b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapClient.java
index f264de6..c2f6ac1 100644
--- a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapClient.java
+++ b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapClient.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapContentType.java b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapContentType.java
index 66e1901..cffd133 100644
--- a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapContentType.java
+++ b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapContentType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapOptions.java b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapOptions.java
index 682e922..95e2a4a 100644
--- a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapOptions.java
+++ b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapOptions.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapParameters.java b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapParameters.java
index d695ef4..1a45533 100644
--- a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapParameters.java
+++ b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapParameters.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapServer.java b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapServer.java
index 05d711f..aa14ce7 100644
--- a/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapServer.java
+++ b/org.eclipse.om2m.binding.coap/src/main/java/org/eclipse/om2m/binding/coap/CoapServer.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.http/build.properties b/org.eclipse.om2m.binding.http/build.properties
index 0789426..3dafe7a 100644
--- a/org.eclipse.om2m.binding.http/build.properties
+++ b/org.eclipse.om2m.binding.http/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################

-# Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+# Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

 # 7 Colonel Roche 31077 Toulouse - France

 #

 # 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/

 #

 # Initial Contributors:

 #     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.http/pom.xml b/org.eclipse.om2m.binding.http/pom.xml
index 800c911..bb95195 100644
--- a/org.eclipse.om2m.binding.http/pom.xml
+++ b/org.eclipse.om2m.binding.http/pom.xml
@@ -1,11 +1,11 @@
 <!--

-    Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+    Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

     7 Colonel Roche 31077 Toulouse - France

    

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Initial Contributors:

         Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/Activator.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/Activator.java
index fdeb17f..e376cfe 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/Activator.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/Activator.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpClient.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpClient.java
index 6103339..74ba5ab 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpClient.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpClient.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java
index 0c8909f..b593c08 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java
index 20697bd..90253f9 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpParameters.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpParameters.java
index e8e4ac7..41ac461 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpParameters.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpParameters.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/pom.xml b/org.eclipse.om2m.binding.mqtt/pom.xml
index 56fd55c..aed7995 100644
--- a/org.eclipse.om2m.binding.mqtt/pom.xml
+++ b/org.eclipse.om2m.binding.mqtt/pom.xml
@@ -1,11 +1,11 @@
 <!--
-     Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+     Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
      7 Colonel Roche 31077 Toulouse - France
      
      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 2.0
      which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
+     https://www.eclipse.org/legal/epl-2.0/
      
      Initial Contributors:
          Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/Activator.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/Activator.java
index c8f126f..dd43b2c 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/Activator.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/Activator.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRequestHandler.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRequestHandler.java
index 779e4de..fd7b118 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRequestHandler.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRequestHandler.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRestClient.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRestClient.java
index 95ba01c..41809e5 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRestClient.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/MqttRestClient.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/DataMapperRegistry.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/DataMapperRegistry.java
index d4e4741..40f287d 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/DataMapperRegistry.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/DataMapperRegistry.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/MqttConstants.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/MqttConstants.java
index 5f0f546..77dc4c3 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/MqttConstants.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/MqttConstants.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/QueueSender.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/QueueSender.java
index d6db359..0ba7be2 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/QueueSender.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/QueueSender.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseRegistry.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseRegistry.java
index b77bf73..474f6d5 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseRegistry.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseRegistry.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseSemaphore.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseSemaphore.java
index 037c336..b5f67bc 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseSemaphore.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/ResponseSemaphore.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  *  7 Colonel Roche 31077 Toulouse - France

  *  

  *  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 2.0

  *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

+ *  https://www.eclipse.org/legal/epl-2.0/

  *  

  *  Initial Contributors:

  *      Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/Utils.java b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/Utils.java
index 56766fd..4bbb211 100644
--- a/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/Utils.java
+++ b/org.eclipse.om2m.binding.mqtt/src/main/java/org/eclipse/om2m/binding/mqtt/util/Utils.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- *  Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ *  Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  *  7 Colonel Roche 31077 Toulouse - France
  *  
  *  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 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
  *  
  *  Initial Contributors:
  *      Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.binding.service/build.properties b/org.eclipse.om2m.binding.service/build.properties
index 3b1ab3b..f019754 100644
--- a/org.eclipse.om2m.binding.service/build.properties
+++ b/org.eclipse.om2m.binding.service/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################

-# Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+# Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

 # 7 Colonel Roche 31077 Toulouse - France

 #

 # 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/

 #

 # Initial Contributors:

 #     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.service/pom.xml b/org.eclipse.om2m.binding.service/pom.xml
index a6b8a33..baa5ec5 100644
--- a/org.eclipse.om2m.binding.service/pom.xml
+++ b/org.eclipse.om2m.binding.service/pom.xml
@@ -1,11 +1,11 @@
 <!--

-    Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+    Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

     7 Colonel Roche 31077 Toulouse - France

    

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Initial Contributors:

         Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.binding.service/src/main/java/org/eclipse/om2m/binding/service/RestClientService.java b/org.eclipse.om2m.binding.service/src/main/java/org/eclipse/om2m/binding/service/RestClientService.java
index 3073b40..f1aa849 100644
--- a/org.eclipse.om2m.binding.service/src/main/java/org/eclipse/om2m/binding/service/RestClientService.java
+++ b/org.eclipse.om2m.binding.service/src/main/java/org/eclipse/om2m/binding/service/RestClientService.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.client.arduino/onem2m-arduino-light.in b/org.eclipse.om2m.client.arduino/onem2m-arduino-light.in
index 04d9dc7..8b6c51f 100644
--- a/org.eclipse.om2m.client.arduino/onem2m-arduino-light.in
+++ b/org.eclipse.om2m.client.arduino/onem2m-arduino-light.in
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
  
 #include <ESP8266WiFi.h>
diff --git a/org.eclipse.om2m.client.arduino/onem2m-client2-dht.ino b/org.eclipse.om2m.client.arduino/onem2m-client2-dht.ino
index 8a70252..a57e365 100644
--- a/org.eclipse.om2m.client.arduino/onem2m-client2-dht.ino
+++ b/org.eclipse.om2m.client.arduino/onem2m-client2-dht.ino
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
  
 #include <ESP8266WiFi.h>
diff --git a/org.eclipse.om2m.client.java/pom.xml b/org.eclipse.om2m.client.java/pom.xml
index 6d626e7..3953cf0 100644
--- a/org.eclipse.om2m.client.java/pom.xml
+++ b/org.eclipse.om2m.client.java/pom.xml
@@ -4,9 +4,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight1.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight1.java
index 1ad2a9b..a14f8ed 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight1.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight1.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 package org.eclipse.om2m.client.java;
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight2.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight2.java
index 2a784e6..597cd8e 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight2.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AELight2.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 package org.eclipse.om2m.client.java;
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AEMN.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AEMN.java
index b37ce74..04050f7 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AEMN.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/AEMN.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 package org.eclipse.om2m.client.java;
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/INAE.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/INAE.java
index 8e94176..5651230 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/INAE.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/INAE.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 package org.eclipse.om2m.client.java;
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/TestConfig.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/TestConfig.java
index a8ec46c..0de40bc 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/TestConfig.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/TestConfig.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 package org.eclipse.om2m.client.java;
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/HttpResponse.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/HttpResponse.java
index 1c7beb6..1e5e136 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/HttpResponse.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/HttpResponse.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 package org.eclipse.om2m.client.java.tools;
diff --git a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/RestHttpClient.java b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/RestHttpClient.java
index d092489..b6d9b48 100644
--- a/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/RestHttpClient.java
+++ b/org.eclipse.om2m.client.java/src/main/java/org/eclipse/om2m/client/java/tools/RestHttpClient.java
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.client.java.tools;
 
diff --git a/org.eclipse.om2m.client.js/onem2m-actuator.js b/org.eclipse.om2m.client.js/onem2m-actuator.js
index a00b067..9a7993e 100644
--- a/org.eclipse.om2m.client.js/onem2m-actuator.js
+++ b/org.eclipse.om2m.client.js/onem2m-actuator.js
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 var express = require('express');
diff --git a/org.eclipse.om2m.client.js/onem2m-monitor-async.js b/org.eclipse.om2m.client.js/onem2m-monitor-async.js
index f2fce5f..3d39295 100644
--- a/org.eclipse.om2m.client.js/onem2m-monitor-async.js
+++ b/org.eclipse.om2m.client.js/onem2m-monitor-async.js
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 var express = require('express');
diff --git a/org.eclipse.om2m.client.js/onem2m-monitor-sync.js b/org.eclipse.om2m.client.js/onem2m-monitor-sync.js
index cae557c..9a0e6a3 100644
--- a/org.eclipse.om2m.client.js/onem2m-monitor-sync.js
+++ b/org.eclipse.om2m.client.js/onem2m-monitor-sync.js
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 var bodyParser = require('body-parser');
diff --git a/org.eclipse.om2m.client.js/onem2m-sensor.js b/org.eclipse.om2m.client.js/onem2m-sensor.js
index f846e4c..cf73995 100644
--- a/org.eclipse.om2m.client.js/onem2m-sensor.js
+++ b/org.eclipse.om2m.client.js/onem2m-sensor.js
@@ -3,9 +3,9 @@
  * 41 Rue de la découverte 31676 Labège - France 
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 
 var express = require('express');
diff --git a/org.eclipse.om2m.commons.logging/build.properties b/org.eclipse.om2m.commons.logging/build.properties
index dbdea0d..39b8d13 100644
--- a/org.eclipse.om2m.commons.logging/build.properties
+++ b/org.eclipse.om2m.commons.logging/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################
-# Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+# Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
 # 7 Colonel Roche 31077 Toulouse - France
 #
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 #
 # Initial Contributors:
 #     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons.logging/pom.xml b/org.eclipse.om2m.commons.logging/pom.xml
index 11175fd..ed67bda 100644
--- a/org.eclipse.om2m.commons.logging/pom.xml
+++ b/org.eclipse.om2m.commons.logging/pom.xml
@@ -1,11 +1,11 @@
 <!--
-    Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+    Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
     7 Colonel Roche 31077 Toulouse - France
    
     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 2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/legal/epl-2.0/
    
     Initial Contributors:
         Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/build.properties b/org.eclipse.om2m.commons/build.properties
index b4cde02..15970c2 100644
--- a/org.eclipse.om2m.commons/build.properties
+++ b/org.eclipse.om2m.commons/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################

-# Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+# Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

 # 7 Colonel Roche 31077 Toulouse - France

 #

 # 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/

 #

 # Initial Contributors:

 #     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/pom.xml b/org.eclipse.om2m.commons/pom.xml
index 185148e..4f78fb9 100644
--- a/org.eclipse.om2m.commons/pom.xml
+++ b/org.eclipse.om2m.commons/pom.xml
@@ -1,11 +1,11 @@
 <!--

-    Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+    Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

     7 Colonel Roche 31077 Toulouse - France

    

     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 2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    https://www.eclipse.org/legal/epl-2.0/

    

     Initial Contributors:

         Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/AccessControl.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/AccessControl.java
index a10f122..96ccf22 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/AccessControl.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/AccessControl.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
-ac * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ac * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/CSEType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/CSEType.java
index b0985b7..2bf8d89 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/CSEType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/CSEType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ConsistencyStrategy.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ConsistencyStrategy.java
index dba9123..b369275 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ConsistencyStrategy.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ConsistencyStrategy.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Constants.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Constants.java
index b82a165..1c1a98c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Constants.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Constants.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java
index 975cbe8..8515363 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DiscoveryResultType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DiscoveryResultType.java
index 6799058..22b22bf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DiscoveryResultType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DiscoveryResultType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/FilterUsage.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/FilterUsage.java
index fa826a7..845112c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/FilterUsage.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/FilterUsage.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MemberType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MemberType.java
index 79fb9f0..1b79ea0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MemberType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MemberType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MgmtDefinitionTypes.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MgmtDefinitionTypes.java
index ff448a6..0a65a64 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MgmtDefinitionTypes.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MgmtDefinitionTypes.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MimeMediaType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MimeMediaType.java
index 4b84be9..764e0b1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MimeMediaType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/MimeMediaType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/NotificationContentType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/NotificationContentType.java
index 8e57686..678a4ab 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/NotificationContentType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/NotificationContentType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Operation.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Operation.java
index 52e189a..3388c94 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Operation.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Operation.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/RequestStatus.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/RequestStatus.java
index 1983a7f..e738aa7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/RequestStatus.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/RequestStatus.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceStatus.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceStatus.java
index ac6aa73..a982797 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceStatus.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceStatus.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceType.java
index 6f43c95..e373d24 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResourceType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseStatusCode.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseStatusCode.java
index a4492ef..62fd98f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseStatusCode.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseStatusCode.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseType.java
index cdee887..6178180 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResponseType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResultContent.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResultContent.java
index 2d34a91..391211c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResultContent.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ResultContent.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/SecurityInfoType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/SecurityInfoType.java
index 51cb239..e3f8dfa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/SecurityInfoType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/SecurityInfoType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.constants;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java
index 7637114..7bbde47 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlContextEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlContextEntity.java
index 5564fb7..f7fc49b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlContextEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlContextEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlOriginatorEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlOriginatorEntity.java
index 45172d6..e1346c8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlOriginatorEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlOriginatorEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java
index 1f93f49..2eb30a3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlRuleEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlRuleEntity.java
index 7408e36..cefc76f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlRuleEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlRuleEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeAnncEntity.java
index 345ef75..1723b5f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeAnncEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeEntity.java
index b04632a..e43f85a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AeEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnounceableSubordinateEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnounceableSubordinateEntity.java
index 1ff4d75..92876f2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnounceableSubordinateEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnounceableSubordinateEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnouncedResourceEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnouncedResourceEntity.java
index 4a7edd9..a257a45 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnouncedResourceEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AnnouncedResourceEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.entities;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoAnncEntity.java
index 3bec573..104c154 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoAnncEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java
index 37b844a..60fa927 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoAnncEntity.java
index 9a3fd28..a02241e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoAnncEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.commons.entities;
 
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java
index 2d47ee3..fe7fe2b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java
index 7d66e49..93120f9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerAnncEntity.java
index b2ea205..982afcd 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerAnncEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java
index 391a382..ed0368a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java
@@ -1,12 +1,12 @@
 /*******************************************************************************

 

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContentInstanceEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContentInstanceEntity.java
index c78b2be..f17e61b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContentInstanceEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContentInstanceEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CreatedAnnouncedResourceEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CreatedAnnouncedResourceEntity.java
index 589b8bd..6709e77 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CreatedAnnouncedResourceEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CreatedAnnouncedResourceEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.entities;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java
index cc03f72..93d382d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.entities;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoAnncEntity.java
index e80a73d..a2a872c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoAnncEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.commons.entities;
 
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java
index 7ccbd2c..9078933 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DynamicAuthorizationConsultationEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DynamicAuthorizationConsultationEntity.java
index b64b56b..c495809 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DynamicAuthorizationConsultationEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DynamicAuthorizationConsultationEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.entities;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerAnncEntity.java
index 42c492f..ab5a017 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerAnncEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.entities;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java
index 8d0b70b..2841800 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/GroupEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/GroupEntity.java
index e148376..9840d4b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/GroupEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/GroupEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/LabelEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/LabelEntity.java
index 385cdca..c562c49 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/LabelEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/LabelEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MetaInformation.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MetaInformation.java
index c477ec0..78c3cad 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MetaInformation.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MetaInformation.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjAnncEntity.java
index 54c9c6a..ae0b6d9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjAnncEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java
index a075180..bb7a1b7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeAnncEntity.java
index 3cb2ca9..a9a1854 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeAnncEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.commons.entities;
 
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java
index da172c6..6478524 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/PollingChannelEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/PollingChannelEntity.java
index d9146f6..407915d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/PollingChannelEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/PollingChannelEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RegularResourceEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RegularResourceEntity.java
index da9dbd9..9771021 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RegularResourceEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RegularResourceEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.entities;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java
index 9c65e57..e96a06d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCseAnncEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCseAnncEntity.java
index 9ec57fa..709bfa1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCseAnncEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCseAnncEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RequestEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RequestEntity.java
index 57d1ec9..e54ec1c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RequestEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RequestEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java
index aaecec6..f9f73fc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ScheduleEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ScheduleEntity.java
index a69bbab..f9e0a7f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ScheduleEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ScheduleEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java
index aecfd74..2a647d8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/UriMapperEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/UriMapperEntity.java
index 894d54b..3a8be4f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/UriMapperEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/UriMapperEntity.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java
index 89ccc05..4283fcf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/BadRequestException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/BadRequestException.java
index 72c535a..f98bb88 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/BadRequestException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/BadRequestException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ConflictException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ConflictException.java
index 6a46922..213c1b5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ConflictException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ConflictException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberNonFoundException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberNonFoundException.java
index 05cd91e..0362360 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberNonFoundException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberNonFoundException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberTypeInconsistentException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberTypeInconsistentException.java
index edd67c6..c02e980 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberTypeInconsistentException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/MemberTypeInconsistentException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotImplementedException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotImplementedException.java
index 7177718..4efbfed 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotImplementedException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotImplementedException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotPermittedAttrException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotPermittedAttrException.java
index de6940e..fba1e65 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotPermittedAttrException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/NotPermittedAttrException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/Om2mException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/Om2mException.java
index 4de7054..fb68d89 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/Om2mException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/Om2mException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ResourceNotFoundException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ResourceNotFoundException.java
index 7d2e768..a135f21 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ResourceNotFoundException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/ResourceNotFoundException.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java
index 9240586..7116ae5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java
index 7c7ad53..10c00c0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Contract.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Contract.java
index 2b6987e..fd05fa4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Contract.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Contract.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java
index 4138f0a..f86b46a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java
index ef95b06..5f7faaf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java
index e08bd82..91ad52b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java
index fca10ac..57e683e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java
index 4db177b..b3bdea5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java
index dadc9aa..2d09dda 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Obj.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Obj.java
index 34bfef3..bf1699d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Obj.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Obj.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java
index bdd927a..597eecd 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java
index 65e25fb..fd96735 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java
index 25661f1..1994f41 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java
index 8b9d9c2..c862f2b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Status.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Status.java
index da4fc41..1966aeb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Status.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Status.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java
index 0efee7b..5044258 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java
index ad1bef3..4c96abb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java
index 989f0de..0d9f98d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixDecoder.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixDecoder.java
index 4cb1b01..2793918 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixDecoder.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixDecoder.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixEncoder.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixEncoder.java
index f738f1d..0c73238 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixEncoder.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixEncoder.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixMapper.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixMapper.java
index 7cc40b6..758dbfa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixMapper.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/io/ObixMapper.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java
index 148e4bd..c1c18f3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java
index c9d683f..130801d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java
index 51bba40..f823513 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.commons.resource;
 
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java
index 1b87924..3ca122a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java
index d7e15ad..312f7ac 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java
index b8da356..15dfdc7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java
index 1d4dd73..f20bc19 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActionStatus.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActionStatus.java
index 4919c47..f2d2f0e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActionStatus.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActionStatus.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActiveCmdhPolicy.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActiveCmdhPolicy.java
index acc391b..3cee57e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActiveCmdhPolicy.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ActiveCmdhPolicy.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedNotification.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedNotification.java
index 758a066..63c3fcf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedNotification.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedNotification.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedRequest.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedRequest.java
index 65aed81..6ade2b1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedRequest.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedRequest.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedResponse.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedResponse.java
index 165bedd..6bacf4f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedResponse.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AggregatedResponse.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java
index 3a4f74f..05ed7da 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java
index b449eee..6a77f9c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedMgmtResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedMgmtResource.java
index 804705c..8bb40ed 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedMgmtResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedMgmtResource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java
index 097143f..1954a1e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java
index 3a50346..ac39aaf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnyArgType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnyArgType.java
index afea4c9..3a84106 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnyArgType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnyArgType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfo.java
index d9ac967..9c94dc7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfo.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfo.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfoAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfoAnnc.java
index b347066..4abce6c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfoAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkDeviceInfoAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfo.java
index f6aad27..c4e707a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfo.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfo.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfoAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfoAnnc.java
index 3e2ec5e..9878df5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfoAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AreaNwkInfoAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Attribute.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Attribute.java
index 8616a1a..cabb396 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Attribute.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Attribute.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AttributeList.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AttributeList.java
index 77ba636..51b1cd9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AttributeList.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AttributeList.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatchNotify.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatchNotify.java
index ba88ae2..d3ff3b0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatchNotify.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatchNotify.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Battery.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Battery.java
index 37bcfae..7fd0db0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Battery.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Battery.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatteryAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatteryAnnc.java
index 93399fd..989e5a4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatteryAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/BatteryAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java
index c9b0369..06e84a5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ChildResourceRef.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ChildResourceRef.java
index 64b1504..b7fcaf2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ChildResourceRef.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ChildResourceRef.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhBuffer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhBuffer.java
index fb6ce1d..d2afa65 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhBuffer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhBuffer.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefEcValue.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefEcValue.java
index cbbcaca..0468e80 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefEcValue.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefEcValue.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefaults.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefaults.java
index e27d1e5..88ae316 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefaults.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhDefaults.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhEcDefParamValues.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhEcDefParamValues.java
index 8247e1e..39277e0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhEcDefParamValues.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhEcDefParamValues.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhLimits.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhLimits.java
index a766113..ae75526 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhLimits.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhLimits.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNetworkAccessRules.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNetworkAccessRules.java
index b94f3a5..e0e0382 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNetworkAccessRules.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNetworkAccessRules.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNwAccessRule.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNwAccessRule.java
index fea3f52..373818e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNwAccessRule.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhNwAccessRule.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhPolicy.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhPolicy.java
index dc9c16a..d5d6972 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhPolicy.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CmdhPolicy.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java
index 76b3fa7..f041ee5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java
index f12af09..a78518d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java
index 774c7da..5aa7936 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java
index a927c83..eea0cdf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java
index 7c75a21..1e6e2d1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java
index 7974133..0093d26 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Delivery.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Delivery.java
index d114bbb..d91ef09 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Delivery.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Delivery.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeliveryMetaData.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeliveryMetaData.java
index f931420..7d60dea 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeliveryMetaData.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeliveryMetaData.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapability.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapability.java
index 7b9d803..5863401 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapability.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapability.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapabilityAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapabilityAnnc.java
index 7d904d4..9b7fc1c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapabilityAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceCapabilityAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfo.java
index 3dc3b18..d0433f4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfo.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfo.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfoAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfoAnnc.java
index 177c711..990e3e5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfoAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DeviceInfoAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DiscoveryResult.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DiscoveryResult.java
index e8e051a..2159aa7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DiscoveryResult.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DiscoveryResult.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DownloadArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DownloadArgsType.java
index 02afb1d..88976ef 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DownloadArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DownloadArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java
index 8032faf..785c908 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasResponse.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasResponse.java
index f07aa81..85a8cd7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasResponse.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java
index e3a3384..10208bf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ErrorInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ErrorInfo.java
index 2aedcfe..f805cec 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ErrorInfo.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ErrorInfo.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventConfig.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventConfig.java
index 18af090..ae42b15 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventConfig.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventConfig.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLog.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLog.java
index f209dd8..7744ab4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLog.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLog.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLogAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLogAnnc.java
index 1c6659c..b062c6b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLogAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventLogAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventNotificationCriteria.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventNotificationCriteria.java
index 9af1953..fac4a90 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventNotificationCriteria.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/EventNotificationCriteria.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecInstance.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecInstance.java
index abbd2c1..2c20fbc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecInstance.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecInstance.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecReqArgsListType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecReqArgsListType.java
index 36c5a6b..575169c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecReqArgsListType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ExecReqArgsListType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FilterCriteria.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FilterCriteria.java
index e910c83..6223051 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FilterCriteria.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FilterCriteria.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Firmware.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Firmware.java
index bc4e970..ccb55ae 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Firmware.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Firmware.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FirmwareAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FirmwareAnnc.java
index 0c2b44d..91d149d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FirmwareAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FirmwareAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainer.java
index dfd8d72..d99900d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java
index 3d203c3..103c87c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java
index 5b44b64..313360b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/GroupAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/GroupAnnc.java
index ad60aac..a502b8b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/GroupAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/GroupAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicy.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicy.java
index 5ebf524..6367410 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicy.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicy.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicyAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicyAnnc.java
index cf00c17..616a0c4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicyAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationPolicyAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationRegion.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationRegion.java
index 8eed8d9..7e363b4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationRegion.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/LocationRegion.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/M2MServiceSubscriptionProfile.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/M2MServiceSubscriptionProfile.java
index 4b102d1..aee40aa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/M2MServiceSubscriptionProfile.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/M2MServiceSubscriptionProfile.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Memory.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Memory.java
index 4c2fec5..82ad594 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Memory.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Memory.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MemoryAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MemoryAnnc.java
index 18b2530..ab9016b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MemoryAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MemoryAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MetaInformation.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MetaInformation.java
index eda32ad..bd07485 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MetaInformation.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MetaInformation.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtCmd.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtCmd.java
index 259f531..c1c3320 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtCmd.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtCmd.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtLinkRef.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtLinkRef.java
index f38b9f5..c125389 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtLinkRef.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtLinkRef.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObj.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObj.java
index 948ce12..7c7f53e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObj.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObj.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjAnncWithChildren.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjAnncWithChildren.java
index 5649d55..f85bbe2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjAnncWithChildren.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjAnncWithChildren.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *******************************************************************************/
 package org.eclipse.om2m.commons.resource;
 
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjWithChildren.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjWithChildren.java
index eb6aea6..f4d895c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjWithChildren.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/MgmtObjWithChildren.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Node.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Node.java
index 666a714..7371307 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Node.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Node.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/NodeAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/NodeAnnc.java
index 1d14814..63dec0e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/NodeAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/NodeAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notification.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notification.java
index 16e90e1..3096b11 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notification.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notification.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ObjectFactory.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ObjectFactory.java
index 7c3c364..efdc629 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ObjectFactory.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ObjectFactory.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/OperationResult.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/OperationResult.java
index 86bdb37..4d9fb25 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/OperationResult.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/OperationResult.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PollingChannel.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PollingChannel.java
index 10248ee..5b76959 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PollingChannel.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PollingChannel.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PrimitiveContent.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PrimitiveContent.java
index 0e73e48..0061e36 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PrimitiveContent.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/PrimitiveContent.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RateLimit.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RateLimit.java
index b8244b6..59ff6ba 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RateLimit.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RateLimit.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Reboot.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Reboot.java
index aaa6eaa..993faa7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Reboot.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Reboot.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootAnnc.java
index 2e66646..e8828f2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootArgsType.java
index ccb0600..cf6e9a0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RebootArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java
index 071c80d..d2af97e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java
index bfeb892..91e3646 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSEAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSEAnnc.java
index b2b7cf2..d6d423c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSEAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSEAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Request.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Request.java
index e221344..f55b8cf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Request.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Request.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java
index 94924a6..a4d80c5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResetArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResetArgsType.java
index d4c9148..ecded9e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResetArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResetArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java
index 3594b5d..47a2c49 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResourceWrapper.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResourceWrapper.java
index 3fea69d..5d74513 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResourceWrapper.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResourceWrapper.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java
index c94e877..c85b0b5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponseTypeInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponseTypeInfo.java
index 5f2ca3b..5b6285f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponseTypeInfo.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponseTypeInfo.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Schedule.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Schedule.java
index 8bf94cf..e7d2953 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Schedule.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Schedule.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleAnnc.java
index 88d94ce..834f81d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleEntries.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleEntries.java
index 30248d0..30e6bee 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleEntries.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ScheduleEntries.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SecurityInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SecurityInfo.java
index 24d941a..0e717a7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SecurityInfo.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SecurityInfo.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2014, 2016 Orange.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *******************************************************************************/

 package org.eclipse.om2m.commons.resource;

 

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedAppRule.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedAppRule.java
index 2deb8ca..3d75293 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedAppRule.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedAppRule.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedNode.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedNode.java
index aa48160..57d63b9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedNode.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ServiceSubscribedNode.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java
index 2a76ec3..7ae3b34 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Software.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Software.java
index e5a3ca0..4b86e9c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Software.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Software.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareAnnc.java
index 94b5780..2de93ba 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareAnnc.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareInstallArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareInstallArgsType.java
index 48d5d0b..387879f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareInstallArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareInstallArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUninstallArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUninstallArgsType.java
index 484af3a..bf31e81 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUninstallArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUninstallArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUpdateArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUpdateArgsType.java
index d9c4aaf..dcb3827 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUpdateArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SoftwareUpdateArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsCollect.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsCollect.java
index 197a032..3dcbbd6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsCollect.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsCollect.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsConfig.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsConfig.java
index eb94fe0..07c3aaf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsConfig.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatsConfig.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatusCode.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatusCode.java
index d67e0cd..9688b35 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatusCode.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/StatusCode.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)

+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)

  * 7 Colonel Roche 31077 Toulouse - France

  *

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/

  *

  * Initial Contributors:

  *     Thierry Monteil : Project manager, technical co-manager

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Subscription.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Subscription.java
index a13ebb2..b560c46 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Subscription.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Subscription.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/UploadArgsType.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/UploadArgsType.java
index a533bc1..b4ddd51 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/UploadArgsType.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/UploadArgsType.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * Copyright (c) 2013-2020 LAAS-CNRS (www.laas.fr)
  * 7 Colonel Roche 31077 Toulouse - France
  *
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Initial Contributors:
  *     Thierry Monteil : Project manager, technical co-manager
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java
index 660e889..0b4a035 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AcousticSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java
index bfc3f1c..da587ab 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AcousticSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java
index 0cee1cc..e462e82 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : ActivateClockTimer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java
index ef3c992..5048af7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : ActivateClockTimerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java
index 7b4ad33..dc0bb3f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirConJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java
index dbf630f..cb061d9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirConJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java
index fc84146..352262d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirFlow
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java
index 23259f7..6419880 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirFlowAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java
index f9d1d26..45caa06 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirPurifierJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java
index 962092b..ab1815b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirPurifierJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java
index 3268374..45db131 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirQualitySensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java
index ff01de1..9bdee04 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AirQualitySensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainer.java
index 856926a..eb3ac7f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AlarmSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainerAnnc.java
index c67c979..d8d7d47 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSensorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AlarmSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java
index 153cfb7..b440605 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AlarmSpeaker
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java
index 9dd9342..75709c7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AlarmSpeakerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java
index 36b544b..f98160d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Anemometer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java
index 2007cfd..832c5ca 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AnemometerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java
index 3d3cab9..0c88cf3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : Answer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java
index e510c99..53c6985 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : AnswerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainer.java
index 97540cd..4b0e77d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AtmosphericPressureSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainerAnnc.java
index 96da197..4ebf3d1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AtmosphericPressureSensorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AtmosphericPressureSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainer.java
index 237c6d5..efa91c9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AudioVideoInput
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainerAnnc.java
index f36fdb9..1757d5e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVideoInputFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2017 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AudioVideoInputAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java
index a6330ed..a6f6067 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AudioVolume
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java
index 9c33748..fa5e533 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AudioVolumeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java
index 2130e3b..ffbc438 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AutoDocumentFeeder
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java
index 188792a..756873d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : AutoDocumentFeederAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java
index 87784ba..eb3d148 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Barometer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java
index ffd4092..da3d08e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BarometerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java
index d674085..d2c2dea 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Battery
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java
index 8310a6f..e67225c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BatteryAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java
index de3ce8a..2319040 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BinaryObject
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java
index cce95bb..34ab55b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BinaryObjectAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java
index 00b0c77..a836b49 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BinarySwitch
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java
index 8ab4fb0..62faa92 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BinarySwitchAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java
index e304209..54e4474 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BioElectricalImpedanceAnalysis
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java
index d5314c2..d2931e5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BioElectricalImpedanceAnalysisAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java
index 759a7e0..ef3689b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BodyCompositionAnalyser
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java
index 4589853..baaf910 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BodyCompositionAnalyserAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java
index de3e2ea..f210912 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Boiler
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java
index 221f975..e9e373b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BoilerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java
index afb2200..5cbca03 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Brewing
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java
index 23e0897..37f4381 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BrewingAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java
index 470bd40..eea5ab1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Brightness
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java
index 2416347..4fd0030 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : BrightnessAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java
index 6c695ff..1f4f300 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : Call
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java
index 264be04..4528260 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : CallAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java
index 4809d59..62805cb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Clock
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java
index 39477fe..f54ee19 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClockAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java
index d496483..2a4f719 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : Close
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java
index b84d4e5..69c2223 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : CloseAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java
index f6ea334..ee230a1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesDryerJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java
index b30a9a1..2faab06 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesDryerJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java
index 713c9e5..38d0d30 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesWasherDryerJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java
index 9101d1a..a6292d4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesWasherDryerJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java
index c0a1c20..e0a14cb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesWasherJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java
index 0664acc..a1c465f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesWasherJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java
index 218dc2e..f4dfe84 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesWasherJobModeOption
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java
index c72cb13..c55ff8f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ClothesWasherJobModeOptionAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java
index 7d29941..dcebd03 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Colour
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java
index c68a1e9..d4ce3cb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ColourAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java
index 2666f15..7ee3740 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ColourSaturation
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java
index 9c6a23f..280dc1d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ColourSaturationAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java
index 7d1063c..1f0d4d5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ContactSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java
index 57bf8a5..b523fcf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : ContactSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainer.java
index 8ceea6f..58e82e7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : CookerHoodJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainerAnnc.java
index d066776..f0c35f1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : CookerHoodJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainer.java
index 910bb71..a2e8e37 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : Credentials
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainerAnnc.java
index 742f650..bc57de5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : CredentialsAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainer.java
index 1065d18..48809d7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : DeactivateClockTimer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainerAnnc.java
index 6b3efc5..20777ce 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : DeactivateClockTimerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainer.java
index b44b7b9..e1c5808 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : DecrementNumberValue
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainerAnnc.java
index 745f4e8..3d2676f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Action : DecrementNumberValueAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainer.java
index f6a030e..958c415 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : DehumidifierJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainerAnnc.java
index 686e074..68e14fe 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 ModuleClass : DehumidifierJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainer.java
index 6fc1ec9..b118b8b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAirConditioner
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainerAnnc.java
index 26e1a06..c23e4c1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAirConditionerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainer.java
index d1b2e9d..fcb6dce 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAirPurifier
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainerAnnc.java
index 51b082f..60b8c2f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAirPurifierAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainer.java
index a521a5e..203d03b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAirQualityMonitor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainerAnnc.java
index 299ada5..6324003 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAirQualityMonitorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainer.java
index c29a873..b50d996 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAudioReceiver
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainerAnnc.java
index 0a68817..4b1753d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceAudioReceiverAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainer.java
index 4bb363b..665b47f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceBloodPressureMonitor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainerAnnc.java
index 7e7bee8..e830db9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceBloodPressureMonitorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainer.java
index f33aeb0..ca53d72 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCamera
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainerAnnc.java
index efdd467..2f4df0a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCameraAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainer.java
index f6c5715..6d1dea8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceClothesDryer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainerAnnc.java
index eb82930..1449c70 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceClothesDryerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainer.java
index 27c8e51..0599a2d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceClothesWasherDryer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainerAnnc.java
index e4fe7e3..6ecf2cf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceClothesWasherDryerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainer.java
index 47767a2..4a15221 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceClothesWasher
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainerAnnc.java
index eda78b3..fd6b26a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceClothesWasherAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainer.java
index 6c9074a..99b61be 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCoffeeMachine
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainerAnnc.java
index 590b844..30722e5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCoffeeMachineAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainer.java
index f5d173c..ff5e184 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceContactDetector
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainerAnnc.java
index e87b62b..3b7e162 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceContactDetectorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainer.java
index a4b83a7..5ea4d7e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCookerHood
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainerAnnc.java
index 028896e..6ac46c3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCookerHoodAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainer.java
index 16bb031..0583870 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCooktop
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainerAnnc.java
index 7055100..c8fe1d7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceCooktopAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainer.java
index 3dd80dc..1c83302 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDehumidifier
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainerAnnc.java
index c1e7bf3..03dd13e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDehumidifierAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainer.java
index 99b31d6..7d23350 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDishWasher
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainerAnnc.java
index 456b3d6..4109826 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDishWasherAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainer.java
index 7cc163b..1692a63 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDoor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainerAnnc.java
index 8774807..10e14b9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDoorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainer.java
index e452dae..397552d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDoorLock
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainerAnnc.java
index 340b6fe..d7321f6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceDoorLockAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainer.java
index 424a991..18263f3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceElectricVehicleCharger
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainerAnnc.java
index afd323b..0022273 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceElectricVehicleChargerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainer.java
index a6223bf..f38bc22 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFan
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainerAnnc.java
index b317f4f..9da1dfb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFanAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainer.java
index 9c513ff..5721a42 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFloodDetector
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java
index e02b307..fd02d63 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFloodDetectorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainer.java
index 2b9045d..b29cb2e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFoodProbe
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainerAnnc.java
index 59f1171..4793835 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFoodProbeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainer.java
index 97d72e4..e21b271 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFreezer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainerAnnc.java
index 39111fa..945b3a5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceFreezerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainer.java
index e720ae6..cf4fc13 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceGasValve
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainerAnnc.java
index 0fddcf8..6f135f2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceGasValveAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainer.java
index ee8fa9b..31ce102 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceGlucosemeter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainerAnnc.java
index fe6735f..b6ee2f5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceGlucosemeterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainer.java
index 334e335..6575fdf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceHeartRateMonitor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainerAnnc.java
index bb975d3..501e316 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceHeartRateMonitorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainer.java
index 8076342..2223529 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceHomeCCTV
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainerAnnc.java
index 6050719..06de559 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainerAnnc.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceHomeCCTVAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainer.java
index 6599b42..c2e32d0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainer.java
@@ -2,9 +2,9 @@
 ********************************************************************************
  * Copyright (c) 2014, 2018 Orange.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  ********************************************************************************
 
 Device : DeviceHumidifier