Merge branch 'master' into dev

# Conflicts:
#	org.eclipse.om2m.site.mn-cse/pom.xml
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
Binary files differ
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
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainerAnnc.java
index b94d413..08df455 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainerAnnc.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 : DeviceHumidifierAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainer.java
index 0e94d5d..3f53670 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainer.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 : DeviceKettle
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainerAnnc.java
index 36c3040..ec4b970 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainerAnnc.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 : DeviceKettleAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainer.java
index 65cf7d3..703645a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainer.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 : DeviceLight
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainerAnnc.java
index ec1e3ee..c0c4325 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainerAnnc.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 : DeviceLightAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainer.java
index e765973..7a88d34 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainer.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 : DeviceMicrogeneration
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainerAnnc.java
index 19d6382..3d17b76 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainerAnnc.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 : DeviceMicrogenerationAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainer.java
index 394f773..09e8a93 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainer.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 : DeviceMotionDetector
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainerAnnc.java
index 4c42196..f5ff53a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainerAnnc.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 : DeviceMotionDetectorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainer.java
index 77bd91b..19795db 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainer.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 : DeviceMultiFunctionPrinter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainerAnnc.java
index b788234..a4f195c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainerAnnc.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 : DeviceMultiFunctionPrinterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainer.java
index 32b99ad..fd076fe 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainer.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 : DeviceOutdoorLamp
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainerAnnc.java
index c2cfca5..b1f924b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainerAnnc.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 : DeviceOutdoorLampAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainer.java
index f109b2c..e61f119 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainer.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 : DeviceOven
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainerAnnc.java
index 0e2c5bd..e5b6eea 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainerAnnc.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 : DeviceOvenAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainer.java
index 5b14a12..c755d94 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainer.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 : DevicePrinter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainerAnnc.java
index 170cd0b..b64f634 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainerAnnc.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 : DevicePrinterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainer.java
index 11f06b3..fa8c089 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainer.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 : DevicePulseOximeter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainerAnnc.java
index 2d65e1a..ec6ba88 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainerAnnc.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 : DevicePulseOximeterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainer.java
index 49e9a5d..3fb9105 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainer.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 : DeviceRefrigerator
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainerAnnc.java
index d244749..f69789c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainerAnnc.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 : DeviceRefrigeratorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainer.java
index 40c0273..ff293bb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainer.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 : DeviceRobotCleaner
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainerAnnc.java
index 2cd894b..bdf3190 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainerAnnc.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 : DeviceRobotCleanerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainer.java
index 89ae8d7..607fde0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainer.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 : DeviceScanner
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainerAnnc.java
index dc0ca6e..119e165 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainerAnnc.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 : DeviceScannerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainer.java
index 7c69c7f..3672e45 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainer.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 : DeviceSecurityPanel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainerAnnc.java
index 9a708bd..6a784d9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainerAnnc.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 : DeviceSecurityPanelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainer.java
index 6264212..273cd84 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainer.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 : DeviceSetTopBox
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainerAnnc.java
index 1985de9..83ee6f4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainerAnnc.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 : DeviceSetTopBoxAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainer.java
index 7e63817..7ff7c6d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainer.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 : DeviceSmartElectricMeter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainerAnnc.java
index 986785f..515f029 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainerAnnc.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 : DeviceSmartElectricMeterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainer.java
index 6b7a78e..e49543b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainer.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 : DeviceSmartPlug
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainerAnnc.java
index aa96001..d2b7525 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainerAnnc.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 : DeviceSmartPlugAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainer.java
index 37dbbd9..7d6b34f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainer.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 : DeviceSmokeDetector
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainerAnnc.java
index 6815046..aa7fd6e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainerAnnc.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 : DeviceSmokeDetectorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainer.java
index 7de3cfc..2666421 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainer.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/
  ********************************************************************************
 
 Device : DeviceSmokeExtractor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainerAnnc.java
index c2cc298..6ba0d20 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeExtractorFlexContainerAnnc.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/
  ********************************************************************************
 
 Device : DeviceSmokeExtractorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainer.java
index 1c3219a..5a1934e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainer.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 : DeviceSteamCloset
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainerAnnc.java
index 9c90834..ef4d45e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainerAnnc.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 : DeviceSteamClosetAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainer.java
index 6bb93e8..286ed26 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainer.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 : DeviceStorageBattery
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainerAnnc.java
index 32b840d..a1a6031 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainerAnnc.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 : DeviceStorageBatteryAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainer.java
index 2aed4d3..0d309dd 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainer.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/
  ********************************************************************************
 
 Device : DeviceSwitchButton
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainerAnnc.java
index 4e1736c..ab3e8a0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchButtonFlexContainerAnnc.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/
  ********************************************************************************
 
 Device : DeviceSwitchButtonAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainer.java
index 747a030..5ca3982 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainer.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 : DeviceSwitch
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainerAnnc.java
index 4c848ed..3cf403d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainerAnnc.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 : DeviceSwitchAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainer.java
index f88b1ce..df61fa8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainer.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 : DeviceTelevision
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainerAnnc.java
index d344319..be2695a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainerAnnc.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 : DeviceTelevisionAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainer.java
index eee28ab..984c251 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainer.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 : DeviceTemperatureDetector
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainerAnnc.java
index f7dbaf4..7a47d83 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainerAnnc.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 : DeviceTemperatureDetectorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainer.java
index 822d4ae..205a127 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainer.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 : DeviceThermometer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainerAnnc.java
index 0e57b41..5082525 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainerAnnc.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 : DeviceThermometerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainer.java
index 6ad7743..ff96fe3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainer.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 : DeviceThermostat
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainerAnnc.java
index 7281521..259701c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainerAnnc.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 : DeviceThermostatAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainer.java
index eda3167..ad9ea58 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainer.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 : DeviceThreeDPrinter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainerAnnc.java
index 1651bd8..ef758d1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainerAnnc.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 : DeviceThreeDPrinterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainer.java
index b3a0cbc..5f693bd 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainer.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/
  ********************************************************************************
 
 Device : DeviceWarningDevice
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainerAnnc.java
index d9f94cc..52c8bd2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningDeviceFlexContainerAnnc.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/
  ********************************************************************************
 
 Device : DeviceWarningDeviceAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainer.java
index 57b48dd..65d22ef 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainer.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 : DeviceWarning
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainerAnnc.java
index a8d3ebe..7b538e8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainerAnnc.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 : DeviceWarningAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainer.java
index e28c2f2..88368df 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainer.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 : DeviceWaterHeater
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainerAnnc.java
index c5ef1d1..1746341 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainerAnnc.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 : DeviceWaterHeaterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainer.java
index 9265116..be4fcf1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainer.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 : DeviceWaterValve
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainerAnnc.java
index f53b34c..e9dc323 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainerAnnc.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 : DeviceWaterValveAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainer.java
index afd6f49..28eb1d5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainer.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 : DeviceWeatherStation
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainerAnnc.java
index d5a1648..8a28fcf 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainerAnnc.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 : DeviceWeatherStationAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.java
index dba4391..d48c57b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.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 : DeviceWeightScaleAndBodyCompositionAnalyser
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.java
index 90a25f7..1361a37 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.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 : DeviceWeightScaleAndBodyCompositionAnalyserAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainer.java
index bb8e84f..84b3032 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainer.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 : DeviceWindowShade
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainerAnnc.java
index 25b5112..430489a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainerAnnc.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 : DeviceWindowShadeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainer.java
index 890e0c9..bcbe1a6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainer.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 : DishWasherJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainerAnnc.java
index 2f66c82..98b4c1b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainerAnnc.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 : DishWasherJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainer.java
index d2a1b3b..f2d1f80 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainer.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 : DoorStatus
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainerAnnc.java
index 9b2faf9..e9ec93c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainerAnnc.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 : DoorStatusAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainer.java
index ed6769e..8da556c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainer.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 : DownChannel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainerAnnc.java
index c6bd96a..2b19315 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainerAnnc.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 : DownChannelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainer.java
index 1496d91..71a4dfe 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainer.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 : DownVolume
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainerAnnc.java
index 3f31816..7d99955 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainerAnnc.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 : DownVolumeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainer.java
index 09e12ab..b599b46 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainer.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 : ElectricVehicleConnector
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainerAnnc.java
index cc8e024..c107e56 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainerAnnc.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 : ElectricVehicleConnectorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainer.java
index 69e2f89..1484051 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainer.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 : EnergyConsumption
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainerAnnc.java
index 9f618ee..0e79e62 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainerAnnc.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 : EnergyConsumptionAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainer.java
index b801de5..0c866c5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainer.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 : EnergyGeneration
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainerAnnc.java
index dda10d6..63fa067 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainerAnnc.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 : EnergyGenerationAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainer.java
index 21ab8dc..68cd14d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainer.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 : ExtendedCarbonDioxideSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainerAnnc.java
index 72e36fd..6bf3b2b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ExtendedCarbonDioxideSensorFlexContainerAnnc.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 : ExtendedCarbonDioxideSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainer.java
index b9f7bb5..62eeaf5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainer.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 : FaultDetection
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainerAnnc.java
index a9e20fa..1c12859 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainerAnnc.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 : FaultDetectionAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainer.java
index b347950..72ab4df 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainer.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 : FilterInfo
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainerAnnc.java
index 5220c3c..8a5d664 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainerAnnc.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 : FilterInfoAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FlexContainerFactory.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FlexContainerFactory.java
index 05a3b0f..e0cb9ee 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FlexContainerFactory.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FlexContainerFactory.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/
  ********************************************************************************
 
 FlexContainerFactory : FlexContainerFactory
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainer.java
index bf992eb..7341ab3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainer.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 : Foaming
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainerAnnc.java
index 546cb21..ec27590 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainerAnnc.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 : FoamingAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainer.java
index 348204e..2b36597 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainer.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 : GeoLocation
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainerAnnc.java
index 12ced8a..0c82dff 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainerAnnc.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 : GeoLocationAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainer.java
index ae268fe..db1d8d4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainer.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 : Glucometer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainerAnnc.java
index 7ed529e..8f4dad6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainerAnnc.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 : GlucometerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainer.java
index a4b6c08..2cd4399 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainer.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 : Grinder
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainerAnnc.java
index ebc9e74..47f604c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainerAnnc.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 : GrinderAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainer.java
index c9d8307..fd9b063 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainer.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 : Hangup
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainerAnnc.java
index 796f315..3699310 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainerAnnc.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 : HangupAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainer.java
index 1379dee..fa49d49 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainer.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 : HeatingZone
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainerAnnc.java
index f865e91..3528d61 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainerAnnc.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 : HeatingZoneAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainer.java
index 0dde7c9..0b9acb0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainer.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 : Height
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainerAnnc.java
index 8a5d7ef..01c0b25 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainerAnnc.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 : HeightAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainer.java
index 652fbac..0359d02 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainer.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 : HotWaterSupply
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainerAnnc.java
index 170c168..46bacc8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainerAnnc.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 : HotWaterSupplyAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainer.java
index a0135eb..832d847 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainer.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 : ImpactSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainerAnnc.java
index 5d72b89..feb9caa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainerAnnc.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 : ImpactSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainer.java
index b30b652..74ab7f8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainer.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 : IncrementNumberValue
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainerAnnc.java
index 268f5d3..1281ed2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainerAnnc.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 : IncrementNumberValueAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainer.java
index 22d768b..b84e275 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainer.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 : KeepWarm
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainerAnnc.java
index b8bf326..5552045 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainerAnnc.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 : KeepWarmAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainer.java
index 3e7c6d5..ad5ff70 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainer.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 : Keypad
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainerAnnc.java
index 7bc26bd..60a89d7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainerAnnc.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 : KeypadAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainer.java
index 930f50a..34743f8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainer.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 : LiquidLevel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainerAnnc.java
index e56f86d..a2a538a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainerAnnc.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 : LiquidLevelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainer.java
index 7263cee..5ea120e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainer.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 : LiquidRemaining
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainerAnnc.java
index 75cb72f..de3e426 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainerAnnc.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 : LiquidRemainingAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainer.java
index 3006546..88de7f1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainer.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 : Lock
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainerAnnc.java
index bbb9706..4ea1d70 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainerAnnc.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 : LockAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainer.java
index 4a41371..c4e6538 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainer.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 : MediaSelect
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainerAnnc.java
index 8f622e5..56a3c60 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainerAnnc.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 : MediaSelectAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainer.java
index 7f1576c..155db13 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainer.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 : MotionSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainerAnnc.java
index 0ab02f6..d1c140f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainerAnnc.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 : MotionSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainer.java
index 9974707..80ddd51 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainer.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 : NextTrack
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainerAnnc.java
index 424493d..f05e12f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainerAnnc.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 : NextTrackAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainer.java
index e1978f3..931d12d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainer.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 : Noise
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainerAnnc.java
index 5638a35..0bb540f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NoiseFlexContainerAnnc.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 : NoiseAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainer.java
index 045969e..3787cd7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainer.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 : NumberValue
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainerAnnc.java
index 43cfdd4..791fafa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainerAnnc.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 : NumberValueAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ObjectFactory.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ObjectFactory.java
index 035be4a..31c3c3f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ObjectFactory.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ObjectFactory.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/
  ********************************************************************************
 
 ObjectFactory : ObjectFactory
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainer.java
index 4f43d8f..96d7d0e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainer.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 : Open
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainerAnnc.java
index 728e238..8a43497 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainerAnnc.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 : OpenAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainer.java
index 058dc4a..e3e27ac 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainer.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 : OpenLevel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainerAnnc.java
index c68c6e9..8736c51 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainerAnnc.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 : OpenLevelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainer.java
index b913dc7..255f246 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainer.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 : OperationMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainerAnnc.java
index 949a588..7688cf2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainerAnnc.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 : OperationModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainer.java
index 633a8ca..8a16f2b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainer.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 : OvercurrentSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainerAnnc.java
index 9eaa221..1b47cef 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainerAnnc.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 : OvercurrentSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainer.java
index 20be44a..faa81fe 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainer.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 : Oximeter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainerAnnc.java
index 6d5a846..ccf6ab0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainerAnnc.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 : OximeterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainer.java
index 8762a9e..3b831b0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainer.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 : OzoneMeter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainerAnnc.java
index 3a0666c..27ddca8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainerAnnc.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 : OzoneMeterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainer.java
index 93fff21..6953f88 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainer.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 : PersonSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainerAnnc.java
index 32f55dd..2f7ce21 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainerAnnc.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 : PersonSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainer.java
index dff563a..f80079e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainer.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 : PhoneCall
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainerAnnc.java
index 0982378..565e69b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainerAnnc.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 : PhoneCallAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainer.java
index 87351f5..2908f0e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainer.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 : PlayerControl
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainerAnnc.java
index 52500cf..4a335f1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainerAnnc.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 : PlayerControlAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainer.java
index a3b9dbc..69f9099 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainer.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 : PowerSave
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainerAnnc.java
index 64b4c02..1a2aeec 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainerAnnc.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 : PowerSaveAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainer.java
index 17fdb76..c14e4f5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainer.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 : PreviousTrack
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainerAnnc.java
index 6011d11..b0fda53 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainerAnnc.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 : PreviousTrackAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainer.java
index 4d67420..7863483 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainer.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 : PrintQueue
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainerAnnc.java
index 0afb12b..44eca1e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainerAnnc.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 : PrintQueueAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainer.java
index 00350d4..a6b6f43 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainer.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 : Pulsemeter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainerAnnc.java
index d78aaa2..394001d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainerAnnc.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 : PulsemeterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainer.java
index f27b3a0..edf5c90 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainer.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 : PushButton
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainerAnnc.java
index fb1db0f..d623ce5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainerAnnc.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 : PushButtonAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainer.java
index 6020d88..7a5e791 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainer.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 : Recorder
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainerAnnc.java
index 25233a4..d667928 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainerAnnc.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 : RecorderAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainer.java
index 59527de..e674390 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainer.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 : Refrigeration
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainerAnnc.java
index f4e2cc2..9d631f5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainerAnnc.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 : RefrigerationAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainer.java
index a5c64bc..6e61f9b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainer.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 : RelativeHumidity
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainerAnnc.java
index 8103bdc..38fbcca 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainerAnnc.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 : RelativeHumidityAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainer.java
index 46b4be8..338ff48 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainer.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 : RemoteControlEnable
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainerAnnc.java
index c0f0378..b7e8a48 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainerAnnc.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 : RemoteControlEnableAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainer.java
index 63cc9aa..96c2571 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainer.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 : ResetNumberValue
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainerAnnc.java
index 79f8f27..3b922de 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainerAnnc.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 : ResetNumberValueAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainer.java
index 75a0193..96a1652 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainer.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 : ResetTextMessage
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainerAnnc.java
index c71259c..f639d0a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainerAnnc.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 : ResetTextMessageAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainer.java
index 0cc3f74..5b5f4c5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainer.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 : RinseLevel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainerAnnc.java
index c180f3e..424eb51 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RinseLevelFlexContainerAnnc.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 : RinseLevelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainer.java
index b288fc1..9a7a7ae 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainer.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 : RobotCleanerJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainerAnnc.java
index dfc676e..31d2de6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainerAnnc.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 : RobotCleanerJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainer.java
index 9fd4994..716143d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainer.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 : RunMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainerAnnc.java
index 1748fbe..0107676 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunModeFlexContainerAnnc.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 : RunModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainer.java
index 1f9f013..10a4bba 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainer.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 : RunState
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainerAnnc.java
index a121ef7..1bc5783 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainerAnnc.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 : RunStateAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainer.java
index 1acd4c7..b3429bc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainer.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 : SecurityMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainerAnnc.java
index aaed0b3..2278743 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainerAnnc.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 : SecurityModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainer.java
index ac408b0..069b35d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainer.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 : SessionDescription
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainerAnnc.java
index 5a0a758..907f727 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainerAnnc.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 : SessionDescriptionAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainer.java
index 3e00c80..40a219b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainer.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 : SignalStrength
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainerAnnc.java
index e4eb098..06b6fc9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainerAnnc.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 : SignalStrengthAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainer.java
index 2e3399a..a37f59e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainer.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 : SmokeSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainerAnnc.java
index 4b7178f..df9f7d7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainerAnnc.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 : SmokeSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainer.java
index ad93350..4b88420 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainer.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 : Sphygmomanometer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainerAnnc.java
index 03b0c03..c698901 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainerAnnc.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 : SphygmomanometerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainer.java
index b84229e..190553d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainer.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 : SpinLevel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainerAnnc.java
index 428a10f..6d1a6a8 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainerAnnc.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 : SpinLevelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainer.java
index 775a41a..c8a0ac1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainer.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 : Start3Dprint
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainerAnnc.java
index 20ea19b..443fff0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainerAnnc.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 : Start3DprintAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainer.java
index b991ea0..171bb05 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainer.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 : SteamClosetJobMode
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainerAnnc.java
index 4ea53f2..7c06ed1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainerAnnc.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 : SteamClosetJobModeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainer.java
index 31d7305..50062ac 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainer.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 : Stop3Dprint
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainerAnnc.java
index 508795a..4a4cd47 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainerAnnc.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 : Stop3DprintAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainer.java
index 881f3ec..d05a9c0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainer.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 : Streaming
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainerAnnc.java
index 36df281..f196f5c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/StreamingFlexContainerAnnc.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 : StreamingAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainer.java
index 2417876..5ac2d30 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainer.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 : TelevisionChannel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainerAnnc.java
index 73c391f..8beb5d0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainerAnnc.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 : TelevisionChannelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainer.java
index 83d6b34..f22160d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainer.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 : TemperatureAlarm
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainerAnnc.java
index f974858..93efacb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainerAnnc.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 : TemperatureAlarmAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainer.java
index 7abec37..b364817 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainer.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 : Temperature
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainerAnnc.java
index c7450c9..6062cd4 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainerAnnc.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 : TemperatureAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainer.java
index 9d2ae72..d228acd 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainer.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 : TextMessage
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainerAnnc.java
index 7304664..f71f2cc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainerAnnc.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 : TextMessageAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainer.java
index 461c4de..0698245 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainer.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 : ThreeDPrinter
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainerAnnc.java
index 99b48b1..d107b78 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainerAnnc.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 : ThreeDPrinterAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainer.java
index 435dd01..08cdc07 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainer.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 : Timer
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainerAnnc.java
index 40e14a6..3d44f84 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainerAnnc.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 : TimerAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainer.java
index 67f63d2..c36f196 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainer.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 : Toggle
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainerAnnc.java
index b5be2a4..87483d1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainerAnnc.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 : ToggleAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainer.java
index 4635d6a..50dd491 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainer.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 : Turbo
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainerAnnc.java
index fdbeaf1..41cb21a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainerAnnc.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 : TurboAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainer.java
index 5217521..a6e60ab 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainer.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 : UpChannel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainerAnnc.java
index 89f9c90..97eae64 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainerAnnc.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 : UpChannelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainer.java
index bb53299..bf9a55e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainer.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 : UpVolume
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainerAnnc.java
index 834ff81..07dc63e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainerAnnc.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 : UpVolumeAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainer.java
index 2ba3bea..df66be2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainer.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 : UvSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainerAnnc.java
index 4db579e..ef926f5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainerAnnc.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 : UvSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainer.java
index a4c77d3..8cf453e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainer.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 : WaterFlow
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainerAnnc.java
index cfe2f98..1b73a8a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainerAnnc.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 : WaterFlowAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainer.java
index bb8a373..18796b6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainer.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 : WaterLevel
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainerAnnc.java
index 1206702..40fc76f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterLevelFlexContainerAnnc.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 : WaterLevelAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainer.java
index bdd503c..e1b401e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainer.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 : WaterSensor
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainerAnnc.java
index ecad01c..4a640d1 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainerAnnc.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 : WaterSensorAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainer.java
index d9365f3..0b937fe 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainer.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 : Weight
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainerAnnc.java
index 676dc23..93c1bcc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainerAnnc.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 : WeightAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainer.java
index 0019dbb..090c5ae 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainer.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 : Wind
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainerAnnc.java
index 8ca8000..a9f17ad 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WindFlexContainerAnnc.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 : WindAnnc
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/jaxb.properties b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/jaxb.properties
index 1ca28d9..c1fe92f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/jaxb.properties
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/jaxb.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/src/main/java/org/eclipse/om2m/commons/resource/jaxb.properties b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/jaxb.properties
index 1ca28d9..c1fe92f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/jaxb.properties
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/jaxb.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/src/main/java/org/eclipse/om2m/commons/resource/package-info.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/package-info.java
index e0a6948..6fcec46 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/package-info.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/package-info.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/utils/AcpUtils.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/AcpUtils.java
index 7e5bf51..2eb4b5a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/AcpUtils.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/AcpUtils.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/utils/DateConverter.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/DateConverter.java
index 11c5672..04314c9 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/DateConverter.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/DateConverter.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/utils/UriUtil.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/UriUtil.java
index dc3e774..810718f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/UriUtil.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/UriUtil.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/utils/Util.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/Util.java
index d2eabaa..abbb124 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/Util.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/Util.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.core.service/build.properties b/org.eclipse.om2m.core.service/build.properties
index 3b1ab3b..f019754 100644
--- a/org.eclipse.om2m.core.service/build.properties
+++ b/org.eclipse.om2m.core.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.core.service/pom.xml b/org.eclipse.om2m.core.service/pom.xml
index 7a5cd00..c70b952 100644
--- a/org.eclipse.om2m.core.service/pom.xml
+++ b/org.eclipse.om2m.core.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.core.service/src/main/java/org/eclipse/om2m/core/service/CseService.java b/org.eclipse.om2m.core.service/src/main/java/org/eclipse/om2m/core/service/CseService.java
index add928c..2198d28 100644
--- a/org.eclipse.om2m.core.service/src/main/java/org/eclipse/om2m/core/service/CseService.java
+++ b/org.eclipse.om2m.core.service/src/main/java/org/eclipse/om2m/core/service/CseService.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.core/build.properties b/org.eclipse.om2m.core/build.properties
index dd8b427..3e74ed4 100644
--- a/org.eclipse.om2m.core/build.properties
+++ b/org.eclipse.om2m.core/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.core/pom.xml b/org.eclipse.om2m.core/pom.xml
index f2ae21c..f0b3a09 100644
--- a/org.eclipse.om2m.core/pom.xml
+++ b/org.eclipse.om2m.core/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-    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.core/src/main/java/org/eclipse/om2m/core/Activator.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/Activator.java
index 8586800..cbef96e 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/Activator.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/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.core/src/main/java/org/eclipse/om2m/core/CSEInitializer.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/CSEInitializer.java
index 59bb861..b5c6e01 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/CSEInitializer.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/CSEInitializer.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.core/src/main/java/org/eclipse/om2m/core/announcer/Announcer.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/announcer/Announcer.java
index 8825eb1..885f08a 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/announcer/Announcer.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/announcer/Announcer.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.core/src/main/java/org/eclipse/om2m/core/comm/RestClient.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/comm/RestClient.java
index 1b84b6a..bf1bfe9 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/comm/RestClient.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/comm/RestClient.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.core/src/main/java/org/eclipse/om2m/core/controller/AEAnncController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEAnncController.java
index 65af095..2c8aa9a 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEAnncController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEAnncController.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.core.controller;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEController.java
index f24409b..f74a30a 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEController.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.core/src/main/java/org/eclipse/om2m/core/controller/AccessControlPolicyController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AccessControlPolicyController.java
index ff49e6e..7e85447 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AccessControlPolicyController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AccessControlPolicyController.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.core/src/main/java/org/eclipse/om2m/core/controller/CSEBaseController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/CSEBaseController.java
index 4a8fdaa..b7a64e4 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/CSEBaseController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/CSEBaseController.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.core/src/main/java/org/eclipse/om2m/core/controller/ContainerController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContainerController.java
index 21fea0a..6701d3b 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContainerController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContainerController.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.core/src/main/java/org/eclipse/om2m/core/controller/ContentInstanceController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContentInstanceController.java
index 9d3bc09..b45f709 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContentInstanceController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContentInstanceController.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.core/src/main/java/org/eclipse/om2m/core/controller/Controller.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/Controller.java
index aef6312..c11f16b 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/Controller.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/Controller.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.core/src/main/java/org/eclipse/om2m/core/controller/DiscoveryController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DiscoveryController.java
index 3840323..36a6934 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DiscoveryController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DiscoveryController.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.core/src/main/java/org/eclipse/om2m/core/controller/DynamicAuthorizationConsultationController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DynamicAuthorizationConsultationController.java
index 32e4c4b..16ccabf 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DynamicAuthorizationConsultationController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DynamicAuthorizationConsultationController.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.core.controller;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FanOutPointController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FanOutPointController.java
index b6d3cee..b8a89b3 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FanOutPointController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FanOutPointController.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.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerAnncController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerAnncController.java
index 6de2d93..3998949 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerAnncController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerAnncController.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.core.controller;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerController.java
index fba8f05..26c2f8d 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerController.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.core.controller;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/GroupController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/GroupController.java
index 63e2f29..7344544 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/GroupController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/GroupController.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.core/src/main/java/org/eclipse/om2m/core/controller/LatestOldestController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/LatestOldestController.java
index a5b7b7c..c10578d 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/LatestOldestController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/LatestOldestController.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.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjAnncController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjAnncController.java
index 73147b2..1051e8c 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjAnncController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjAnncController.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.core.controller;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java
index be03107..47e186a 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.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.core.controller;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeAnncController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeAnncController.java
index 74cbc64..6d1e3e1 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeAnncController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeAnncController.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.core.controller;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java
index 9aff30f..d1bb1b9 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.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.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelController.java
index 48ba059..b793f69 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelController.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.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelUriController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelUriController.java
index c94c98f..b9ab847 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelUriController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelUriController.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.core/src/main/java/org/eclipse/om2m/core/controller/RemoteCSEController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RemoteCSEController.java
index 174615e..160fd22 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RemoteCSEController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RemoteCSEController.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.core/src/main/java/org/eclipse/om2m/core/controller/RequestController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RequestController.java
index 24375b5..3196c55 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RequestController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RequestController.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.core/src/main/java/org/eclipse/om2m/core/controller/SubscriptionController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/SubscriptionController.java
index 1e6b721..7e8c765 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/SubscriptionController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/SubscriptionController.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.core/src/main/java/org/eclipse/om2m/core/datamapper/DataMapperSelector.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/datamapper/DataMapperSelector.java
index 741de7d..1e99e50 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/datamapper/DataMapperSelector.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/datamapper/DataMapperSelector.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.core/src/main/java/org/eclipse/om2m/core/dynamicauthorization/DynamicAuthorizationSelector.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/dynamicauthorization/DynamicAuthorizationSelector.java
index 40b71b4..b24c88b 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/dynamicauthorization/DynamicAuthorizationSelector.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/dynamicauthorization/DynamicAuthorizationSelector.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.core.dynamicauthorization;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AcpMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AcpMapper.java
index f67aabe..46a0893 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AcpMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AcpMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeAnncMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeAnncMapper.java
index b8daa7f..cf4b9d8 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeAnncMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeAnncMapper.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.core.entitymapper;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeMapper.java
index 01047ac..5d112b2 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AeMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordinateMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordinateMapper.java
index 71123bb..55b2566 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordinateMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordinateMapper.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.core.entitymapper;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordonateEntity_AnnounceableResourceMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordonateEntity_AnnounceableResourceMapper.java
index 9886c48..552117d 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordonateEntity_AnnounceableResourceMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnounceableSubordonateEntity_AnnounceableResourceMapper.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.core.entitymapper;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnouncedResourceMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnouncedResourceMapper.java
index 9ef6e29..a041416 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnouncedResourceMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/AnnouncedResourceMapper.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.core.entitymapper;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContainerMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContainerMapper.java
index 66430ac..99c6e75 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContainerMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContainerMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContentInstanceMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContentInstanceMapper.java
index 94f16a5..01209af 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContentInstanceMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContentInstanceMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/CseBaseMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/CseBaseMapper.java
index 4eaa75c..74f53de 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/CseBaseMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/CseBaseMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/DynamicAuthorizationConsultationMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/DynamicAuthorizationConsultationMapper.java
index 2a14202..8262b67 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/DynamicAuthorizationConsultationMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/DynamicAuthorizationConsultationMapper.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.core.entitymapper;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapper.java
index c4f63b3..0fb317f 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapperFactory.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapperFactory.java
index 5c3a11c..eb760dd 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapperFactory.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/EntityMapperFactory.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerAnncMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerAnncMapper.java
index 8ca76fe..ae1dda4 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerAnncMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerAnncMapper.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.core.entitymapper;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerMapper.java
index 37acb18..ed142c0 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerMapper.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.core.entitymapper;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/GroupMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/GroupMapper.java
index a3dd25f..15a8de7 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/GroupMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/GroupMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjAnncMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjAnncMapper.java
index 013396e..fc2f1cc 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjAnncMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjAnncMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjMapper.java
index c336a32..6b41ed8 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeAnncMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeAnncMapper.java
index d115d42..3f6db40 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeAnncMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeAnncMapper.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.core.entitymapper;
 
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeMapper.java
index 2cd6fa6..993aee3 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/NodeMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/PollingChannelMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/PollingChannelMapper.java
index be1e6e4..64219de 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/PollingChannelMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/PollingChannelMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/RegularResourceMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RegularResourceMapper.java
index 69e12dd..98a2e54 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RegularResourceMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RegularResourceMapper.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.core.entitymapper;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RemoteCSEMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RemoteCSEMapper.java
index 1ec5bca..b3dee4b 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RemoteCSEMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RemoteCSEMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/RequestMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RequestMapper.java
index e8f35a0..89d48e2 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RequestMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/RequestMapper.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.core/src/main/java/org/eclipse/om2m/core/entitymapper/SubscriptionMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/SubscriptionMapper.java
index 784b52b..f4a3d06 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/SubscriptionMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/SubscriptionMapper.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.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerSelector.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerSelector.java
index 172844f..0e3c028 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerSelector.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerSelector.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.core.flexcontainer;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerXMLValidator.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerXMLValidator.java
index e74dbed..63ba8cc 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerXMLValidator.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerXMLValidator.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.core.flexcontainer;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/interworking/IpeSelector.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/interworking/IpeSelector.java
index faa578a..152db08 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/interworking/IpeSelector.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/interworking/IpeSelector.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.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingHandler.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingHandler.java
index 83d533c..51e7ab7 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingHandler.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingHandler.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.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingWorker.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingWorker.java
index 24b8232..dc1f6e0 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingWorker.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingWorker.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.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.java
index 9e9ef2a..76b3f69 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.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.core/src/main/java/org/eclipse/om2m/core/persistence/PersistenceService.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/persistence/PersistenceService.java
index a5d9596..4ad978b 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/persistence/PersistenceService.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/persistence/PersistenceService.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.core/src/main/java/org/eclipse/om2m/core/redirector/Redirector.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/redirector/Redirector.java
index ef8d984..1bc210e 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/redirector/Redirector.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/redirector/Redirector.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.core/src/main/java/org/eclipse/om2m/core/remotecse/RemoteCseService.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/remotecse/RemoteCseService.java
index f63812e..bbe0da5 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/remotecse/RemoteCseService.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/remotecse/RemoteCseService.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.core.remotecse;

 

diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Patterns.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Patterns.java
index b9ed2af..114ea06 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Patterns.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Patterns.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.core/src/main/java/org/eclipse/om2m/core/router/Router.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java
index c8f4f57..c2c257f 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.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.core/src/main/java/org/eclipse/om2m/core/thread/CoreExecutor.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/thread/CoreExecutor.java
index de56423..94924d1 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/thread/CoreExecutor.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/thread/CoreExecutor.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.core/src/main/java/org/eclipse/om2m/core/urimapper/UriMapper.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/urimapper/UriMapper.java
index dab0ad0..d0543a8 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/urimapper/UriMapper.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/urimapper/UriMapper.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.core/src/main/java/org/eclipse/om2m/core/util/ControllerUtil.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/ControllerUtil.java
index 20510dd..b345ecc 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/ControllerUtil.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/ControllerUtil.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.core/src/main/java/org/eclipse/om2m/core/util/GroupUtil.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/GroupUtil.java
index 5100e72..d1910c1 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/GroupUtil.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/GroupUtil.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.dal.driver.sample/build.properties b/org.eclipse.om2m.dal.driver.sample/build.properties
index a523078..dc9a5e7 100644
--- a/org.eclipse.om2m.dal.driver.sample/build.properties
+++ b/org.eclipse.om2m.dal.driver.sample/build.properties
@@ -3,9 +3,9 @@
 # Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # 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:
 #     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/pom.xml b/org.eclipse.om2m.dal.driver.sample/pom.xml
index c674a0a..06bcf10 100644
--- a/org.eclipse.om2m.dal.driver.sample/pom.xml
+++ b/org.eclipse.om2m.dal.driver.sample/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.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/BaseFunction.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/BaseFunction.java
index b33b109..aa3c0ff 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/BaseFunction.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/BaseFunction.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/CustomTypes.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/CustomTypes.java
index 522ffca..0c709f7 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/CustomTypes.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/CustomTypes.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/OperationMetadataImpl.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/OperationMetadataImpl.java
index 3b04031..46adf26 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/OperationMetadataImpl.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/custom/functions/OperationMetadataImpl.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/Activator.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/Activator.java
index 805f2eb..d217915 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/Activator.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/Activator.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/FanDevice.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/FanDevice.java
index d1352c7..9789ffb 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/FanDevice.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/FanDevice.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Countdown.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Countdown.java
index e05749c..a26b0e6 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Countdown.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Countdown.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/FaultDetection.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/FaultDetection.java
index 3ad6944..557c6c3 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/FaultDetection.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/FaultDetection.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Speed.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Speed.java
index ce9d474..f93b2fd 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Speed.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Speed.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Switch.java b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Switch.java
index 9da5e33..eae76b1 100644
--- a/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Switch.java
+++ b/org.eclipse.om2m.dal.driver.sample/src/main/java/org/eclipse/om2m/dal/driver/sample/fan/function/Switch.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal/build.properties b/org.eclipse.om2m.dal/build.properties
index 5275d0f..5957d17 100644
--- a/org.eclipse.om2m.dal/build.properties
+++ b/org.eclipse.om2m.dal/build.properties
@@ -3,9 +3,9 @@
 # Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # 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:
 #     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.dal/pom.xml b/org.eclipse.om2m.dal/pom.xml
index e478321..6198405 100644
--- a/org.eclipse.om2m.dal/pom.xml
+++ b/org.eclipse.om2m.dal/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.das.service/build.properties b/org.eclipse.om2m.das.service/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.das.service/build.properties
+++ b/org.eclipse.om2m.das.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.das.service/pom.xml b/org.eclipse.om2m.das.service/pom.xml
index 58d9811..d0a2745 100644
--- a/org.eclipse.om2m.das.service/pom.xml
+++ b/org.eclipse.om2m.das.service/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 
diff --git a/org.eclipse.om2m.das.testsuite/build.properties b/org.eclipse.om2m.das.testsuite/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.das.testsuite/build.properties
+++ b/org.eclipse.om2m.das.testsuite/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.das.testsuite/pom.xml b/org.eclipse.om2m.das.testsuite/pom.xml
index 785ecf3..85352b7 100644
--- a/org.eclipse.om2m.das.testsuite/pom.xml
+++ b/org.eclipse.om2m.das.testsuite/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 
diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Activator.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Activator.java
index ab487cd..18b0e5c 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Activator.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Activator.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.das.testsuite;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Test.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Test.java
index e8f26bf..9f2d7b8 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Test.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/Test.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.das.testsuite;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/AbstractDASServiceTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/AbstractDASServiceTest.java
index 31ea2d8..ef3d891 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/AbstractDASServiceTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/AbstractDASServiceTest.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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AccessDenied.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AccessDenied.java
index f877134..5c85e45 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AccessDenied.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AccessDenied.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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_Ae.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_Ae.java
index 26c56a9..cb38940 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_Ae.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_Ae.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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AeAnnc.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AeAnnc.java
index b0c0ef2..6ba44ad 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AeAnnc.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_AeAnnc.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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainer.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainer.java
index ca8204f..9621090 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainer.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainerAnnc.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainerAnnc.java
index 0fa64ab..e7d3872 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainerAnnc.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_IndirectDACIs.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_IndirectDACIs.java
index 6eb6add..ec45cc2 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_IndirectDACIs.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_IndirectDACIs.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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_TwoDAS.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_TwoDAS.java
index 10f3c8c..ee371d4 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_TwoDAS.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_TwoDAS.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.das.testsuite.ae;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_Application_Test.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_Application_Test.java
index 2f24faa..cbdef7f 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_Application_Test.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_Application_Test.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.das.testsuite.crud;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_CseBase_Test.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_CseBase_Test.java
index d76bc01..ceadfe1 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_CseBase_Test.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_CseBase_Test.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.das.testsuite.crud;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_RemoteCSE_Test.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_RemoteCSE_Test.java
index ada273a..59e0e1d 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_RemoteCSE_Test.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/CreateDAS_RemoteCSE_Test.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.das.testsuite.crud;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/DeleteDASTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/DeleteDASTest.java
index 05ed04f..7c039cb 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/DeleteDASTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/DeleteDASTest.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.das.testsuite.crud;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/RetrieveDASTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/RetrieveDASTest.java
index 6168c9a..711936f 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/RetrieveDASTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/RetrieveDASTest.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.das.testsuite.crud;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/UpdateDASTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/UpdateDASTest.java
index b051334..4597cd2 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/UpdateDASTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/crud/UpdateDASTest.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.das.testsuite.crud;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeAnncDacisTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeAnncDacisTest.java
index cad4d9b..1d1da9d 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeAnncDacisTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeAnncDacisTest.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.das.testsuite.dacis;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeDacisTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeDacisTest.java
index e7ed38c..7a2f653 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeDacisTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/AeDacisTest.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.das.testsuite.dacis;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/DynamicAuthorizationConsultationDacisTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/DynamicAuthorizationConsultationDacisTest.java
index b820fe0..e1ab3cb 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/DynamicAuthorizationConsultationDacisTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/DynamicAuthorizationConsultationDacisTest.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.das.testsuite.dacis;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerAnncDacisTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerAnncDacisTest.java
index 892e6c6..d3a375f 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerAnncDacisTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerAnncDacisTest.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.das.testsuite.dacis;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerDacisTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerDacisTest.java
index b6260b7..a86f1a2 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerDacisTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/FlexContainerDacisTest.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.das.testsuite.dacis;

 

diff --git a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/RemoteCseDacisTest.java b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/RemoteCseDacisTest.java
index 2dc96a5..d71e727 100644
--- a/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/RemoteCseDacisTest.java
+++ b/org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/dacis/RemoteCseDacisTest.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.das.testsuite.dacis;

 

diff --git a/org.eclipse.om2m.datamapping.jaxb/build.properties b/org.eclipse.om2m.datamapping.jaxb/build.properties
index fe4d0a2..82cd962 100644
--- a/org.eclipse.om2m.datamapping.jaxb/build.properties
+++ b/org.eclipse.om2m.datamapping.jaxb/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.datamapping.jaxb/pom.xml b/org.eclipse.om2m.datamapping.jaxb/pom.xml
index 7d7a767..8e3dcc9 100644
--- a/org.eclipse.om2m.datamapping.jaxb/pom.xml
+++ b/org.eclipse.om2m.datamapping.jaxb/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.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Activator.java b/org.eclipse.om2m.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Activator.java
index 91743d6..c521793 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Activator.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/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.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Mapper.java b/org.eclipse.om2m.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Mapper.java
index ccb9662..158b5ec 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Mapper.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/main/java/org/eclipse/om2m/datamapping/jaxb/Mapper.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.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/AbstractMapperTest.java b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/AbstractMapperTest.java
index f232ca5..77db106 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/AbstractMapperTest.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/AbstractMapperTest.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.datamapping.jaxb;

 

diff --git a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestChildResourceRef.java b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestChildResourceRef.java
index 8dd8edd..bc276c6 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestChildResourceRef.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestChildResourceRef.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.datamapping.jaxb;

 

diff --git a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestDeviceLightFlexContainer.java b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestDeviceLightFlexContainer.java
index 8bd6218..e79a7a7 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestDeviceLightFlexContainer.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestDeviceLightFlexContainer.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.datamapping.jaxb;

 

diff --git a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestGroup.java b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestGroup.java
index 2dafb88..3124c5b 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestGroup.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestGroup.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.datamapping.jaxb;

 

diff --git a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestUrilList.java b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestUrilList.java
index c4f8c21..5228732 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestUrilList.java
+++ b/org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestUrilList.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.datamapping.jaxb;

 

diff --git a/org.eclipse.om2m.datamapping.service/build.properties b/org.eclipse.om2m.datamapping.service/build.properties
index 40d9b62..ef701e1 100644
--- a/org.eclipse.om2m.datamapping.service/build.properties
+++ b/org.eclipse.om2m.datamapping.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.datamapping.service/pom.xml b/org.eclipse.om2m.datamapping.service/pom.xml
index e3ca745..668c2e3 100644
--- a/org.eclipse.om2m.datamapping.service/pom.xml
+++ b/org.eclipse.om2m.datamapping.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.datamapping.service/src/main/java/org/eclipse/om2m/datamapping/service/DataMapperService.java b/org.eclipse.om2m.datamapping.service/src/main/java/org/eclipse/om2m/datamapping/service/DataMapperService.java
index 5fefe93..b8086a3 100644
--- a/org.eclipse.om2m.datamapping.service/src/main/java/org/eclipse/om2m/datamapping/service/DataMapperService.java
+++ b/org.eclipse.om2m.datamapping.service/src/main/java/org/eclipse/om2m/datamapping/service/DataMapperService.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.flexcontainer.service/build.properties b/org.eclipse.om2m.flexcontainer.service/build.properties
index 95bea82..c82e156 100644
--- a/org.eclipse.om2m.flexcontainer.service/build.properties
+++ b/org.eclipse.om2m.flexcontainer.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.flexcontainer.service/pom.xml b/org.eclipse.om2m.flexcontainer.service/pom.xml
index 04cdb73..5a8f8af 100644
--- a/org.eclipse.om2m.flexcontainer.service/pom.xml
+++ b/org.eclipse.om2m.flexcontainer.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.flexcontainer.service/src/main/java/org/eclipse/om2m/flexcontainer/service/FlexContainerService.java b/org.eclipse.om2m.flexcontainer.service/src/main/java/org/eclipse/om2m/flexcontainer/service/FlexContainerService.java
index 10c017a..0409667 100644
--- a/org.eclipse.om2m.flexcontainer.service/src/main/java/org/eclipse/om2m/flexcontainer/service/FlexContainerService.java
+++ b/org.eclipse.om2m.flexcontainer.service/src/main/java/org/eclipse/om2m/flexcontainer/service/FlexContainerService.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.flexcontainer.service;

 

diff --git a/org.eclipse.om2m.interworking.service/build.properties b/org.eclipse.om2m.interworking.service/build.properties
index 95bea82..c82e156 100644
--- a/org.eclipse.om2m.interworking.service/build.properties
+++ b/org.eclipse.om2m.interworking.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.interworking.service/pom.xml b/org.eclipse.om2m.interworking.service/pom.xml
index e35b6df..16e4ac2 100644
--- a/org.eclipse.om2m.interworking.service/pom.xml
+++ b/org.eclipse.om2m.interworking.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.interworking.service/src/main/java/org/eclipse/om2m/interworking/service/InterworkingService.java b/org.eclipse.om2m.interworking.service/src/main/java/org/eclipse/om2m/interworking/service/InterworkingService.java
index 12f97bb..e61723b 100644
--- a/org.eclipse.om2m.interworking.service/src/main/java/org/eclipse/om2m/interworking/service/InterworkingService.java
+++ b/org.eclipse.om2m.interworking.service/src/main/java/org/eclipse/om2m/interworking/service/InterworkingService.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.ipe.dal/build.properties b/org.eclipse.om2m.ipe.dal/build.properties
index 1d09d02..c90ffc4 100644
--- a/org.eclipse.om2m.ipe.dal/build.properties
+++ b/org.eclipse.om2m.ipe.dal/build.properties
@@ -3,9 +3,9 @@
 # Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # 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:
 #     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.ipe.dal/pom.xml b/org.eclipse.om2m.ipe.dal/pom.xml
index b009efc..dbce54f 100644
--- a/org.eclipse.om2m.ipe.dal/pom.xml
+++ b/org.eclipse.om2m.ipe.dal/pom.xml
@@ -3,9 +3,9 @@
     Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
    
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License 2.0
     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:
         Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/Activator.java b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/Activator.java
index d52582a..30dfcca 100644
--- a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/Activator.java
+++ b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/Activator.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionEventHandler.java b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionEventHandler.java
index f608769..ec3103b 100644
--- a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionEventHandler.java
+++ b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionEventHandler.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionServiceTracker.java b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionServiceTracker.java
index 20b63e6..c128fc6 100644
--- a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionServiceTracker.java
+++ b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/FunctionServiceTracker.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/InterworkingServiceImpl.java b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/InterworkingServiceImpl.java
index 3cb377a..5b77dc9 100644
--- a/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/InterworkingServiceImpl.java
+++ b/org.eclipse.om2m.ipe.dal/src/main/java/org/eclipse/om2m/ipe/dal/InterworkingServiceImpl.java
@@ -3,9 +3,9 @@
  * Huawei Base, Bantian,Longgang District ,Shenzhen ,Guangdong ,China
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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:
  *     Seven Ganlu : Developer
diff --git a/org.eclipse.om2m.ipe.sample.sdt/build.properties b/org.eclipse.om2m.ipe.sample.sdt/build.properties
index 351c5fc..683d83e 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/build.properties
+++ b/org.eclipse.om2m.ipe.sample.sdt/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.ipe.sample.sdt/pom.xml b/org.eclipse.om2m.ipe.sample.sdt/pom.xml
index c21f8c7..8861b0b 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/pom.xml
+++ b/org.eclipse.om2m.ipe.sample.sdt/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.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/Activator.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/Activator.java
index 79ac9d1..abc89f3 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/Activator.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/Activator.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.ipe.sample.sdt;
 
diff --git a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/constants/SampleConstants.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/constants/SampleConstants.java
index 0e124ee..85b1a66 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/constants/SampleConstants.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/constants/SampleConstants.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.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/LifeCycleManager.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/LifeCycleManager.java
index c448095..426114a 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/LifeCycleManager.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/LifeCycleManager.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.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/SampleController.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/SampleController.java
index a745af5..b8f1142 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/SampleController.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/controller/SampleController.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.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/gui/GUI.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/gui/GUI.java
index 27edbeb..ea2b625 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/gui/GUI.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/gui/GUI.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.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/Lamp.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/Lamp.java
index a296c44..012e5ab 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/Lamp.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/Lamp.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.ipe.sample.sdt.model;
 
diff --git a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleBinarySwitch.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleBinarySwitch.java
index 76ea070..d941445 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleBinarySwitch.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleBinarySwitch.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.ipe.sample.sdt.model;
 
diff --git a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleColour.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleColour.java
index 12c94d6..23d659c 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleColour.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleColour.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.ipe.sample.sdt.model;
 
diff --git a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleModel.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleModel.java
index a32f367..ee005ce 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleModel.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/SampleModel.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.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/monitor/SampleMonitor.java b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/monitor/SampleMonitor.java
index b3ffdba..8cebf2d 100644
--- a/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/monitor/SampleMonitor.java
+++ b/org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/monitor/SampleMonitor.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.ipe.sample/build.properties b/org.eclipse.om2m.ipe.sample/build.properties
index 3b1ab3b..f019754 100644
--- a/org.eclipse.om2m.ipe.sample/build.properties
+++ b/org.eclipse.om2m.ipe.sample/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.ipe.sample/pom.xml b/org.eclipse.om2m.ipe.sample/pom.xml
index 483405b..db5d593 100644
--- a/org.eclipse.om2m.ipe.sample/pom.xml
+++ b/org.eclipse.om2m.ipe.sample/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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/Activator.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/Activator.java
index cc4b965..7d5e255 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/Activator.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/RequestSender.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/RequestSender.java
index 7a308c5..9d2cf9b 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/RequestSender.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/RequestSender.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/SampleRouter.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/SampleRouter.java
index 2e96ab4..cad6a79 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/SampleRouter.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/SampleRouter.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/Operations.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/Operations.java
index 62f29ef..da3ec6d 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/Operations.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/Operations.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/SampleConstants.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/SampleConstants.java
index 7548aca..b25ca4f 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/SampleConstants.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/constants/SampleConstants.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/LifeCycleManager.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/LifeCycleManager.java
index 1a77712..867f548 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/LifeCycleManager.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/LifeCycleManager.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/SampleController.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/SampleController.java
index ea73f57..c8df03d 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/SampleController.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/controller/SampleController.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/gui/GUI.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/gui/GUI.java
index d05d8ef..c9aacb1 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/gui/GUI.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/gui/GUI.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/Lamp.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/Lamp.java
index f9bc197..3bf01ab 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/Lamp.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/Lamp.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/SampleModel.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/SampleModel.java
index 51fafab..3e23df3 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/SampleModel.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/model/SampleModel.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/monitor/SampleMonitor.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/monitor/SampleMonitor.java
index 20fd562..1b4f27d 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/monitor/SampleMonitor.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/monitor/SampleMonitor.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.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/util/ObixUtil.java b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/util/ObixUtil.java
index 5e926e8..c814132 100644
--- a/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/util/ObixUtil.java
+++ b/org.eclipse.om2m.ipe.sample/src/main/java/org/eclipse/om2m/ipe/sample/util/ObixUtil.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.ipe.sdt.testsuite/build.properties b/org.eclipse.om2m.ipe.sdt.testsuite/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/build.properties
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/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.ipe.sdt.testsuite/pom.xml b/org.eclipse.om2m.ipe.sdt.testsuite/pom.xml
index 1a9635d..d9cfb47 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/pom.xml
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 
diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/Activator.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/Activator.java
index b0018d8..09ea9a8 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/Activator.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/Activator.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.ipe.sdt.testsuite;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/CSEUtil.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/CSEUtil.java
index 00efd55..6c318c5 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/CSEUtil.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/CSEUtil.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.ipe.sdt.testsuite;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceChecker.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceChecker.java
index b358058..e6d2a07 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceChecker.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceChecker.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.ipe.sdt.testsuite;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceDiscoveryTestSuite.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceDiscoveryTestSuite.java
index 745fd45..6148b6a 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceDiscoveryTestSuite.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceDiscoveryTestSuite.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.ipe.sdt.testsuite;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/SDTModuleTestSuite.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/SDTModuleTestSuite.java
index cde1ec5..bb94c05 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/SDTModuleTestSuite.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/SDTModuleTestSuite.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.ipe.sdt.testsuite;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/TestReport.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/TestReport.java
index 0916157..818ba34 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/TestReport.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/TestReport.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.ipe.sdt.testsuite;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AbstractModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AbstractModuleTest.java
index 40d79be..5724863 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AbstractModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AbstractModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AlarmSpeakerModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AlarmSpeakerModuleTest.java
index 46cb326..3f0a5cf 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AlarmSpeakerModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AlarmSpeakerModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/BinarySwitchModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/BinarySwitchModuleTest.java
index 7051faf..e0e5033 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/BinarySwitchModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/BinarySwitchModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourModuleTest.java
index e1fb8d8..b8d34aa 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourSaturationModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourSaturationModuleTest.java
index c111a54..cf8c69e 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourSaturationModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourSaturationModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/FaultDetectionModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/FaultDetectionModuleTest.java
index 203d677..d6f5bb6 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/FaultDetectionModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/FaultDetectionModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/SmokeSensorModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/SmokeSensorModuleTest.java
index 597b3ab..18c721f 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/SmokeSensorModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/SmokeSensorModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterLevelModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterLevelModuleTest.java
index a07a9b1..9959c45 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterLevelModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterLevelModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterSensorModuleTest.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterSensorModuleTest.java
index 5ade949..a7981ce 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterSensorModuleTest.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterSensorModuleTest.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.ipe.sdt.testsuite.module;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/exception/FlexContainerNotFound.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/exception/FlexContainerNotFound.java
index 6169cae..43af21d 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/exception/FlexContainerNotFound.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/exception/FlexContainerNotFound.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.ipe.sdt.testsuite.module.exception;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/NotificationQueue.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/NotificationQueue.java
index 3e76aa1..6e40e2d 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/NotificationQueue.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/NotificationQueue.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.ipe.sdt.testsuite.subscription;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/ReceivedNotification.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/ReceivedNotification.java
index 9c5d826..9f12578 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/ReceivedNotification.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/ReceivedNotification.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.ipe.sdt.testsuite.subscription;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionHttpServlet.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionHttpServlet.java
index 78e2d22..f560c98 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionHttpServlet.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionHttpServlet.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.ipe.sdt.testsuite.subscription;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionSDTListener.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionSDTListener.java
index 897a7e1..e0136a8 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionSDTListener.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionSDTListener.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.ipe.sdt.testsuite.subscription;

 

diff --git a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionTestSuite.java b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionTestSuite.java
index 5bc0064..076e8d6 100644
--- a/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionTestSuite.java
+++ b/org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionTestSuite.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.ipe.sdt.testsuite.subscription;

 

diff --git a/org.eclipse.om2m.ipe.sdt/build.properties b/org.eclipse.om2m.ipe.sdt/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.ipe.sdt/build.properties
+++ b/org.eclipse.om2m.ipe.sdt/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.ipe.sdt/pom.xml b/org.eclipse.om2m.ipe.sdt/pom.xml
index 4b4a39f..80c2c9c 100644
--- a/org.eclipse.om2m.ipe.sdt/pom.xml
+++ b/org.eclipse.om2m.ipe.sdt/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 
diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/Activator.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/Activator.java
index f8c2d83..533ef11 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/Activator.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/Activator.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/CseUtil.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/CseUtil.java
index fdddfa4..0accc36 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/CseUtil.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/CseUtil.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceList.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceList.java
index e7bb745..ba499a8 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceList.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceList.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceListListener.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceListListener.java
index 9f5fdf4..a5a3715 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceListListener.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/DeviceListListener.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/ModuleSDTListener.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/ModuleSDTListener.java
index 782796b..1d2717a 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/ModuleSDTListener.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/ModuleSDTListener.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTActionAdaptor.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTActionAdaptor.java
index 7008dcf..c587d8e 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTActionAdaptor.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTActionAdaptor.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTDeviceAdaptor.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTDeviceAdaptor.java
index 41b3862..ccf5684 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTDeviceAdaptor.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTDeviceAdaptor.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTIpeApplication.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTIpeApplication.java
index a18c429..fc324b2 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTIpeApplication.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTIpeApplication.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTModuleAdaptor.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTModuleAdaptor.java
index 4ccc9be..0a8eb2d 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTModuleAdaptor.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTModuleAdaptor.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ActionFlexContainerService.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ActionFlexContainerService.java
index 42d3d6b..5f683c5 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ActionFlexContainerService.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ActionFlexContainerService.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.ipe.sdt.flexcontainerservice;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ModuleFlexContainerService.java b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ModuleFlexContainerService.java
index 44d37dc..4be7d5d 100644
--- a/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ModuleFlexContainerService.java
+++ b/org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ModuleFlexContainerService.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.ipe.sdt.flexcontainerservice;

 

diff --git a/org.eclipse.om2m.ipe.sdt/src/test/java/org/eclipse/om2m/ipe/sdt/SDTUtilTest.java b/org.eclipse.om2m.ipe.sdt/src/test/java/org/eclipse/om2m/ipe/sdt/SDTUtilTest.java
index f7c121a..78eaffd 100644
--- a/org.eclipse.om2m.ipe.sdt/src/test/java/org/eclipse/om2m/ipe/sdt/SDTUtilTest.java
+++ b/org.eclipse.om2m.ipe.sdt/src/test/java/org/eclipse/om2m/ipe/sdt/SDTUtilTest.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.ipe.sdt;

 

diff --git a/org.eclipse.om2m.persistence.eclipselink/META-INF/persistence.xml b/org.eclipse.om2m.persistence.eclipselink/META-INF/persistence.xml
index 42f45d6..bcd0074 100644
--- a/org.eclipse.om2m.persistence.eclipselink/META-INF/persistence.xml
+++ b/org.eclipse.om2m.persistence.eclipselink/META-INF/persistence.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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.persistence.eclipselink/build.properties b/org.eclipse.om2m.persistence.eclipselink/build.properties
index 95aabbe..8b91cc1 100644
--- a/org.eclipse.om2m.persistence.eclipselink/build.properties
+++ b/org.eclipse.om2m.persistence.eclipselink/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.persistence.eclipselink/pom.xml b/org.eclipse.om2m.persistence.eclipselink/pom.xml
index 6932849..6be8c3e 100644
--- a/org.eclipse.om2m.persistence.eclipselink/pom.xml
+++ b/org.eclipse.om2m.persistence.eclipselink/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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/Activator.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/Activator.java
index 170ced6..b783cd3 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/Activator.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DAOFactoryImpl.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DAOFactoryImpl.java
index 0d0a87d..fc97b9d 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DAOFactoryImpl.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DAOFactoryImpl.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBServiceJPAImpl.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBServiceJPAImpl.java
index 6da90cb..44123cc 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBServiceJPAImpl.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBServiceJPAImpl.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBTransactionJPAImpl.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBTransactionJPAImpl.java
index a7768ae..91256e3 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBTransactionJPAImpl.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/DBTransactionJPAImpl.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AbstractDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AbstractDAO.java
index 7206bc9..3d6ede3 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AbstractDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AbstractDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlOriginatorDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlOriginatorDAO.java
index f566d9c..6c211c1 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlOriginatorDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlOriginatorDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlPolicyDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlPolicyDAO.java
index 060ea31..8c7b500 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlPolicyDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AccessControlPolicyDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeAnncDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeAnncDAO.java
index 4cb22c2..9a99154 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeAnncDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeAnncDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeDAO.java
index a246d6d..957de69 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/CSEBaseDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/CSEBaseDAO.java
index 4c2ece5..4e982f6 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/CSEBaseDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/CSEBaseDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerAnncDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerAnncDAO.java
index f371262..0ec1d1c 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerAnncDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerAnncDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerDAO.java
index 3bb7221..2958508 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContainerDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContentInstanceDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContentInstanceDAO.java
index 06bcbb9..2630f25 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContentInstanceDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ContentInstanceDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/FlexContainerDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/FlexContainerDAO.java
index 49338b6..e0c9119 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/FlexContainerDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/FlexContainerDAO.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.persistence.eclipselink.internal.dao;
 
diff --git a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/GroupDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/GroupDAO.java
index b8ae9b6..02fc011 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/GroupDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/GroupDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/LabelDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/LabelDAO.java
index 9f25618..a030773 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/LabelDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/LabelDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjAnncDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjAnncDAO.java
index ab05694..3622314 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjAnncDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjAnncDAO.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.persistence.eclipselink.internal.dao;
 
diff --git a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjDAO.java
index aded936..276c49a 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/MgmtObjDAO.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.persistence.eclipselink.internal.dao;
 
diff --git a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeAnncDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeAnncDAO.java
index b397fe5..5b1f2db 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeAnncDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeAnncDAO.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.persistence.eclipselink.internal.dao;
 
diff --git a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeDAO.java
index f9e401c..74db630 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/NodeDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/OldestDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/OldestDAO.java
index fd98ab6..2c8439d 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/OldestDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/OldestDAO.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/
  *
  * Initial Contributors:
  *     Mahdi Ben Alaya - benalaya@sensinov.com
diff --git a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/PollingChannelDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/PollingChannelDAO.java
index 671a280..f6b5cfb 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/PollingChannelDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/PollingChannelDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEByIdDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEByIdDAO.java
index 14c7090..1df42f6 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEByIdDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEByIdDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEDAO.java
index 00482a9..1835532 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCSEDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCseAnncDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCseAnncDAO.java
index 0e7db9b..23b053e 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCseAnncDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RemoteCseAnncDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RequestEntityDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RequestEntityDAO.java
index 8510d32..bd1e5d6 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RequestEntityDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/RequestEntityDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ScheduleDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ScheduleDAO.java
index 0e93e4d..3ed398f 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ScheduleDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/ScheduleDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/SubscriptionDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/SubscriptionDAO.java
index 5b183b5..4c330d2 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/SubscriptionDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/SubscriptionDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/UriMapperDAO.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/UriMapperDAO.java
index 1875fbb..27687f0 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/UriMapperDAO.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/UriMapperDAO.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/ComplexFindUtilImpl.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/ComplexFindUtilImpl.java
index 66df1a3..7d0ecbc 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/ComplexFindUtilImpl.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/ComplexFindUtilImpl.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.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/DBUtilManagerImpl.java b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/DBUtilManagerImpl.java
index f32910f..d41549a 100644
--- a/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/DBUtilManagerImpl.java
+++ b/org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/util/DBUtilManagerImpl.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.persistence.mongodb/build.properties b/org.eclipse.om2m.persistence.mongodb/build.properties
index 4479065..0668e9b 100644
--- a/org.eclipse.om2m.persistence.mongodb/build.properties
+++ b/org.eclipse.om2m.persistence.mongodb/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.persistence.mongodb/pom.xml b/org.eclipse.om2m.persistence.mongodb/pom.xml
index 18bebc6..013a409 100644
--- a/org.eclipse.om2m.persistence.mongodb/pom.xml
+++ b/org.eclipse.om2m.persistence.mongodb/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.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Activator.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Activator.java
index 17b64ca..93668e9 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Activator.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Activator.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Constants.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Constants.java
index 0065179..90d1444 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Constants.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Constants.java
@@ -1,9 +1,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/
  *
  * Contributors:
  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 
diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOFactoryImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOFactoryImpl.java
index f247bd1..ab8032a 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOFactoryImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOFactoryImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOImpl.java
index b24ce82..07494c8 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DAOImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBServiceImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBServiceImpl.java
index c407acb..960167c 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBServiceImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBServiceImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBTransactionImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBTransactionImpl.java
index 32e170c..6267254 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBTransactionImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBTransactionImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AccessControlOriginatorEntityDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AccessControlOriginatorEntityDAO.java
index 2809e51..82b30d4 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AccessControlOriginatorEntityDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AccessControlOriginatorEntityDAO.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AeByAppIdDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AeByAppIdDAO.java
index 4916a62..3191713 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AeByAppIdDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/AeByAppIdDAO.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContainerByNameDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContainerByNameDAO.java
index bcccdaf..c88bbf1 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContainerByNameDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContainerByNameDAO.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContentInstanceDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContentInstanceDAO.java
index 12f2160..9421116 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContentInstanceDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/ContentInstanceDAO.java
@@ -1,9 +1,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/
  *
  * Contributors:
  *    BAREAU Cyrille <cyrille.bareau@orange.com>, 
diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/CreatedAnnouncedResourceEntityDao.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/CreatedAnnouncedResourceEntityDao.java
index 97f23c3..59b7997 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/CreatedAnnouncedResourceEntityDao.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/CreatedAnnouncedResourceEntityDao.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/DescContainerByParentDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/DescContainerByParentDAO.java
index 31301c4..e6cc185 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/DescContainerByParentDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/DescContainerByParentDAO.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/LabelEntityDao.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/LabelEntityDao.java
index 1268dba..0191e59 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/LabelEntityDao.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/LabelEntityDao.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/RemoteCSEByIdDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/RemoteCSEByIdDAO.java
index 50b0a92..6bde8c9 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/RemoteCSEByIdDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/RemoteCSEByIdDAO.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/UriMapperEntityDAO.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/UriMapperEntityDAO.java
index c8dd2a0..3827f7c 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/UriMapperEntityDAO.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/dao/UriMapperEntityDAO.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoChildLoader.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoChildLoader.java
index 3cc5545..6cbb3f6 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoChildLoader.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoChildLoader.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoResourceEntity.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoResourceEntity.java
index 74a76e5..8d53c8c 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoResourceEntity.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/MongoResourceEntity.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/ResourceSerializerDeserializer.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/ResourceSerializerDeserializer.java
index 8896b75..8ba5649 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/ResourceSerializerDeserializer.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/resource/ResourceSerializerDeserializer.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/AnnouncedResourceUtilImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/AnnouncedResourceUtilImpl.java
index 1d53d02..468d5bb 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/AnnouncedResourceUtilImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/AnnouncedResourceUtilImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/ComplexFindUtilImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/ComplexFindUtilImpl.java
index bce826e..42c7e52 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/ComplexFindUtilImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/ComplexFindUtilImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DBUtilManagerImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DBUtilManagerImpl.java
index 6294b08..7c1e892 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DBUtilManagerImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DBUtilManagerImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DynamicAuthorizationConsultationUtilImpl.java b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DynamicAuthorizationConsultationUtilImpl.java
index 3396e8a..b09237b 100644
--- a/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DynamicAuthorizationConsultationUtilImpl.java
+++ b/org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/util/DynamicAuthorizationConsultationUtilImpl.java
@@ -1,9 +1,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/

  *

  * Contributors:

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

diff --git a/org.eclipse.om2m.persistence.service/build.properties b/org.eclipse.om2m.persistence.service/build.properties
index 79f510d..9e9e8fa 100644
--- a/org.eclipse.om2m.persistence.service/build.properties
+++ b/org.eclipse.om2m.persistence.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.persistence.service/pom.xml b/org.eclipse.om2m.persistence.service/pom.xml
index bcee2a7..20effa1 100644
--- a/org.eclipse.om2m.persistence.service/pom.xml
+++ b/org.eclipse.om2m.persistence.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAO.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAO.java
index c274904..37a0b49 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAO.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAO.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAOFactory.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAOFactory.java
index 48acbf5..e310c87 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAOFactory.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DAOFactory.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBConstants.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBConstants.java
index cda2904..12088a6 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBConstants.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBConstants.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBService.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBService.java
index 867df43..0dbde20 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBService.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBService.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBTransaction.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBTransaction.java
index 1da86d8..0e30512 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBTransaction.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/DBTransaction.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/ComplexFindUtil.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/ComplexFindUtil.java
index a446fe3..6c8c9a0 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/ComplexFindUtil.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/ComplexFindUtil.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.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/DBUtilManager.java b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/DBUtilManager.java
index fd28cd3..634257b 100644
--- a/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/DBUtilManager.java
+++ b/org.eclipse.om2m.persistence.service/src/main/java/org/eclipse/om2m/persistence/service/util/DBUtilManager.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.sdt.comparator.xml/build.properties b/org.eclipse.om2m.sdt.comparator.xml/build.properties
index 40d9b62..ef701e1 100644
--- a/org.eclipse.om2m.sdt.comparator.xml/build.properties
+++ b/org.eclipse.om2m.sdt.comparator.xml/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.sdt.comparator.xml/src/main/java/org/eclipse/om2m/sdt/comparator/xml/Activator.java b/org.eclipse.om2m.sdt.comparator.xml/src/main/java/org/eclipse/om2m/sdt/comparator/xml/Activator.java
index 26a5085..3f868df 100644
--- a/org.eclipse.om2m.sdt.comparator.xml/src/main/java/org/eclipse/om2m/sdt/comparator/xml/Activator.java
+++ b/org.eclipse.om2m.sdt.comparator.xml/src/main/java/org/eclipse/om2m/sdt/comparator/xml/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.sdt/org.eclipse.om2m.sdt.api/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/build.properties
index 13fd7fb..3ddece0 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/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.sdt/org.eclipse.om2m.sdt.api/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/pom.xml
index bab5d0d..feccfaf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/pom.xml
@@ -2,9 +2,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/
  -->
 
 <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">
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Action.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Action.java
index 2ceab42..0701fa8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Action.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Action.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Arg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Arg.java
index 4a23e3c..94ee9ff 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Arg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Arg.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Constraint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Constraint.java
index 12360a5..83df78f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Constraint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Constraint.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/DataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/DataPoint.java
index 1833b18..604e535 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/DataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/DataPoint.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Device.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Device.java
index 563cf4c..aaa626c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Device.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Device.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Doc.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Doc.java
index 7d0ef34..7e365a1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Doc.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Doc.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Domain.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Domain.java
index b7a6ba4..34ea747 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Domain.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Domain.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Element.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Element.java
index eed5c6b..59535c3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Element.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Element.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Event.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Event.java
index 86ff8aa..75b497d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Event.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Event.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Extended.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Extended.java
index 4d3a501..5230b45 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Extended.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Extended.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Identifiers.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Identifiers.java
index ed8f924..3b3cc44 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Identifiers.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Identifiers.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Module.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Module.java
index 3b28bd0..830a004 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Module.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Module.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/ModuleClass.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/ModuleClass.java
index 92f6182..3da5eda 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/ModuleClass.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/ModuleClass.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Property.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Property.java
index 7d4826a..a004113 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Property.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Property.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/SubDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/SubDevice.java
index b3ec508..b0a6808 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/SubDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/SubDevice.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.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/AbstractDateArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/AbstractDateArg.java
index a1e591c..bc80403 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/AbstractDateArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/AbstractDateArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BlobArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BlobArg.java
index 47fb838..4830493 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BlobArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BlobArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BooleanArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BooleanArg.java
index 673b0f6..40ba9d6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BooleanArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/BooleanArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ByteArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ByteArg.java
index d0b6dcd..6cbf136 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ByteArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ByteArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/Command.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/Command.java
index 70a1b3c..6d6671e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/Command.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/Command.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateArg.java
index a90e9c4..9344dcf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateTimeArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateTimeArg.java
index 5ba17eb..c9ad85a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateTimeArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/DateTimeArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/FloatArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/FloatArg.java
index 6d63494..9583851 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/FloatArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/FloatArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/IntegerArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/IntegerArg.java
index 5dec277..6ab4976 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/IntegerArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/IntegerArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/StringArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/StringArg.java
index f854e00..9c4bf65 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/StringArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/StringArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/TimeArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/TimeArg.java
index b3d5f51..dce592b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/TimeArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/TimeArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ValuedArg.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ValuedArg.java
index 8afb802..f5a48c5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ValuedArg.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/args/ValuedArg.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.sdt.args;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/AbstractDateDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/AbstractDateDataPoint.java
index 9d04158..11e2a0a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/AbstractDateDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/AbstractDateDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ArrayDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ArrayDataPoint.java
index 07edb4b..7c429e8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ArrayDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ArrayDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BlobDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BlobDataPoint.java
index 2bd18d9..3ec03e7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BlobDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BlobDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BooleanDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BooleanDataPoint.java
index 1d80a20..38d22ea 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BooleanDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/BooleanDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ByteDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ByteDataPoint.java
index 2f05274..08d7175 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ByteDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ByteDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ClonedEnum.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ClonedEnum.java
index 559c41b..f219d8a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ClonedEnum.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ClonedEnum.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateDataPoint.java
index 201c2ac..1e613ae 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateTimeDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateTimeDataPoint.java
index 79115ec..0379676 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateTimeDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/DateTimeDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/EnumDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/EnumDataPoint.java
index f7e1a63..476431c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/EnumDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/EnumDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/FloatDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/FloatDataPoint.java
index 830870c..d277e2c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/FloatDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/FloatDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/IntegerDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/IntegerDataPoint.java
index 6d86420..5797700 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/IntegerDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/IntegerDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/StringDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/StringDataPoint.java
index 8bad178..0da6d9c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/StringDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/StringDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/TimeDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/TimeDataPoint.java
index 1dbb694..b007dcc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/TimeDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/TimeDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/UriDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/UriDataPoint.java
index 6573871..de53249 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/UriDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/UriDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ValuedDataPoint.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ValuedDataPoint.java
index 07db04c..a0abf69 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ValuedDataPoint.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ValuedDataPoint.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.sdt.datapoints;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTEventListener.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTEventListener.java
index fcc7245..c1648d0 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTEventListener.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTEventListener.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.sdt.events;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTNotification.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTNotification.java
index 1a3992b..0730a8a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTNotification.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/events/SDTNotification.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.sdt.events;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/AccessException.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/AccessException.java
index c272280..846d495 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/AccessException.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/AccessException.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.sdt.exceptions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ActionException.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ActionException.java
index f31af98..98309bf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ActionException.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ActionException.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.sdt.exceptions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/DataPointException.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/DataPointException.java
index e2422d5..f9de5ce 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/DataPointException.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/DataPointException.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.sdt.exceptions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ModuleException.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ModuleException.java
index e7a0bad..2819ce3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ModuleException.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/ModuleException.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.sdt.exceptions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/PropertyException.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/PropertyException.java
index ebf4a29..a4eb911 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/PropertyException.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/exceptions/PropertyException.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.sdt.exceptions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/rights/RightsManager.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/rights/RightsManager.java
index ac51f02..8a6c2d5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/rights/RightsManager.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/rights/RightsManager.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.sdt.rights;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Array.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Array.java
index 2a3a6bf..dbe9fd0 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Array.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Array.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.sdt.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/BasicType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/BasicType.java
index a39cbd3..617d2bd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/BasicType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/BasicType.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.sdt.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/DataType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/DataType.java
index 82194dd..0e2aae4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/DataType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/DataType.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.sdt.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/SimpleType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/SimpleType.java
index 02377f9..6d3566c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/SimpleType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/SimpleType.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.sdt.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Struct.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Struct.java
index 6e27c35..60837c3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Struct.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Struct.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.sdt.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Activator.java
index 21c108a..1809880 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Activator.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.sdt.utils;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Logger.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Logger.java
index 82c69cf..3e6af4c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Logger.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/utils/Logger.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.sdt.utils;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/build.properties
index 35c69df..1ecde26 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.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.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/pom.xml
index 263efb1..3a1c441 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/pom.xml
@@ -2,9 +2,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/

  -->

 

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/build.properties
index 0cdd2b6..7cc15b4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/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.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/pom.xml
index 2b0a1ef..2bc8195 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java
index 6c1a673..5ec4f67 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.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.sdt.home.monitoring;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/CredentialsServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/CredentialsServlet.java
index 61b77c5..f4a01a8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/CredentialsServlet.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/CredentialsServlet.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.sdt.home.monitoring.servlet;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/HomeServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/HomeServlet.java
index 70de43a..ff1acf9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/HomeServlet.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/HomeServlet.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2014 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/

  *

  * Contributors:

  *     Thierry Monteil (Project co-founder) - Management and initial specification,

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/InCseContextServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/InCseContextServlet.java
index 40e45af..7c475ce 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/InCseContextServlet.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/InCseContextServlet.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.sdt.home.monitoring.servlet;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java
index f340082..7d483f6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.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.sdt.home.monitoring.servlet;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LogoutServlet.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LogoutServlet.java
index 1700328..b44de0f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LogoutServlet.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LogoutServlet.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.sdt.home.monitoring.servlet;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AeRegistration.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AeRegistration.java
index 65562a5..e8ed022 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AeRegistration.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AeRegistration.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.sdt.home.monitoring.util;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AuthFillter.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AuthFillter.java
index 9fc74c8..e3907f7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AuthFillter.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AuthFillter.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.sdt.home.monitoring.util;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/Constants.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/Constants.java
index 2bbfe83..31cf6fc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/Constants.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/Constants.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.sdt.home.monitoring.util;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/FileUtil.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/FileUtil.java
index 242c0ce..52288c0 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/FileUtil.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/FileUtil.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.sdt.home.monitoring.util;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/ResourceDiscovery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/ResourceDiscovery.java
index ff34340..6384829 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/ResourceDiscovery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/ResourceDiscovery.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.sdt.home.monitoring.util;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/css/color_picker.css b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/css/color_picker.css
index d1c5c4c..5b6ae99 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/css/color_picker.css
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/css/color_picker.css
@@ -1,9 +1,9 @@
  /*******************************************************************************
  * Copyright (c) 2018, 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/
  *******************************************************************************/
 
  
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/color_picker.js b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/color_picker.js
index f750c91..c32d234 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/color_picker.js
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/color_picker.js
@@ -1,9 +1,9 @@
  /*******************************************************************************
  * Copyright (c) 2018, 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/
  *******************************************************************************/
 
 jQuery.fn.colorPicker = function (callback) {
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/login.html b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/login.html
index 3f10778..792cb44 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/login.html
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/login.html
@@ -2,9 +2,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/

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

  -->

 <!doctype html>

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/monitor.html b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/monitor.html
index 7dfdeb0..16f3619 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/monitor.html
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/monitor.html
@@ -2,9 +2,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/
  *******************************************************************************/
  -->
 <!doctype html>
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/pom.xml
index 1ed28e0..a2ef317 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/pom.xml
@@ -2,7 +2,7 @@
 <!-- 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 which accompanies this distribution, and is available 

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

+	at 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"

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/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.sdt/org.eclipse.om2m.sdt.home.cloud/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/pom.xml
index 5c5bb59..842ac90 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/Activator.java
index a50eee3..053f695 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/Activator.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.sdt.home.cloud;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/ResourceDiscovery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/ResourceDiscovery.java
index 6c75466..6ba48fc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/ResourceDiscovery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/ResourceDiscovery.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.sdt.home.cloud;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/SDTUtil.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/SDTUtil.java
index 65811f3..62dcd5c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/SDTUtil.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/SDTUtil.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.sdt.home.cloud;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/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.sdt/org.eclipse.om2m.sdt.home.driver/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/pom.xml
index 4ff4607..296753b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/pom.xml
@@ -2,9 +2,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/
  -->
 
 <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">
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Logger.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Logger.java
index 27a39c0..98404be 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Logger.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Logger.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.sdt.home.driver;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/PersistedDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/PersistedDevice.java
index a836554..7bb127c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/PersistedDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/PersistedDevice.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.sdt.home.driver;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Utils.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Utils.java
index 02c3f8c..58a2360 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Utils.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Utils.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.sdt.home.driver;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/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.sdt/org.eclipse.om2m.sdt.home.enocean/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/pom.xml
index 131eb72..43c2620 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/pom.xml
@@ -2,9 +2,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/

  -->
 
 <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">

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/Activator.java
index cdbeb3b..6bfc7b3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/Activator.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.sdt.home.enocean;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOFloodDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOFloodDetector.java
index 7327505..f0de9a6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOFloodDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOFloodDetector.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.sdt.home.enocean;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLight.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLight.java
index 6f204fa..64d902d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLight.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLight.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.sdt.home.enocean;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLightBlindControl.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLightBlindControl.java
index 20b0a89..3a79c90 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLightBlindControl.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLightBlindControl.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.sdt.home.enocean;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOSmokeDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOSmokeDetector.java
index fbe82b3..15584aa 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOSmokeDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOSmokeDetector.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.sdt.home.enocean;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOWaterValve.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOWaterValve.java
index ab26f19..a9e76a9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOWaterValve.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOWaterValve.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.sdt.home.enocean;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/resources/OSGI-INF/component-devices.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/resources/OSGI-INF/component-devices.xml
index 4ae3a7b..ac0cdc9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/resources/OSGI-INF/component-devices.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/resources/OSGI-INF/component-devices.xml
@@ -2,9 +2,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/
  -->
 
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0"
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/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.sdt/org.eclipse.om2m.sdt.home.hue/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/pom.xml
index 2f97b78..6f5c8f1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/pom.xml
@@ -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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/Activator.java
index e7207e4..11d385e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/Activator.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/HomeLight.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/HomeLight.java
index a77c813..3449f0c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/HomeLight.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/HomeLight.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/build.properties
index 940bbe7..add29d7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/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.sdt/org.eclipse.om2m.sdt.home.lifx/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/pom.xml
index 388c144..38f6d6a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/pom.xml
@@ -2,9 +2,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/ 

 	* 

 	* Contributors: 

 	* Gregory BONNARDEL (Thales), Cyrille Bareau. 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDevice.java
index 4800ad1..9c4dbb7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDevice.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.sdt.home.lifx;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDiscoveredDeviceListener.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDiscoveredDeviceListener.java
index 709380d..d9bc032 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDiscoveredDeviceListener.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDiscoveredDeviceListener.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.sdt.home.lifx;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Activator.java
index 4596f5b..4e0d4bf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Activator.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.sdt.home.lifx.impl;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Discovery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Discovery.java
index 1d4a48d..923cb48 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Discovery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Discovery.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.sdt.home.lifx.impl;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Logger.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Logger.java
index bbcb391..80fc106 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Logger.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/Logger.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.sdt.home.lifx.impl;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/DiscoveryCloud.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/DiscoveryCloud.java
index c71e89b..a15ae49 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/DiscoveryCloud.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/DiscoveryCloud.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.sdt.home.lifx.impl.cloud;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/LIFXDeviceCloud.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/LIFXDeviceCloud.java
index 152bda8..acb7e73 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/LIFXDeviceCloud.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/LIFXDeviceCloud.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.sdt.home.lifx.impl.cloud;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/DiscoveryLan.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/DiscoveryLan.java
index 022c4bc..0f4f26c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/DiscoveryLan.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/DiscoveryLan.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.sdt.home.lifx.impl.lan;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/LIFXDeviceLan.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/LIFXDeviceLan.java
index 722d88f..c8f37c8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/LIFXDeviceLan.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/LIFXDeviceLan.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.sdt.home.lifx.impl.lan;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/Server.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/Server.java
index 9438f46..d9776da 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/Server.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/Server.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.sdt.home.lifx.impl.lan;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrame.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrame.java
index 511509b..9567653 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrame.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrame.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrameAddress.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrameAddress.java
index 847d632..fa78d33 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrameAddress.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXFrameAddress.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXGlobalFrame.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXGlobalFrame.java
index 2229ebb..a9e617b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXGlobalFrame.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXGlobalFrame.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayload.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayload.java
index e1cadea..d922e01 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayload.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayload.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadAcknowkledgement.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadAcknowkledgement.java
index bbb7945..230d696 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadAcknowkledgement.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadAcknowkledgement.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadFactory.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadFactory.java
index 1a3546a..f848fab 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadFactory.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadFactory.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadGetPower.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadGetPower.java
index e2b377d..9a0d00f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadGetPower.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadGetPower.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetColor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetColor.java
index f8a2a0c..d1f2d0a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetColor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetColor.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetPower.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetPower.java
index 05466e3..e722322 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetPower.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadSetPower.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadState.java
index 008e51d..c9ff33a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadState.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStatePower.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStatePower.java
index 5dc3590..ef28418 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStatePower.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStatePower.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStateService.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStateService.java
index e2b25c9..0851069 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStateService.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXPayloadStateService.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXProtocolHeader.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXProtocolHeader.java
index 1e2d8dd..afbb2c7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXProtocolHeader.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/frame/LIFXProtocolHeader.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.sdt.home.lifx.impl.lan.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDeviceListener.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDeviceListener.java
index aaf8f40..ad2e268 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDeviceListener.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDeviceListener.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.sdt.home.lifx.listener;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDiscoveryListener.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDiscoveryListener.java
index 4a46f82..e788069 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDiscoveryListener.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/listener/LIFXDiscoveryListener.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.sdt.home.lifx.listener;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDevice.java
index fe0515c..c0c9a97 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDevice.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.sdt.home.lifx.sdt;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/DiscoveryTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/DiscoveryTest.java
index f972517..484fe76 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/DiscoveryTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/DiscoveryTest.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.sdt.home.lifx;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/IPTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/IPTest.java
index ef40779..b98ea98 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/IPTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/IPTest.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.sdt.home.lifx;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/DiscoveryCloudTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/DiscoveryCloudTest.java
index 6248af2..dd98105 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/DiscoveryCloudTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/DiscoveryCloudTest.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.sdt.home.lifx.cloud;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/ListDeviceTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/ListDeviceTest.java
index d7c18b1..671a912 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/ListDeviceTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/cloud/ListDeviceTest.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.sdt.home.lifx.cloud;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameAddressTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameAddressTest.java
index c2cfaaa..e45646d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameAddressTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameAddressTest.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.sdt.home.lifx.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameTest.java
index c303a83..f8e485a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXFrameTest.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.sdt.home.lifx.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXGlobalFrameTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXGlobalFrameTest.java
index 38a23e9..a185f2c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXGlobalFrameTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/frame/LIFXGlobalFrameTest.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.sdt.home.lifx.frame;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDeviceTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDeviceTest.java
index 682d913..e05e6dc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDeviceTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/test/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDeviceTest.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.sdt.home.lifx.sdt;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/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.sdt/org.eclipse.om2m.sdt.home.mocked.devices/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/pom.xml
index 9f64353..2d76d6d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/pom.xml
@@ -2,9 +2,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/

  -->
 
 <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">

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/Activator.java
index 0efe694..dc719e5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/Activator.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.sdt.home.mocked.devices;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedCamera.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedCamera.java
index d7cbb82..f4559a3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedCamera.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedCamera.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedDoor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedDoor.java
index 9e88dc7..bff69c4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedDoor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedDoor.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedFloodDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedFloodDetector.java
index fad5b8e..7dd1d01 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedFloodDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedFloodDetector.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedKettle.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedKettle.java
index 2126df7..a30d653 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedKettle.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedKettle.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedLight.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedLight.java
index bae73ab..d425bd3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedLight.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedLight.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.sdt.home.mocked.devices;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmartElectricMeter.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmartElectricMeter.java
index 75d40e0..bfdce69 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmartElectricMeter.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmartElectricMeter.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.sdt.home.mocked.devices;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmokeDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmokeDetector.java
index 1d4c97a..c37a181 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmokeDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmokeDetector.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSwitch.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSwitch.java
index 361ffb8..972bfc1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSwitch.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSwitch.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermometer.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermometer.java
index 50b7214..8129d1c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermometer.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermometer.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermostat.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermostat.java
index 88a6e83..6194510 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermostat.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermostat.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWarningDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWarningDevice.java
index 546e0f9..c716873 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWarningDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWarningDevice.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.sdt.home.mocked.devices;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWaterValve.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWaterValve.java
index cda7f5a..0be2c9f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWaterValve.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWaterValve.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWeatherStation.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWeatherStation.java
index 2e6d792..448adf6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWeatherStation.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWeatherStation.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.sdt.home.mocked.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedAlarmSpeaker.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedAlarmSpeaker.java
index 2e3c975..3f3abe0 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedAlarmSpeaker.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedAlarmSpeaker.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBattery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBattery.java
index cc25122..77e51be 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBattery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBattery.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.sdt.home.mocked.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBinarySwitch.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBinarySwitch.java
index 679b68d..af3db60 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBinarySwitch.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedBinarySwitch.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedClock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedClock.java
index a2d084d..56ae4d1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedClock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedClock.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedColour.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedColour.java
index c14377e..fd57e42 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedColour.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedColour.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedDoorStatus.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedDoorStatus.java
index 60731b9..2ed3912 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedDoorStatus.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedDoorStatus.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.sdt.home.mocked.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyConsumption.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyConsumption.java
index 075afcd..b37a617 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyConsumption.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyConsumption.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyGeneration.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyGeneration.java
index 1514460..8a1898e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyGeneration.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedEnergyGeneration.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedFaultDetection.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedFaultDetection.java
index 1bce141..8c4bc0c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedFaultDetection.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedFaultDetection.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.sdt.home.mocked.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedLock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedLock.java
index ddde47d..da5c19e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedLock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedLock.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.sdt.home.mocked.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedRunState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedRunState.java
index 5c70a61..a3bc1fd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedRunState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedRunState.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.sdt.home.mocked.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedSessionDescription.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedSessionDescription.java
index 9d80202..0301bcf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedSessionDescription.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedSessionDescription.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.sdt.home.mocked.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java
index f223d1b..c015424 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.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.sdt.home.mocked.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/build.properties
index b6d31b3..097fc32 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/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.sdt/org.eclipse.om2m.sdt.home.netatmo/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/pom.xml
index 5c05934..f173e23 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/pom.xml
@@ -3,7 +3,7 @@
 	* 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 * which accompanies this distribution, and is available 
-	at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Grégory 
+	at * https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Grégory 
 	BONNARDEL (Thales), Cyrille Bareau. ******************************************************************************* -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Activator.java
index 5be819d..ccbf882 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Activator.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.sdt.home.netatmo.impl;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Discovery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Discovery.java
index 4b805b1..41c4087 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Discovery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Discovery.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.sdt.home.netatmo.impl;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Server.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Server.java
index 795798e..393e655 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Server.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/impl/Server.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.sdt.home.netatmo.impl;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/DetectedPerson.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/DetectedPerson.java
index 1aa75ca..df6078e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/DetectedPerson.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/DetectedPerson.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Event.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Event.java
index a28a4f0..5688d54 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Event.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Event.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Home.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Home.java
index b7af85c..47ac993 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Home.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Home.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/HomeListener.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/HomeListener.java
index 05a4f73..1c321ed 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/HomeListener.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/HomeListener.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Person.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Person.java
index 60fb17c..26b5d29 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Person.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Person.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Token.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Token.java
index f5e9f70..738203c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Token.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Token.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStation.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStation.java
index d9dcb08..6ccbd13 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStation.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStation.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStationModule.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStationModule.java
index 92aa383..b84705b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStationModule.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WeatherStationModule.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WelcomeCamera.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WelcomeCamera.java
index ac2537a..6ecb496 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WelcomeCamera.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WelcomeCamera.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.sdt.home.netatmo.model;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWeatherStation.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWeatherStation.java
index 60b001a..87bf2fe 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWeatherStation.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWeatherStation.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.sdt.home.netatmo.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDevice.java
index 1d87a6f..3b45402 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDevice.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.sdt.home.netatmo.sdt;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/DiscoveryTestCase.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/DiscoveryTestCase.java
index 652a566..f3f4d7e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/DiscoveryTestCase.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/DiscoveryTestCase.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.sdt.home.netatmo.impl;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/TestConnection.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/TestConnection.java
index 61e9236..bc0660d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/TestConnection.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/impl/TestConnection.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.sdt.home.netatmo.impl;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDeviceTestCase.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDeviceTestCase.java
index 431f029..00ff788 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDeviceTestCase.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDeviceTestCase.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.sdt.home.netatmo.sdt;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/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.sdt/org.eclipse.om2m.sdt.home.smartercoffee/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/pom.xml
index 96731ac..69256bc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/Activator.java
index 8aab60a..3382f35 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/Activator.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.sdt.home.smartercoffee;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/SmarterCoffeeMachine.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/SmarterCoffeeMachine.java
index b861882..78ddb66 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/SmarterCoffeeMachine.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/SmarterCoffeeMachine.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.sdt.home.smartercoffee;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommands.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommands.java
index 28acae1..004a5bd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommands.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommands.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.sdt.home.smartercoffee.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommunication.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommunication.java
index a9688a5..1e9d556 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommunication.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommunication.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.sdt.home.smartercoffee.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatus.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatus.java
index eb030dc..5a010a8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatus.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatus.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.sdt.home.smartercoffee.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatusDescriptor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatusDescriptor.java
index 4b60159..b15125a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatusDescriptor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatusDescriptor.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.sdt.home.smartercoffee.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/TCPConnection.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/TCPConnection.java
index 1006cf8..426e908 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/TCPConnection.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/TCPConnection.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.sdt.home.smartercoffee.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/test/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmartCoffeeCommunicationTest.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/test/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmartCoffeeCommunicationTest.java
index bca7a34..de7d9db 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/test/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmartCoffeeCommunicationTest.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/test/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmartCoffeeCommunicationTest.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.sdt.home.smartercoffee.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/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.sdt/org.eclipse.om2m.sdt.home.smarterkettle/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/pom.xml
index 2de967a..114a64b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/Activator.java
index e0939b9..bfe717c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/Activator.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.sdt.home.smarterkettle;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java
index 0b34953..cf1d5e7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.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.sdt.home.smarterkettle;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommands.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommands.java
index 603b6be..b3ed998 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommands.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommands.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.sdt.home.smarterkettle.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommunication.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommunication.java
index 23e441a..668271b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommunication.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommunication.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.sdt.home.smarterkettle.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleMain.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleMain.java
index 8dca69f..185acb8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleMain.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleMain.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.sdt.home.smarterkettle.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatus.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatus.java
index 3e3f77e..40ebcd2 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatus.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatus.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.sdt.home.smarterkettle.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatusDescriptor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatusDescriptor.java
index 6d7faa8..c4b8c6f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatusDescriptor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatusDescriptor.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.sdt.home.smarterkettle.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/TCPConnection.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/TCPConnection.java
index 74fe97b..eadba90 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/TCPConnection.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/TCPConnection.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.sdt.home.smarterkettle.communication;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/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.sdt/org.eclipse.om2m.sdt.home.tester/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/pom.xml
index da30df7..17cd4e7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/pom.xml
@@ -2,9 +2,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/

  -->
 
 <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">

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Activator.java
index 2286e6b..bed54d7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Activator.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.sdt.home.tester;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Logger.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Logger.java
index 10894d1..a5dfbfe 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Logger.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Logger.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.sdt.home.tester;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/resources/OSGI-INF/component-devices.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/resources/OSGI-INF/component-devices.xml
index a593b82..4a3a8d1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/resources/OSGI-INF/component-devices.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/resources/OSGI-INF/component-devices.xml
@@ -2,9 +2,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/
  -->
 
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0"
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.thekeys/src/main/java/org/eclipse/om2m/sdt/home/thekeys/ADoorLock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.thekeys/src/main/java/org/eclipse/om2m/sdt/home/thekeys/ADoorLock.java
index 92b2407..3939fe0 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.thekeys/src/main/java/org/eclipse/om2m/sdt/home/thekeys/ADoorLock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.thekeys/src/main/java/org/eclipse/om2m/sdt/home/thekeys/ADoorLock.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.sdt.home.thekeys;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/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.sdt/org.eclipse.om2m.sdt.home.utils/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/pom.xml
index fa07554..d90a4a1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/pom.xml
@@ -2,9 +2,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/
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.java
index 7dd69fa..d7cb771 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.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.sdt.home.utils;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTDiscovery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTDiscovery.java
index d58ef24..465efb8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTDiscovery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTDiscovery.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.sdt.home.utils;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTUtil.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTUtil.java
index d8cde17..d101873 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTUtil.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTUtil.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.sdt.home.utils;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/build.properties b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/build.properties
index 4e9b649..9050bc5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/build.properties
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/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.sdt/org.eclipse.om2m.sdt.home/pom.xml b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/pom.xml
index 114904c..94cbcf7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/pom.xml
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/pom.xml
@@ -2,9 +2,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/
  -->
 
 <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">
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/HomeDomain.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/HomeDomain.java
index d59d86f..93e915d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/HomeDomain.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/HomeDomain.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.sdt.home;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DecrementNumberValue.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DecrementNumberValue.java
index 92df066..74bbab9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DecrementNumberValue.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DecrementNumberValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Deutsche Telekom.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DownVolume.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DownVolume.java
index 677bc01..f6577c6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DownVolume.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/DownVolume.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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/IncrementNumberValue.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/IncrementNumberValue.java
index c47d366..e95ce6d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/IncrementNumberValue.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/IncrementNumberValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Deutsche Telekom.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/NextTrack.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/NextTrack.java
index ff91b0f..59fe520 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/NextTrack.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/NextTrack.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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/PreviousTrack.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/PreviousTrack.java
index 7af4f55..319b196 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/PreviousTrack.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/PreviousTrack.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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/ResetNumberValue.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/ResetNumberValue.java
index a4bd17b..0f7254d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/ResetNumberValue.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/ResetNumberValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Deutsche Telekom.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/Toggle.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/Toggle.java
index d770d0e..6a4c783 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/Toggle.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/Toggle.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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/UpVolume.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/UpVolume.java
index d239414..3945245 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/UpVolume.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/UpVolume.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.sdt.home.actions;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/AirQualityMonitor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/AirQualityMonitor.java
index cbcce30..055f8dd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/AirQualityMonitor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/AirQualityMonitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 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/
  *******************************************************************************/
 package org.eclipse.om2m.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Camera.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Camera.java
index 20e7885..9693e7f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Camera.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Camera.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/CoffeeMachine.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/CoffeeMachine.java
index 758123a..7fa0778 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/CoffeeMachine.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/CoffeeMachine.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.sdt.home.devices;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/ContactDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/ContactDetector.java
index 614c3de..6a66fc3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/ContactDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/ContactDetector.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Door.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Door.java
index c2e2951..f7885a4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Door.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Door.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/FloodDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/FloodDetector.java
index 596a4dc..8e024a3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/FloodDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/FloodDetector.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GasValve.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GasValve.java
index 41713d6..6a6c382 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GasValve.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GasValve.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericActuator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericActuator.java
index 17b6e13..0dda974 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericActuator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericActuator.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericDevice.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericDevice.java
index 4cf11e7..a2adc21 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericDevice.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericDevice.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericSensor.java
index 8a31883..f516257 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericSensor.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/HomeCCTV.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/HomeCCTV.java
index b1dabf5..f636c50 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/HomeCCTV.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/HomeCCTV.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Kettle.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Kettle.java
index b339f29..f256daa 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Kettle.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Kettle.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.sdt.home.devices;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Light.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Light.java
index 9297379..20eee7d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Light.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Light.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/MotionDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/MotionDetector.java
index 859c4cd..c6f18ad 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/MotionDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/MotionDetector.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmartElectricMeter.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmartElectricMeter.java
index 76a5298..50fa391 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmartElectricMeter.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmartElectricMeter.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmokeDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmokeDetector.java
index c7fff55..1041c26 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmokeDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmokeDetector.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Switch.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Switch.java
index 246ebb6..b34fb44 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Switch.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Switch.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/TemperatureDetector.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/TemperatureDetector.java
index 0a68f68..6f766d4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/TemperatureDetector.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/TemperatureDetector.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Thermostat.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Thermostat.java
index a2d3830..cf558ee 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Thermostat.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Thermostat.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Warning.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Warning.java
index f03ff3f..b6281c8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Warning.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Warning.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterHeater.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterHeater.java
index 49ad4e5..0f0c9a7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterHeater.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterHeater.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterValve.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterValve.java
index 2c17ad7..2dd7c40 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterValve.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterValve.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WeatherStation.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WeatherStation.java
index 51c0891..752cc87 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WeatherStation.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WeatherStation.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.sdt.home.devices;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java
index 2db185c..f0466d6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AcousticSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AcousticSensor.java
index e2b32de..ea95210 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AcousticSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AcousticSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AirQualitySensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AirQualitySensor.java
index 8606e88..6ae6995 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AirQualitySensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AirQualitySensor.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.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java
index cfaf77f..b6864ec 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Anemometer.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Anemometer.java
index af26463..dd73510 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Anemometer.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Anemometer.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java
index d6329f2..6c1bfb2 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Barometer.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Barometer.java
index f325039..9be8365 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Barometer.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Barometer.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Battery.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Battery.java
index a07bae8..4a02727 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Battery.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Battery.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java
index c859a43..820bf08 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java
index e0293ba..609af3c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java
index d14ee3b..faa6f7c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java
index 89a594d..41c356d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java
index a9781b1..fc5c673 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java
index dffa5ac..b70858d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ContactSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ContactSensor.java
index 481bdb4..86ee9ae 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ContactSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ContactSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Credentials.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Credentials.java
index 9f03130..28297f1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Credentials.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Credentials.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java
index 8255cd4..26ab940 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java
index 96454b2..f16e2b4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyGeneration.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyGeneration.java
index 0623f51..5bb2e62 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyGeneration.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyGeneration.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java
index 820f033..0a42b33 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java
index dc10d6a..1cb4f42 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.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.sdt.home.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java
index e9a19ba..22a1cef 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java
index d9e2aa4..785aac3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.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.sdt.home.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java
index e1f3d2e..e990b40 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/KeepWarm.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/KeepWarm.java
index dedb553..99c1050 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/KeepWarm.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/KeepWarm.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.sdt.home.modules;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java
index e8f1cae..9dccc54 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java
index b2991f8..4a3fad4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/MotionSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/MotionSensor.java
index cde75e5..be800cd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/MotionSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/MotionSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/NumberValue.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/NumberValue.java
index 7914ab8..01e5664 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/NumberValue.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/NumberValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Deutsche Telekom.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * 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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java
index 3d5f71c..1d41fd4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PlayerControl.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PlayerControl.java
index 7e00cff..654c6d6 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PlayerControl.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PlayerControl.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java
index 5eef4ec..5e81d51 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java
index 05197a3..6c1567d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java
index 4c5ac6b..32ca616 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SessionDescription.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SessionDescription.java
index 0babd1d..3156e54 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SessionDescription.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SessionDescription.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SmokeSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SmokeSensor.java
index 8b0b9e1..50a97fe 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SmokeSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SmokeSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java
index 4e6d65c..fcb5af9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/TemperatureAlarm.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/TemperatureAlarm.java
index 9f0a19e..ad92089 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/TemperatureAlarm.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/TemperatureAlarm.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Timer.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Timer.java
index 66f4c39..89938db 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Timer.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Timer.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/UvSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/UvSensor.java
index e1cb250..c1ed50b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/UvSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/UvSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/WaterSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/WaterSensor.java
index 7ac2dd6..7d5654f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/WaterSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/WaterSensor.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.sdt.home.modules;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ActionType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ActionType.java
index 3d6ef3f..edb3a1e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ActionType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ActionType.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.sdt.home.types;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/AlertColourCode.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/AlertColourCode.java
index fb820cb..6f8768b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/AlertColourCode.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/AlertColourCode.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DatapointType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DatapointType.java
index f1d131d..d04aa3c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DatapointType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DeviceType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DeviceType.java
index 2f34d44..11d61a2 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DeviceType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DeviceType.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DoorState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DoorState.java
index a7978a0..996060d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DoorState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DoorState.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/FoamStrength.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/FoamStrength.java
index e41de91..91f5c7f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/FoamStrength.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/FoamStrength.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.sdt.home.types;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrainsLevel.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrainsLevel.java
index 3535501..9ae3a5d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrainsLevel.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrainsLevel.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrindCoarseness.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrindCoarseness.java
index 7abf8df..141853a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrindCoarseness.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrindCoarseness.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeBasicType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeBasicType.java
index 40017b1..3b32b69 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeBasicType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeBasicType.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeDataType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeDataType.java
index 8375e05..fc793a8 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeDataType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeDataType.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeSimpleType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeSimpleType.java
index 3116991..2180e45 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeSimpleType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeSimpleType.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/JobState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/JobState.java
index e6f7e79..3e20e34 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/JobState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/JobState.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/LiquidLevel.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/LiquidLevel.java
index b49bda0..72e97fa 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/LiquidLevel.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/LiquidLevel.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java
index 0bfe22e..fd76f3d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ModuleType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ModuleType.java
index 862942f..92d84a1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ModuleType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ModuleType.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PlayerMode.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PlayerMode.java
index fa5064c..6d1d4be 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PlayerMode.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PlayerMode.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PropertyType.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PropertyType.java
index 1506d03..b5c8684 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PropertyType.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PropertyType.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SpinLevel.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SpinLevel.java
index cdab319..e631b7d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SpinLevel.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SpinLevel.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SupportedMediaSources.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SupportedMediaSources.java
index 089b266..30ea55a 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SupportedMediaSources.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SupportedMediaSources.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/TasteStrength.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/TasteStrength.java
index c8d094c..4938bf1 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/TasteStrength.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/TasteStrength.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.sdt.home.types;

 

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/Tone.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/Tone.java
index 37f955f..5d9b89c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/Tone.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/Tone.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/UvStatus.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/UvStatus.java
index cad6036..0f85b99 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/UvStatus.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/UvStatus.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.sdt.home.types;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.java
index df265f9..86cba16 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Activator.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.sdt.home.utils;
 
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Logger.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Logger.java
index da2c7e4..71e16b2 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Logger.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/utils/Logger.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.sdt.home.utils;
 
diff --git a/org.eclipse.om2m.sdt/pom.xml b/org.eclipse.om2m.sdt/pom.xml
index 907d1e0..f4eec13 100644
--- a/org.eclipse.om2m.sdt/pom.xml
+++ b/org.eclipse.om2m.sdt/pom.xml
@@ -2,7 +2,7 @@
 <!-- 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 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html -->
+	at 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">
diff --git a/org.eclipse.om2m.site.asn-cse/category.xml b/org.eclipse.om2m.site.asn-cse/category.xml
index 2a6de98..03f1178 100644
--- a/org.eclipse.om2m.site.asn-cse/category.xml
+++ b/org.eclipse.om2m.site.asn-cse/category.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-    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.site.asn-cse/pom.xml b/org.eclipse.om2m.site.asn-cse/pom.xml
index 541bb22..d4a8a21 100644
--- a/org.eclipse.om2m.site.asn-cse/pom.xml
+++ b/org.eclipse.om2m.site.asn-cse/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-    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.site.in-cse/Dockerfile b/org.eclipse.om2m.site.in-cse/Dockerfile
index a9bfd53..1dc3b19 100644
--- a/org.eclipse.om2m.site.in-cse/Dockerfile
+++ b/org.eclipse.om2m.site.in-cse/Dockerfile
@@ -1,13 +1,13 @@
 #******************************************************************************* 
 # 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/ 
 #
 # Contributors: 
-#       Sébastien BOLLE (Orange),
-#       Grégory BONNARDEL (Thales for Orange), 
+#       S�bastien BOLLE (Orange),
+#       Gr�gory BONNARDEL (Thales for Orange), 
 #       Cyrille Bareau (Orange). 
 #*******************************************************************************
 
diff --git a/org.eclipse.om2m.site.in-cse/category.xml b/org.eclipse.om2m.site.in-cse/category.xml
index 2a6de98..03f1178 100644
--- a/org.eclipse.om2m.site.in-cse/category.xml
+++ b/org.eclipse.om2m.site.in-cse/category.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-    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.site.in-cse/libs/pax-confman-propsloader-0.2.3.jar b/org.eclipse.om2m.site.in-cse/libs/pax-confman-propsloader-0.2.3.jar
new file mode 100644
index 0000000..d71bead
--- /dev/null
+++ b/org.eclipse.om2m.site.in-cse/libs/pax-confman-propsloader-0.2.3.jar
Binary files differ
diff --git a/org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jar b/org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jar
deleted file mode 100644
index 54bc8ae..0000000
--- a/org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.om2m.site.in-cse/pom.xml b/org.eclipse.om2m.site.in-cse/pom.xml
index e26ee69..9e891e7 100644
--- a/org.eclipse.om2m.site.in-cse/pom.xml
+++ b/org.eclipse.om2m.site.in-cse/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-    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

@@ -72,10 +72,13 @@
 									todir="${basedir}/target/products/in-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/configurations">

 									<fileset dir="${basedir}/configurations" includes="**/*" />

 								</copy>

+								<copy file="${basedir}/libs/pax-confman-propsloader-0.2.3.jar"

+									todir="${basedir}/target/products/in-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/plugins/" />

+								

 								<propertyfile

 									file="${basedir}/target/products/in-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/configuration/config.ini">

 									<entry key="osgi.bundles" type="string" operation="+"

-										value=", reference:file:pax-confman-propsloader-0.2.2.jar@1:start" />

+										value=", reference:file:pax-confman-propsloader-0.2.3.jar@1:start" />

 								</propertyfile>

 							</tasks>

 						</configuration>

diff --git a/org.eclipse.om2m.site.mn-cse/Dockerfile b/org.eclipse.om2m.site.mn-cse/Dockerfile
index 5b744ca..3fe28ed 100644
--- a/org.eclipse.om2m.site.mn-cse/Dockerfile
+++ b/org.eclipse.om2m.site.mn-cse/Dockerfile
@@ -1,13 +1,13 @@
 #******************************************************************************* 
 # 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/ 
 #
 # Contributors: 
-#       Sébastien BOLLE (Orange),
-#       Grégory BONNARDEL (Thales for Orange), 
+#       S�bastien BOLLE (Orange),
+#       Gr�gory BONNARDEL (Thales for Orange), 
 #       Cyrille Bareau (Orange). 
 #*******************************************************************************
 
diff --git a/org.eclipse.om2m.site.mn-cse/category.xml b/org.eclipse.om2m.site.mn-cse/category.xml
index f2dac24..0476b62 100644
--- a/org.eclipse.om2m.site.mn-cse/category.xml
+++ b/org.eclipse.om2m.site.mn-cse/category.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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.site.mn-cse/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar b/org.eclipse.om2m.site.mn-cse/libs/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar
similarity index 100%
rename from org.eclipse.om2m.site.mn-cse/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar
rename to org.eclipse.om2m.site.mn-cse/libs/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar
Binary files differ
diff --git a/org.eclipse.om2m.site.mn-cse/libs/pax-confman-propsloader-0.2.3.jar b/org.eclipse.om2m.site.mn-cse/libs/pax-confman-propsloader-0.2.3.jar
new file mode 100644
index 0000000..d71bead
--- /dev/null
+++ b/org.eclipse.om2m.site.mn-cse/libs/pax-confman-propsloader-0.2.3.jar
Binary files differ
diff --git a/org.eclipse.om2m.site.mn-cse/pax-confman-propsloader-0.2.2.jar b/org.eclipse.om2m.site.mn-cse/pax-confman-propsloader-0.2.2.jar
deleted file mode 100644
index 54bc8ae..0000000
--- a/org.eclipse.om2m.site.mn-cse/pax-confman-propsloader-0.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.om2m.site.mn-cse/pom.xml b/org.eclipse.om2m.site.mn-cse/pom.xml
index 4cc3c16..a663e96 100644
--- a/org.eclipse.om2m.site.mn-cse/pom.xml
+++ b/org.eclipse.om2m.site.mn-cse/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
@@ -66,12 +66,12 @@
 								<copy file="${basedir}/script"
 									tofile="${basedir}/target/products/mn-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/start.bat" />
 								<copy file="${basedir}/log4j.configuration"
-									tofile="${basedir}/target/products/mn-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/log4j.configuration" />
-								<!-- <copy file="${basedir}/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar" 
+									tofile="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/log4j.configuration" />
+								<!-- <copy file="${basedir}/libs/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar" 
 									todir="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/plugins/" 
 									/> -->
-								<copy file="${basedir}/pax-confman-propsloader-0.2.2.jar"
-									todir="${basedir}/target/products/mn-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/plugins/" />
+								<copy file="${basedir}/libs/pax-confman-propsloader-0.2.3.jar"
+									todir="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/plugins/" />
 								<copy
 									todir="${basedir}/target/products/mn-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/configurations">
 									<fileset dir="${basedir}/configurations" includes="**/*" />
@@ -81,7 +81,7 @@
 								<propertyfile
 									file="${basedir}/target/products/mn-cse/${tycho.env.osgi.os}/${tycho.env.osgi.ws}/${tycho.env.osgi.arch}/configuration/config.ini">
 									<entry key="osgi.bundles" type="string" operation="+"
-										value=", reference:file:pax-confman-propsloader-0.2.2.jar@1:start" />
+										value=", reference:file:pax-confman-propsloader-0.2.3.jar@1:start" />
 								</propertyfile>
 							</target>
 						</configuration>
diff --git a/org.eclipse.om2m.testsuite.flexcontainer/build.properties b/org.eclipse.om2m.testsuite.flexcontainer/build.properties
index 3b1ab3b..f019754 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/build.properties
+++ b/org.eclipse.om2m.testsuite.flexcontainer/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.testsuite.flexcontainer/pom.xml b/org.eclipse.om2m.testsuite.flexcontainer/pom.xml
index d0ad90b..d27e5ac 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/pom.xml
+++ b/org.eclipse.om2m.testsuite.flexcontainer/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.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AccessControlPolicyTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AccessControlPolicyTest.java
index 888314c..691e47c 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AccessControlPolicyTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AccessControlPolicyTest.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.testsuite.flexcontainer;
 
diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/Activator.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/Activator.java
index 2513a06..b1e47f7 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/Activator.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/Activator.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AlarmSpeakerFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AlarmSpeakerFlexContainerTest.java
index cc51f15..03e9c55 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AlarmSpeakerFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AlarmSpeakerFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/BinarySwitchFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/BinarySwitchFlexContainerTest.java
index a74d872..6544c06 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/BinarySwitchFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/BinarySwitchFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/CallbackTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/CallbackTest.java
index f6ba5d6..6adbed3 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/CallbackTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/CallbackTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/EnergyConsumptionFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/EnergyConsumptionFlexContainerTest.java
index aa2b16d..fb7671d 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/EnergyConsumptionFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/EnergyConsumptionFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FaultDetectionFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FaultDetectionFlexContainerTest.java
index 27223ba..822403e 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FaultDetectionFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FaultDetectionFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FlexContainerTestSuite.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FlexContainerTestSuite.java
index 250ceba..d32698d 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FlexContainerTestSuite.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FlexContainerTestSuite.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FloodDetectorFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FloodDetectorFlexContainerTest.java
index 8b8a95e..b2edc4c 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FloodDetectorFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FloodDetectorFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/GasValveFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/GasValveFlexContainerTest.java
index fdb42ab..b34e4ab 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/GasValveFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/GasValveFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightDeviceFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightDeviceFlexContainerTest.java
index bbfcff1..7aa6008 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightDeviceFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightDeviceFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightFlexContainerTest.java
index 3baaec9..d3ebf62 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LocationFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LocationFlexContainerTest.java
index f00e459..9238bcf 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LocationFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LocationFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/RunStateFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/RunStateFlexContainerTest.java
index 79c9955..9773d7a 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/RunStateFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/RunStateFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmartElectricMeterFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmartElectricMeterFlexContainerTest.java
index 8beacc3..7c95fee 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmartElectricMeterFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmartElectricMeterFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmokeDetectorFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmokeDetectorFlexContainerTest.java
index 848b7af..ae438e6 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmokeDetectorFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmokeDetectorFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionServlet.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionServlet.java
index 8946be3..fef2d63 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionServlet.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionServlet.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionTest.java
index 4c33e95..6e3c7c6 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/TestReport.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/TestReport.java
index 9f35e55..435c868 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/TestReport.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/TestReport.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WarningDeviceFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WarningDeviceFlexContainerTest.java
index 4e1201f..f9df45c 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WarningDeviceFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WarningDeviceFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterSensorFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterSensorFlexContainerTest.java
index e3650f4..a5f960d 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterSensorFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterSensorFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterValveFlexContainerTest.java b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterValveFlexContainerTest.java
index 4f47d17..5320cfe 100644
--- a/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterValveFlexContainerTest.java
+++ b/org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterValveFlexContainerTest.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.testsuite.flexcontainer;

 

diff --git a/org.eclipse.om2m.webapp.resourcesbrowser.json/build.properties b/org.eclipse.om2m.webapp.resourcesbrowser.json/build.properties
index 58d2744..510264c 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/build.properties
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/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.webapp.resourcesbrowser.json/pom.xml b/org.eclipse.om2m.webapp.resourcesbrowser.json/pom.xml
index cf0b8dc..cb6cff9 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/pom.xml
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/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.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/Activator.java b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/Activator.java
index 9a9121d..1bf2861 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/Activator.java
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/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.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/WelcomeServlet.java b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/WelcomeServlet.java
index d42c2d3..6be8ad9 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/WelcomeServlet.java
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/WelcomeServlet.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.webapp.resourcesbrowser.json/src/main/resources/webapps/index.html b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/index.html
index 5a16857..73487fb 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/index.html
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/index.html
@@ -1,11 +1,11 @@
 <!--

-  Copyright (c) 2013-2015 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/

  

   Contributors:

       Thierry Monteil (Project co-founder) - Management and initial specification,

diff --git a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/jquery-1.10.2.min.js b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/jquery-1.10.2.min.js
index d659966..d637fc4 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/jquery-1.10.2.min.js
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/jquery-1.10.2.min.js
@@ -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.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.css b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.css
index 1614255..366e004 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.css
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.css
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2015 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/

  *

  * Contributors:

  *     Thierry Monteil (Project co-founder) - Management and initial specification,

diff --git a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.js b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.js
index c7fe400..1d6e362 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.js
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.js
@@ -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.webapp.resourcesbrowser.xml/build.properties b/org.eclipse.om2m.webapp.resourcesbrowser.xml/build.properties
index 0789426..3dafe7a 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/build.properties
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/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.webapp.resourcesbrowser.xml/pom.xml b/org.eclipse.om2m.webapp.resourcesbrowser.xml/pom.xml
index 165b510..296effb 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/pom.xml
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/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.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/Activator.java b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/Activator.java
index 7690192..598fd14 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/Activator.java
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/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.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/WelcomeServlet.java b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/WelcomeServlet.java
index 63f855a..17353e1 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/WelcomeServlet.java
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/WelcomeServlet.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.webapp.resourcesbrowser.xml/src/main/resources/webapps/index.html b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/index.html
index 5a16857..73487fb 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/index.html
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/index.html
@@ -1,11 +1,11 @@
 <!--

-  Copyright (c) 2013-2015 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/

  

   Contributors:

       Thierry Monteil (Project co-founder) - Management and initial specification,

diff --git a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/jquery-1.10.2.min.js b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/jquery-1.10.2.min.js
index d659966..d637fc4 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/jquery-1.10.2.min.js
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/jquery-1.10.2.min.js
@@ -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.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.css b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.css
index 1614255..366e004 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.css
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.css
@@ -1,11 +1,11 @@
 /*******************************************************************************

- * Copyright (c) 2013-2015 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/

  *

  * Contributors:

  *     Thierry Monteil (Project co-founder) - Management and initial specification,

diff --git a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.js b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.js
index 7784985..342efed 100644
--- a/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.js
+++ b/org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/resources/webapps/om2m.js
@@ -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/pom.xml b/pom.xml
index 47d74d7..9ce3f0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/build.properties b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/build.properties
index 4e9b649..9050bc5 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/build.properties
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/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/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/pom.xml b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/pom.xml
index 1bbc3b7..6cee34a 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/pom.xml
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/pom.xml
@@ -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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/Group.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/Group.java
index baedf37..88ed6f0 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/Group.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/Group.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueBridgeDevice.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueBridgeDevice.java
index f8f9904..8c2d633 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueBridgeDevice.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueBridgeDevice.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueDevice.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueDevice.java
index 07e0b78..63af45c 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueDevice.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueDevice.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueLightDevice.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueLightDevice.java
index eccd04a..fd0969a 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueLightDevice.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/HueLightDevice.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/AlertMode.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/AlertMode.java
index 0caab56..6dbe971 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/AlertMode.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/AlertMode.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/HueException.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/HueException.java
index 0d6ee26..9d2ea85 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/HueException.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/HueException.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightEffect.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightEffect.java
index 62886b6..7968ee0 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightEffect.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightEffect.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightState.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightState.java
index 46152ee..ec19dd0 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightState.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/LightState.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/UnknownHueGatewayException.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/UnknownHueGatewayException.java
index 2ddc71e..2a5e7a6 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/UnknownHueGatewayException.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.api/src/main/java/org/eclipse/om2m/hue/api/types/UnknownHueGatewayException.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/build.properties b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/build.properties
index 169c786..495a47f 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/build.properties
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/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/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/pom.xml b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/pom.xml
index 1ba2f60..1d9f100 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/pom.xml
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/pom.xml
@@ -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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/FakeBridge.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/FakeBridge.java
index 62dc8bc..59ceaa5 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/FakeBridge.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/FakeBridge.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBasedriver.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBasedriver.java
index 5263b1d..1d58bd7 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBasedriver.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBasedriver.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDeviceImpl.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDeviceImpl.java
index 7a45543..a45e875 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDeviceImpl.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDeviceImpl.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDiscovery.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDiscovery.java
index 4d29347..f1d3e41 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDiscovery.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueBridgeDiscovery.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueDeviceImpl.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueDeviceImpl.java
index 812d127..245e8ba 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueDeviceImpl.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueDeviceImpl.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueLightDeviceImpl.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueLightDeviceImpl.java
index 582d30c..2828501 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueLightDeviceImpl.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/HueLightDeviceImpl.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/PendingStateChangeRequest.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/PendingStateChangeRequest.java
index 848f87f..17a3cdc 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/PendingStateChangeRequest.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/PendingStateChangeRequest.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Controller.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Controller.java
index 9db0708..7ba01e5 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Controller.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Controller.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/HueConstants.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/HueConstants.java
index 5091f9f..bf6f39e 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/HueConstants.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/HueConstants.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Light.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Light.java
index c3a527e..7e274e1 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Light.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Light.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/LightGroup.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/LightGroup.java
index 1c997ac..97af90b 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/LightGroup.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/LightGroup.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/PHDevice.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/PHDevice.java
index 808c898..f9b4db9 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/PHDevice.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/PHDevice.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Utils.java b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Utils.java
index 1b5ecb3..c37cc74 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Utils.java
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/java/org/eclipse/om2m/hue/impl/controller/Utils.java
@@ -1,9 +1,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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/resources/OSGI-INF/hue.basedriver.xml b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/resources/OSGI-INF/hue.basedriver.xml
index fe05a3e..7f1386b 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/resources/OSGI-INF/hue.basedriver.xml
+++ b/protocols/org.eclipse.om2m.protocols.hue/org.eclipse.om2m.hue.impl/src/main/resources/OSGI-INF/hue.basedriver.xml
@@ -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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/org.eclipse.om2m.protocols.hue/pom.xml b/protocols/org.eclipse.om2m.protocols.hue/pom.xml
index 692e6c0..fc9bd2c 100644
--- a/protocols/org.eclipse.om2m.protocols.hue/pom.xml
+++ b/protocols/org.eclipse.om2m.protocols.hue/pom.xml
@@ -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/
 *
 * Contributors:
 *    BAREAU Cyrille <cyrille.bareau@orange.com>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index c784863..9dc5918 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -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/
 *
 * Contributors:
 *    BONNARDEL Gregory <gbonnardel.ext@orange.com>