40 files changed, 80 insertions, 80 deletions
diff --git a/org.eclipse.om2m.android.dashboard/src/main/AndroidManifest.xml b/org.eclipse.om2m.android.dashboard/src/main/AndroidManifest.xml
index 79090905..5fd629c9 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 5356822f..db759340 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 c828c62d..0dbc1489 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 c3c822b7..9474cf6f 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 e4d006b3..ee4491bb 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 e1f64e68..e3c25ade 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 f6906f11..ed4d945a 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 98ae9729..a798bb2a 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 c6f6b5e2..ea628db8 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 109b3ca5..eb538bcd 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 25df8ebf..515b04e8 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 a26a3dd4..3346d922 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 372e045f..989d57b0 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 4e444a4b..1d36559b 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 744774a3..3e561407 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 c2c474e7..4fc841b4 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 94550b8f..467cbcd4 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 c6be884e..a13997bf 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 8caf7017..d2a90064 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 056dd140..8a00d3cb 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 448c3e9b..66d6ec30 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 6bb45f7c..1a8a34ec 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 3164893a..a8d46ae2 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 c13134f0..c005ca4e 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 292a1040..4bf10798 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 0ea0e2f5..bb077e38 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 f4503700..12922f83 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 d4e13d06..44f6b391 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 e0ef17c7..1e35937b 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 0a049754..005d337e 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 23fe48ed..7b4b4953 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 2121201a..fc892e23 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 cfc3352e..8462d773 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 1f702ced..d643db05 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 fa4a775c..c09ab525 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 97956349..ff72c2bb 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 f570edf1..68036ef4 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 65d87284..cb47c8c4 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 9fdb36fc..b62a519c 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 67a54bb4..ffb8aee4 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>,